@contember/engine-server 1.1.0-alpha.2 → 1.1.0-alpha.3

package/dist/src/http/CollectHttpMetricsMiddelware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CollectHttpMetricsMiddelware.d.ts","sourceRoot":"","sources":["../../../src/http/CollectHttpMetricsMiddelware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,yBAAyB,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAA;AAChH,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExD,eAAO,MAAM,mCAAmC,aACrC,KAAK,QAAQ,KACrB,cAAc,QAAQ,6BAA6B,GAAG,yBAAyB,GAAG,eAAe,CAAC,CAwBpG,CAAA"}
+{"version":3,"file":"CollectHttpMetricsMiddelware.d.ts","sourceRoot":"","sources":["../../../src/http/CollectHttpMetricsMiddelware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAC7G,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExD,eAAO,MAAM,mCAAmC,aACrC,KAAK,QAAQ,KACrB,cAAc,QAAQ,0BAA0B,GAAG,yBAAyB,GAAG,eAAe,CAAC,CAyBjG,CAAA"}

package/dist/src/http/CollectHttpMetricsMiddelware.js

@@ -8,13 +8,13 @@ const prom_client_1 = __importDefault(require("prom-client"));
 const createColllectHttpMetricsMiddleware = (registry) => {
     const requestSummary = new prom_client_1.default.Histogram({
         name: 'contember_http_duration_seconds',
-        help: 'Incoming HTTP requests statistics by http_method (OPTIONS requests are ignored), http_code, contember_project (or "unknown" for undefined project), contember_module (system, tenant, content, unknown) and graphql_operation (query, mutation, unknown)',
+        help: 'Incoming HTTP requests statistics by http_method (OPTIONS requests are ignored), http_code, contember_project (or "unknown" for undefined project), contember_project_group (or "unknown" for undefined project group), contember_module (system, tenant, content, unknown) and graphql_operation (query, mutation, unknown)',
         registers: [registry],
-        labelNames: ['http_method', 'http_code', 'contember_project', 'contember_module', 'graphql_operation'],
+        labelNames: ['http_method', 'http_code', 'contember_project', 'contember_project_group', 'contember_module', 'graphql_operation'],
         buckets: [0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10],
     });
     return async (ctx, next) => {
-        var _a, _b;
+        var _a;
         const end = ctx.method === 'OPTIONS' ? () => null : requestSummary.startTimer();
         try {
             await next();
@@ -23,9 +23,10 @@ const createColllectHttpMetricsMiddleware = (registry) => {
             const labels = {
                 http_method: ctx.method,
                 http_code: ctx.status,
-                contember_project: ((_a = ctx.state.project) === null || _a === void 0 ? void 0 : _a.slug) || 'unknown',
+                contember_project: ctx.state.project || 'unknown',
+                contember_project_group: ctx.state.projectGroup || 'unknown',
                 contember_module: ctx.state.module || 'unknown',
-                graphql_operation: ((_b = ctx.state.graphql) === null || _b === void 0 ? void 0 : _b.operationName) || 'unknown',
+                graphql_operation: ((_a = ctx.state.graphql) === null || _a === void 0 ? void 0 : _a.operationName) || 'unknown',
             };
             end(labels);
         }

package/dist/src/http/CollectHttpMetricsMiddelware.js.map

@@ -1 +1 @@
-{"version":3,"file":"CollectHttpMetricsMiddelware.js","sourceRoot":"","sources":["../../../src/http/CollectHttpMetricsMiddelware.ts"],"names":[],"mappings":";;;;;;AACA,8DAA8B;AAGvB,MAAM,mCAAmC,GAAG,CAClD,QAAuB,EAC+E,EAAE;IACxG,MAAM,cAAc,GAAG,IAAI,qBAAI,CAAC,SAAS,CAAC;QACzC,IAAI,EAAE,iCAAiC;QACvC,IAAI,EAAE,0PAA0P;QAChQ,SAAS,EAAE,CAAC,QAAQ,CAAC;QACrB,UAAU,EAAE,CAAC,aAAa,EAAE,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,mBAAmB,CAAC;QACtG,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;KAClE,CAAC,CAAA;IAEF,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QAC1B,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,EAAE,CAAA;QAC/E,IAAI;YACH,MAAM,IAAI,EAAE,CAAA;SACZ;gBAAS;YACT,MAAM,MAAM,GAAG;gBACd,WAAW,EAAE,GAAG,CAAC,MAAM;gBACvB,SAAS,EAAE,GAAG,CAAC,MAAM;gBACrB,iBAAiB,EAAE,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,OAAO,0CAAE,IAAI,KAAI,SAAS;gBACvD,gBAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,SAAS;gBAC/C,iBAAiB,EAAE,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,OAAO,0CAAE,aAAa,KAAI,SAAS;aAChE,CAAA;YACD,GAAG,CAAC,MAAM,CAAC,CAAA;SACX;IACF,CAAC,CAAA;AACF,CAAC,CAAA;AA1BY,QAAA,mCAAmC,uCA0B/C"}
+{"version":3,"file":"CollectHttpMetricsMiddelware.js","sourceRoot":"","sources":["../../../src/http/CollectHttpMetricsMiddelware.ts"],"names":[],"mappings":";;;;;;AACA,8DAA8B;AAGvB,MAAM,mCAAmC,GAAG,CAClD,QAAuB,EAC4E,EAAE;IACrG,MAAM,cAAc,GAAG,IAAI,qBAAI,CAAC,SAAS,CAAC;QACzC,IAAI,EAAE,iCAAiC;QACvC,IAAI,EAAE,8TAA8T;QACpU,SAAS,EAAE,CAAC,QAAQ,CAAC;QACrB,UAAU,EAAE,CAAC,aAAa,EAAE,WAAW,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,mBAAmB,CAAC;QACjI,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;KAClE,CAAC,CAAA;IAEF,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QAC1B,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,EAAE,CAAA;QAC/E,IAAI;YACH,MAAM,IAAI,EAAE,CAAA;SACZ;gBAAS;YACT,MAAM,MAAM,GAAG;gBACd,WAAW,EAAE,GAAG,CAAC,MAAM;gBACvB,SAAS,EAAE,GAAG,CAAC,MAAM;gBACrB,iBAAiB,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS;gBACjD,uBAAuB,EAAE,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,SAAS;gBAC5D,gBAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,SAAS;gBAC/C,iBAAiB,EAAE,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,OAAO,0CAAE,aAAa,KAAI,SAAS;aAChE,CAAA;YACD,GAAG,CAAC,MAAM,CAAC,CAAA;SACX;IACF,CAAC,CAAA;AACF,CAAC,CAAA;AA3BY,QAAA,mCAAmC,uCA2B/C"}

package/dist/src/project/ProjectContainer.d.ts

@@ -1,30 +1,33 @@
 import { Builder } from '@contember/dic';
 import { Connection } from '@contember/database';
 import { DatabaseContextFactory, SchemaVersionBuilder } from '@contember/engine-system-api';
-import { ModificationHandlerFactory } from '@contember/schema-migrations';
 import { GraphQlSchemaBuilderFactory, PermissionsByIdentityFactory } from '@contember/engine-content-api';
 import { Plugin } from '@contember/engine-plugins';
-import { ProjectConfig, ContentQueryHandlerProvider, ContentSchemaResolver, GraphQlSchemaFactory, Providers, ProjectContainer } from '@contember/engine-http';
-import { ContentQueryHandlerFactory } from '@contember/engine-http';
+import { ContentSchemaResolver, GraphQlSchemaFactory, ProjectConfig, ProjectContainer, Providers } from '@contember/engine-http';
+export declare class ProjectContainerFactoryFactory {
+    private readonly debug;
+    private readonly plugins;
+    private readonly providers;
+    constructor(debug: boolean, plugins: Plugin[], providers: Providers);
+    create(schemaVersionBuilder: SchemaVersionBuilder): ProjectContainerFactory;
+}
+interface ProjectContainerFactoryArgs {
+    project: ProjectConfig;
+}
 export declare class ProjectContainerFactory {
     private readonly debug;
     private readonly plugins;
     private readonly schemaVersionBuilder;
     private readonly providers;
     constructor(debug: boolean, plugins: Plugin[], schemaVersionBuilder: SchemaVersionBuilder, providers: Providers);
-    createContainer(project: ProjectConfig): ProjectContainer;
-    protected createBuilder(project: ProjectConfig): Builder<{
+    createContainer(args: ProjectContainerFactoryArgs): ProjectContainer;
+    protected createBuilder({ project }: ProjectContainerFactoryArgs): Builder<{
         providers: {
             uuid: () => string;
             now: () => Date;
             bcrypt: (value: string) => Promise<string>;
             bcryptCompare: (data: any, hash: string) => Promise<boolean>;
             randomBytes: (bytes: number) => Promise<Buffer>;
-            encrypt: (value: Buffer) => Promise<{
-                encrypted: Buffer;
-                iv: Buffer;
-            }>;
-            decrypt: (valueEncrypted: Buffer, iv: Buffer) => Promise<Buffer>;
             hash: (value: import("crypto").BinaryLike, algo: string) => Buffer;
         };
     } & {
@@ -33,22 +36,17 @@ export declare class ProjectContainerFactory {
         project: ProjectConfig;
     } & {
         connection: Connection;
-    } & {
-        modificationHandlerFactory: ModificationHandlerFactory;
     } & {
         graphQlSchemaBuilderFactory: GraphQlSchemaBuilderFactory;
     } & {
         permissionsByIdentityFactory: PermissionsByIdentityFactory;
     } & {
         graphQlSchemaFactory: GraphQlSchemaFactory;
-    } & {
-        contentQueryHandlerFactory: ContentQueryHandlerFactory;
     } & {
         contentSchemaResolver: ContentSchemaResolver;
-    } & {
-        contentQueryHandlerProvider: ContentQueryHandlerProvider;
     } & {
         systemDatabaseContextFactory: DatabaseContextFactory;
     }>;
 }
+export {};
 //# sourceMappingURL=ProjectContainer.d.ts.map

package/dist/src/project/ProjectContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectContainer.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAE3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAA;AACzG,OAAO,EAA4B,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAC5E,OAAO,EACN,aAAa,EACb,2BAA2B,EAC3B,qBAAqB,EACrB,oBAAoB,EACpB,SAAS,EACT,gBAAgB,EAChB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAEnE,qBAAa,uBAAuB;IAElC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAHT,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,SAAS;IAG/B,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG,gBAAgB;IAYhE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+B9C"}
+{"version":3,"file":"ProjectContainer.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAC3F,OAAO,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAA;AACzG,OAAO,EAA4B,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAC5E,OAAO,EACN,qBAAqB,EACrB,oBAAoB,EACpB,aAAa,EACb,gBAAgB,EAChB,SAAS,EACT,MAAM,wBAAwB,CAAA;AAE/B,qBAAa,8BAA8B;IAEzC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,SAAS;IAItC,MAAM,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,uBAAuB;CAG3E;AAED,UAAU,2BAA2B;IACpC,OAAO,EAAE,aAAa,CAAA;CACtB;AAED,qBAAa,uBAAuB;IAElC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAHT,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,SAAS;IAG/B,eAAe,CAAC,IAAI,EAAE,2BAA2B,GAAG,gBAAgB;IAY3E,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,EAAE,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;CAyBhE"}

package/dist/src/project/ProjectContainer.js

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectContainerFactory = void 0;
+exports.ProjectContainerFactory = exports.ProjectContainerFactoryFactory = void 0;
 const dic_1 = require("@contember/dic");
 const database_1 = require("@contember/database");
 const engine_system_api_1 = require("@contember/engine-system-api");
-const utils_1 = require("../utils");
-const schema_migrations_1 = require("@contember/schema-migrations");
 const engine_content_api_1 = require("@contember/engine-content-api");
 const engine_http_1 = require("@contember/engine-http");
-const engine_http_2 = require("@contember/engine-http");
+class ProjectContainerFactoryFactory {
+    constructor(debug, plugins, providers) {
+        this.debug = debug;
+        this.plugins = plugins;
+        this.providers = providers;
+    }
+    create(schemaVersionBuilder) {
+        return new ProjectContainerFactory(this.debug, this.plugins, schemaVersionBuilder, this.providers);
+    }
+}
+exports.ProjectContainerFactoryFactory = ProjectContainerFactoryFactory;
 class ProjectContainerFactory {
     constructor(debug, plugins, schemaVersionBuilder, providers) {
         this.debug = debug;
@@ -16,18 +24,17 @@ class ProjectContainerFactory {
         this.schemaVersionBuilder = schemaVersionBuilder;
         this.providers = providers;
     }
-    createContainer(project) {
-        return this.createBuilder(project)
+    createContainer(args) {
+        return this.createBuilder(args)
             .build()
-            .pick('project', 'connection', 'contentQueryHandlerProvider', 'systemDatabaseContextFactory', 'contentSchemaResolver');
+            .pick('project', 'connection', 'systemDatabaseContextFactory', 'contentSchemaResolver', 'graphQlSchemaFactory');
     }
-    createBuilder(project) {
+    createBuilder({ project }) {
         return new dic_1.Builder({})
             .addService('providers', () => this.providers)
             .addService('schemaVersionBuilder', () => this.schemaVersionBuilder)
             .addService('project', () => project)
             .addService('connection', ({ project }) => new database_1.Connection(project.db, { timing: true }))
-            .addService('modificationHandlerFactory', () => new schema_migrations_1.ModificationHandlerFactory(schema_migrations_1.ModificationHandlerFactory.defaultFactoryMap))
             .addService('graphQlSchemaBuilderFactory', () => new engine_content_api_1.GraphQlSchemaBuilderFactory())
             .addService('permissionsByIdentityFactory', ({}) => new engine_content_api_1.PermissionsByIdentityFactory())
             .addService('graphQlSchemaFactory', ({ project, permissionsByIdentityFactory, graphQlSchemaBuilderFactory, providers }) => {
@@ -36,10 +43,8 @@ class ProjectContainerFactory {
                 .filter((it) => !!it);
             return new engine_http_1.GraphQlSchemaFactory(graphQlSchemaBuilderFactory, permissionsByIdentityFactory, contributors);
         })
-            .addService('contentQueryHandlerFactory', () => new engine_http_2.ContentQueryHandlerFactory(project.slug, this.debug, utils_1.logSentryError))
             .addService('contentSchemaResolver', ({ schemaVersionBuilder }) => new engine_http_1.ContentSchemaResolver(schemaVersionBuilder))
-            .addService('contentQueryHandlerProvider', ({ contentSchemaResolver, graphQlSchemaFactory, contentQueryHandlerFactory }) => new engine_http_1.ContentQueryHandlerProvider(contentSchemaResolver, graphQlSchemaFactory, contentQueryHandlerFactory))
-            .addService('systemDatabaseContextFactory', ({ connection, providers }) => new engine_system_api_1.DatabaseContextFactory(connection.createClient('system', { module: 'system' }), providers));
+            .addService('systemDatabaseContextFactory', ({ connection, providers, project }) => { var _a; return new engine_system_api_1.DatabaseContextFactory(connection.createClient((_a = project.db.systemSchema) !== null && _a !== void 0 ? _a : 'system', { module: 'system' }), providers); });
     }
 }
 exports.ProjectContainerFactory = ProjectContainerFactory;

package/dist/src/project/ProjectContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectContainer.js","sourceRoot":"","sources":["../../../src/project/ProjectContainer.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AACxC,kDAAgD;AAChD,oEAA2F;AAC3F,oCAAyC;AACzC,oEAAyE;AACzE,sEAAyG;AAEzG,wDAO+B;AAC/B,wDAAmE;AAEnE,MAAa,uBAAuB;IACnC,YACkB,KAAc,EACd,OAAiB,EACjB,oBAA0C,EAC1C,SAAoB;QAHpB,UAAK,GAAL,KAAK,CAAS;QACd,YAAO,GAAP,OAAO,CAAU;QACjB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,cAAS,GAAT,SAAS,CAAW;IACnC,CAAC;IAEG,eAAe,CAAC,OAAsB;QAC5C,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;aAChC,KAAK,EAAE;aACP,IAAI,CACJ,SAAS,EACT,YAAY,EACZ,6BAA6B,EAC7B,8BAA8B,EAC9B,uBAAuB,CACvB,CAAA;IACH,CAAC;IAES,aAAa,CAAC,OAAsB;QAC7C,OAAO,IAAI,aAAO,CAAC,EAAE,CAAC;aACpB,UAAU,CAAC,WAAW,EAAE,GAAG,EAAE,CAC7B,IAAI,CAAC,SAAS,CAAC;aACf,UAAU,CAAC,sBAAsB,EAAE,GAAG,EAAE,CACxC,IAAI,CAAC,oBAAoB,CAAC;aAC1B,UAAU,CAAC,SAAS,EAAE,GAAG,EAAE,CAC3B,OAAO,CAAC;aACR,UAAU,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACzC,IAAI,qBAAU,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;aAC7C,UAAU,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAC9C,IAAI,8CAA0B,CAAC,8CAA0B,CAAC,iBAAiB,CAAC,CAAC;aAC7E,UAAU,CAAC,6BAA6B,EAAE,GAAG,EAAE,CAC/C,IAAI,gDAA2B,EAAE,CAAC;aAClC,UAAU,CAAC,8BAA8B,EAAE,CAAC,EAAE,EAAE,EAAE,CAClD,IAAI,iDAA4B,EAAE,CAAC;aACnC,UAAU,CAAC,sBAAsB,EAAE,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,SAAS,EAAE,EAAE,EAAE;YACzH,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO;iBAC/B,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;iBAC7F,MAAM,CAAC,CAAC,EAAE,EAAkC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;YACtD,OAAO,IAAI,kCAAoB,CAAC,2BAA2B,EAAE,4BAA4B,EAAE,YAAY,CAAC,CAAA;QACzG,CAAC,CAAC;aACD,UAAU,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAC9C,IAAI,wCAA0B,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,sBAAc,CAAC,CAAC;aACzE,UAAU,CAAC,uBAAuB,EAAE,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CACjE,IAAI,mCAAqB,CAAC,oBAAoB,CAAC,CAAC;aAChD,UAAU,CAAC,6BAA6B,EAAE,CAAC,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,EAAE,EAAE,CAC1H,IAAI,yCAA2B,CAAC,qBAAqB,EAAE,oBAAoB,EAAE,0BAA0B,CAAC,CAAC;aACzG,UAAU,CAAC,8BAA8B,EAAE,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,CACzE,IAAI,0CAAsB,CAAC,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,CAAA;IAClG,CAAC;CACD;AAnDD,0DAmDC"}
+{"version":3,"file":"ProjectContainer.js","sourceRoot":"","sources":["../../../src/project/ProjectContainer.ts"],"names":[],"mappings":"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"}

package/dist/src/project/ProjectContainerResolver.d.ts

@@ -1,20 +1,22 @@
 import { ProjectContainerFactory } from './ProjectContainer';
-import { ProjectConfigResolver, ProjectContainer } from '@contember/engine-http';
-import { ProjectManager, ProjectWithSecrets } from '@contember/engine-tenant-api';
-import { ProjectGroup } from '@contember/engine-tenant-api';
+import { ProjectContainer } from '@contember/engine-http';
+import { DatabaseContext, ProjectManager, ProjectWithSecrets } from '@contember/engine-tenant-api';
 import { ProjectInitializer as SystemProjectInitializer } from '@contember/engine-system-api';
+import { ProjectConfigResolver } from '../config/projectConfigResolver';
+import { TenantConfig } from '../config/config';
 export declare class ProjectContainerResolver {
     private readonly projectContainerFactory;
     private readonly projectConfigResolver;
     private readonly projectManager;
     private readonly systemProjectInitializer;
-    private projectGroupStates;
+    private readonly tenantDatabase;
+    private readonly tenantConfig;
+    private projectContainers;
     readonly onCreate: ((container: ProjectContainer) => void | (() => void))[];
-    constructor(projectContainerFactory: ProjectContainerFactory, projectConfigResolver: ProjectConfigResolver, projectManager: ProjectManager, systemProjectInitializer: SystemProjectInitializer);
-    getAllProjectContainers(projectGroup: ProjectGroup): Promise<ProjectContainer[]>;
-    getProjectContainer(projectGroup: ProjectGroup, slug: string, alias?: boolean): Promise<ProjectContainer | undefined>;
-    createProjectContainer(projectGroup: ProjectGroup, project: ProjectWithSecrets): Promise<ProjectContainer>;
-    destroyContainer(projectGroup: ProjectGroup, slug: string): Promise<void>;
-    private getProjectGroupState;
+    constructor(projectContainerFactory: ProjectContainerFactory, projectConfigResolver: ProjectConfigResolver, projectManager: ProjectManager, systemProjectInitializer: SystemProjectInitializer, tenantDatabase: DatabaseContext, tenantConfig: TenantConfig);
+    getAllProjectContainers(): Promise<ProjectContainer[]>;
+    getProjectContainer(slug: string, alias?: boolean): Promise<ProjectContainer | undefined>;
+    createProjectContainer(project: ProjectWithSecrets): Promise<ProjectContainer>;
+    destroyContainer(slug: string): Promise<void>;
 }
 //# sourceMappingURL=ProjectContainerResolver.d.ts.map

package/dist/src/project/ProjectContainerResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectContainerResolver.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectContainerResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAC5D,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,kBAAkB,IAAI,wBAAwB,EAAE,MAAM,8BAA8B,CAAA;AAI7F,qBAAa,wBAAwB;IAMnC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IAR1C,OAAO,CAAC,kBAAkB,CAAiD;IAE3E,SAAgB,QAAQ,EAAE,CAAC,CAAC,SAAS,EAAE,gBAAgB,KAAK,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE,CAAK;gBAGrE,uBAAuB,EAAE,uBAAuB,EAChD,qBAAqB,EAAE,qBAAqB,EAC5C,cAAc,EAAE,cAAc,EAC9B,wBAAwB,EAAE,wBAAwB;IAGvD,uBAAuB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAahF,mBAAmB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IA8B5H,sBAAsB,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAoB1G,gBAAgB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBtF,OAAO,CAAC,oBAAoB;CAQ5B"}
+{"version":3,"file":"ProjectContainerResolver.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectContainerResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAClG,OAAO,EAAE,kBAAkB,IAAI,wBAAwB,EAAE,MAAM,8BAA8B,CAAA;AAG7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAE/C,qBAAa,wBAAwB;IAMnC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAV9B,OAAO,CAAC,iBAAiB,CAA8B;IAEvD,SAAgB,QAAQ,EAAE,CAAC,CAAC,SAAS,EAAE,gBAAgB,KAAK,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE,CAAK;gBAGrE,uBAAuB,EAAE,uBAAuB,EAChD,qBAAqB,EAAE,qBAAqB,EAC5C,cAAc,EAAE,cAAc,EAC9B,wBAAwB,EAAE,wBAAwB,EAClD,cAAc,EAAE,eAAe,EAC/B,YAAY,EAAE,YAAY;IAG/B,uBAAuB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAatD,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IA4BhG,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAqB9E,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAc1D"}

package/dist/src/project/ProjectContainerResolver.js

@@ -1,60 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectContainerResolver = void 0;
-const ProjectGroupState_1 = require("./ProjectGroupState");
+const ProjectContainerStore_1 = require("./ProjectContainerStore");
 const engine_common_1 = require("@contember/engine-common");
 class ProjectContainerResolver {
-    constructor(projectContainerFactory, projectConfigResolver, projectManager, systemProjectInitializer) {
+    constructor(projectContainerFactory, projectConfigResolver, projectManager, systemProjectInitializer, tenantDatabase, tenantConfig) {
         this.projectContainerFactory = projectContainerFactory;
         this.projectConfigResolver = projectConfigResolver;
         this.projectManager = projectManager;
         this.systemProjectInitializer = systemProjectInitializer;
-        this.projectGroupStates = new WeakMap();
+        this.tenantDatabase = tenantDatabase;
+        this.tenantConfig = tenantConfig;
+        this.projectContainers = new ProjectContainerStore_1.ProjectContainerStore();
         this.onCreate = [];
     }
-    async getAllProjectContainers(projectGroup) {
-        const projects = await this.projectManager.getProjects(projectGroup.database);
+    async getAllProjectContainers() {
+        const projects = await this.projectManager.getProjects(this.tenantDatabase);
         return await Promise.all(projects.map(async (it) => {
-            const container = await this.getProjectContainer(projectGroup, it.slug);
+            const container = await this.getProjectContainer(it.slug);
             if (!container) {
                 throw new Error('should not happen');
             }
             return container;
         }));
     }
-    async getProjectContainer(projectGroup, slug, alias = false) {
-        let groupState = this.getProjectGroupState(projectGroup);
-        const realSlug = groupState.resolveAlias(slug);
+    async getProjectContainer(slug, alias = false) {
+        const realSlug = this.projectContainers.resolveAlias(slug);
         if (realSlug) {
             slug = realSlug;
         }
-        const existing = groupState.getContainer(slug);
+        const existing = this.projectContainers.getContainer(slug);
         if (existing) {
             const existingAwaited = await existing;
-            const state = await this.projectManager.getProjectState(projectGroup.database, slug, existingAwaited.timestamp);
+            const state = await this.projectManager.getProjectState(this.tenantDatabase, slug, existingAwaited.timestamp);
             if (state === 'valid') {
                 return (await existingAwaited).container;
             }
-            await this.destroyContainer(projectGroup, slug);
+            await this.destroyContainer(slug);
             if (state === 'not_found') {
                 return undefined;
             }
         }
-        const project = await this.projectManager.getProjectWithSecretsBySlug(projectGroup.database, slug, alias);
+        const project = await this.projectManager.getProjectWithSecretsBySlug(this.tenantDatabase, slug, alias);
         if (!project) {
             return undefined;
         }
-        const container = await this.createProjectContainer(projectGroup, project);
+        const container = await this.createProjectContainer(project);
         if (slug !== project.slug) {
-            groupState.setAlias(project.slug, slug);
+            this.projectContainers.setAlias(project.slug, slug);
         }
         return container;
     }
-    async createProjectContainer(projectGroup, project) {
-        const projectConfig = this.projectConfigResolver(project.slug, project.config, project.secrets);
-        const groupState = this.getProjectGroupState(projectGroup);
-        return (await groupState.fetchContainer(project.slug, async (slug) => {
-            const projectContainer = this.projectContainerFactory.createContainer(projectConfig);
+    async createProjectContainer(project) {
+        const projectConfig = this.projectConfigResolver(project.slug, project.config, project.secrets, this.tenantConfig);
+        return (await this.projectContainers.fetchContainer(project.slug, async (slug) => {
+            const projectContainer = this.projectContainerFactory.createContainer({
+                project: projectConfig,
+            });
             await this.systemProjectInitializer.initialize(projectContainer.systemDatabaseContextFactory, projectContainer.project, 
             // eslint-disable-next-line no-console
             new engine_common_1.Logger(console.log));
@@ -66,15 +68,14 @@ class ProjectContainerResolver {
             };
         })).container;
     }
-    async destroyContainer(projectGroup, slug) {
+    async destroyContainer(slug) {
         var _a;
-        const groupState = this.getProjectGroupState(projectGroup);
-        const existing = groupState.getContainer(slug);
+        const existing = this.projectContainers.getContainer(slug);
         if (existing) {
             const existingAwaited = await existing;
             existingAwaited.cleanups.forEach(it => it());
-            (_a = existingAwaited.container.project.alias) === null || _a === void 0 ? void 0 : _a.forEach(it => groupState.removeAlias(it));
-            groupState.removeContainer(slug);
+            (_a = existingAwaited.container.project.alias) === null || _a === void 0 ? void 0 : _a.forEach(it => this.projectContainers.removeAlias(it));
+            this.projectContainers.removeContainer(slug);
         }
         process.nextTick(() => {
             if (global.gc) {
@@ -82,14 +83,6 @@ class ProjectContainerResolver {
             }
         });
     }
-    getProjectGroupState(projectGroup) {
-        let groupState = this.projectGroupStates.get(projectGroup);
-        if (!groupState) {
-            groupState = new ProjectGroupState_1.ProjectGroupState();
-            this.projectGroupStates.set(projectGroup, new ProjectGroupState_1.ProjectGroupState());
-        }
-        return groupState;
-    }
 }
 exports.ProjectContainerResolver = ProjectContainerResolver;
 //# sourceMappingURL=ProjectContainerResolver.js.map

package/dist/src/project/ProjectContainerResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectContainerResolver.js","sourceRoot":"","sources":["../../../src/project/ProjectContainerResolver.ts"],"names":[],"mappings":";;;AAKA,2DAAuD;AACvD,4DAAiD;AAEjD,MAAa,wBAAwB;IAKpC,YACkB,uBAAgD,EAChD,qBAA4C,EAC5C,cAA8B,EAC9B,wBAAkD;QAHlD,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,6BAAwB,GAAxB,wBAAwB,CAA0B;QAR5D,uBAAkB,GAAG,IAAI,OAAO,EAAmC,CAAA;QAE3D,aAAQ,GAA6D,EAAE,CAAA;IAOpF,CAAC;IAEG,KAAK,CAAC,uBAAuB,CAAC,YAA0B;QAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QAC7E,OAAO,MAAM,OAAO,CAAC,GAAG,CACvB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;YACvE,IAAI,CAAC,SAAS,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;aACpC;YACD,OAAO,SAAS,CAAA;QACjB,CAAC,CAAC,CACF,CAAA;IACF,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,YAA0B,EAAE,IAAY,EAAE,QAAiB,KAAK;QAChG,IAAI,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAExD,MAAM,QAAQ,GAAG,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAI,QAAQ,EAAE;YACb,IAAI,GAAG,QAAQ,CAAA;SACf;QACD,MAAM,QAAQ,GAAG,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAI,QAAQ,EAAE;YACb,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAA;YACtC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;YAC/G,IAAI,KAAK,KAAK,OAAO,EAAE;gBACtB,OAAO,CAAC,MAAM,eAAe,CAAC,CAAC,SAAS,CAAA;aACxC;YACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;YAC/C,IAAI,KAAK,KAAK,WAAW,EAAE;gBAC1B,OAAO,SAAS,CAAA;aAChB;SACD;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,2BAA2B,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QACzG,IAAI,CAAC,OAAO,EAAE;YACb,OAAO,SAAS,CAAA;SAChB;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;QAC1E,IAAI,IAAI,KAAK,OAAO,CAAC,IAAI,EAAE;YAC1B,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;SACvC;QACD,OAAO,SAAS,CAAA;IACjB,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,YAA0B,EAAE,OAA2B;QAC1F,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;QAC/F,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAC1D,OAAO,CAAC,MAAM,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;YAClE,MAAM,gBAAgB,GAAG,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;YACpF,MAAM,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAC7C,gBAAgB,CAAC,4BAA4B,EAC7C,gBAAgB,CAAC,OAAO;YACxB,sCAAsC;YACtC,IAAI,sBAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CACvB,CAAA;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;YAC9E,OAAO;gBACN,SAAS,EAAE,gBAAgB;gBAC3B,QAAQ;gBACR,SAAS,EAAE,OAAO,CAAC,SAAS;aAC5B,CAAA;QACF,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACd,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,YAA0B,EAAE,IAAY;;QACrE,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAC1D,MAAM,QAAQ,GAAG,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAI,QAAQ,EAAE;YACb,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAA;YACtC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;YAC5C,MAAA,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,0CAAE,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAA;YAClF,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;SAChC;QACD,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE;YACrB,IAAI,MAAM,CAAC,EAAE,EAAE;gBACd,MAAM,CAAC,EAAE,EAAE,CAAA;aACX;QACF,CAAC,CAAC,CAAA;IACH,CAAC;IAEO,oBAAoB,CAAC,YAA0B;QACtD,IAAI,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAC1D,IAAI,CAAC,UAAU,EAAE;YAChB,UAAU,GAAG,IAAI,qCAAiB,EAAE,CAAA;YACpC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,qCAAiB,EAAE,CAAC,CAAA;SAClE;QACD,OAAO,UAAU,CAAA;IAClB,CAAC;CACD;AAnGD,4DAmGC"}
+{"version":3,"file":"ProjectContainerResolver.js","sourceRoot":"","sources":["../../../src/project/ProjectContainerResolver.ts"],"names":[],"mappings":"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"}

package/dist/src/project/{ProjectGroupState.d.ts → ProjectContainerStore.d.ts}

@@ -4,7 +4,7 @@ declare type ContainerWithMeta = {
     cleanups: (() => void)[];
     timestamp: Date;
 };
-export declare class ProjectGroupState {
+export declare class ProjectContainerStore {
     private containers;
     private aliasMapping;
     resolveAlias(slug: string): string | undefined;
@@ -15,4 +15,4 @@ export declare class ProjectGroupState {
     removeContainer(slug: string): void;
 }
 export {};
-//# sourceMappingURL=ProjectGroupState.d.ts.map
+//# sourceMappingURL=ProjectContainerStore.d.ts.map

package/dist/src/project/ProjectContainerStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProjectContainerStore.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectContainerStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,aAAK,iBAAiB,GAAG;IAAE,SAAS,EAAE,gBAAgB,CAAC;IAAC,QAAQ,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;IAAC,SAAS,EAAE,IAAI,CAAA;CAAE,CAAA;AAEnG,qBAAa,qBAAqB;IACjC,OAAO,CAAC,UAAU,CAA8C;IAChE,OAAO,CAAC,YAAY,CAA4B;IAEzC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI9C,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI3C,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIhC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,SAAS;IAI5D,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIrH,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CAG1C"}

package/dist/src/project/{ProjectGroupState.js → ProjectContainerStore.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectGroupState = void 0;
+exports.ProjectContainerStore = void 0;
 const engine_common_1 = require("@contember/engine-common");
-class ProjectGroupState {
+class ProjectContainerStore {
     constructor() {
         this.containers = new engine_common_1.PromiseMap();
         this.aliasMapping = new Map();
@@ -26,5 +26,5 @@ class ProjectGroupState {
         this.containers.delete(slug);
     }
 }
-exports.ProjectGroupState = ProjectGroupState;
-//# sourceMappingURL=ProjectGroupState.js.map
+exports.ProjectContainerStore = ProjectContainerStore;
+//# sourceMappingURL=ProjectContainerStore.js.map

package/dist/src/project/ProjectContainerStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProjectContainerStore.js","sourceRoot":"","sources":["../../../src/project/ProjectContainerStore.ts"],"names":[],"mappings":";;;AACA,4DAAqD;AAIrD,MAAa,qBAAqB;IAAlC;QACS,eAAU,GAAG,IAAI,0BAAU,EAA6B,CAAA;QACxD,iBAAY,GAAG,IAAI,GAAG,EAAkB,CAAA;IAyBjD,CAAC;IAvBO,YAAY,CAAC,IAAY;QAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC;IAEM,QAAQ,CAAC,IAAY,EAAE,KAAa;QAC1C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACnC,CAAC;IAEM,WAAW,CAAC,KAAa;QAC/B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;IAEM,YAAY,CAAC,IAAY;QAC/B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACjC,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,IAAY,EAAE,OAAqD;QAC9F,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;IAEM,eAAe,CAAC,IAAY;QAClC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;CACD;AA3BD,sDA2BC"}

package/dist/src/project/ProjectInitializer.d.ts

@@ -1,13 +1,13 @@
-import { ProjectGroup, ProjectInitializer as ProjectInitializerInterface, ProjectWithSecrets } from '@contember/engine-tenant-api';
+import { ProjectInitializer as ProjectInitializerInterface, ProjectWithSecrets } from '@contember/engine-tenant-api';
 import { ProjectContainerResolver } from './ProjectContainerResolver';
 export declare class ProjectInitializer implements ProjectInitializerInterface {
     private readonly projectContainerResolver;
     constructor(projectContainerResolver: ProjectContainerResolver);
-    initializeProject(projectGroup: ProjectGroup, project: ProjectWithSecrets): Promise<void>;
+    initializeProject(project: ProjectWithSecrets): Promise<void>;
 }
 export declare class ProjectInitializerProxy implements ProjectInitializerInterface {
     private initializer;
     setInitializer(initializer: ProjectInitializerInterface): void;
-    initializeProject(projectGroup: ProjectGroup, project: ProjectWithSecrets): Promise<void>;
+    initializeProject(project: ProjectWithSecrets): Promise<void>;
 }
 //# sourceMappingURL=ProjectInitializer.d.ts.map

package/dist/src/project/ProjectInitializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectInitializer.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectInitializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,EACZ,kBAAkB,IAAI,2BAA2B,EACjD,kBAAkB,EAClB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AAErE,qBAAa,kBAAmB,YAAW,2BAA2B;IAEpE,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBAAxB,wBAAwB,EAAE,wBAAwB;IAG9D,iBAAiB,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,kBAAkB;CAG/E;AAED,qBAAa,uBAAwB,YAAW,2BAA2B;IAC1E,OAAO,CAAC,WAAW,CAAqD;IAExE,cAAc,CAAC,WAAW,EAAE,2BAA2B,GAAG,IAAI;IAI9D,iBAAiB,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,kBAAkB;CAMzE"}
+{"version":3,"file":"ProjectInitializer.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectInitializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,IAAI,2BAA2B,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACpH,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AAErE,qBAAa,kBAAmB,YAAW,2BAA2B;IAEpE,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBAAxB,wBAAwB,EAAE,wBAAwB;IAG9D,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;CAGnD;AAED,qBAAa,uBAAwB,YAAW,2BAA2B;IAC1E,OAAO,CAAC,WAAW,CAAqD;IAExE,cAAc,CAAC,WAAW,EAAE,2BAA2B,GAAG,IAAI;IAI9D,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;CAM7C"}

package/dist/src/project/ProjectInitializer.js

@@ -5,8 +5,8 @@ class ProjectInitializer {
     constructor(projectContainerResolver) {
         this.projectContainerResolver = projectContainerResolver;
     }
-    async initializeProject(projectGroup, project) {
-        await this.projectContainerResolver.createProjectContainer(projectGroup, project);
+    async initializeProject(project) {
+        await this.projectContainerResolver.createProjectContainer(project);
     }
 }
 exports.ProjectInitializer = ProjectInitializer;
@@ -17,11 +17,11 @@ class ProjectInitializerProxy {
     setInitializer(initializer) {
         this.initializer = initializer;
     }
-    initializeProject(projectGroup, project) {
+    initializeProject(project) {
         if (!this.initializer) {
             throw new Error('Initializer is not set');
         }
-        return this.initializer.initializeProject(projectGroup, project);
+        return this.initializer.initializeProject(project);
     }
 }
 exports.ProjectInitializerProxy = ProjectInitializerProxy;

package/dist/src/project/ProjectInitializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectInitializer.js","sourceRoot":"","sources":["../../../src/project/ProjectInitializer.ts"],"names":[],"mappings":";;;AAOA,MAAa,kBAAkB;IAC9B,YACkB,wBAAkD;QAAlD,6BAAwB,GAAxB,wBAAwB,CAA0B;IACjE,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CAAC,YAA0B,EAAE,OAA2B;QAC9E,MAAM,IAAI,CAAC,wBAAwB,CAAC,sBAAsB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IAClF,CAAC;CACD;AARD,gDAQC;AAED,MAAa,uBAAuB;IAApC;QACS,gBAAW,GAA4C,SAAS,CAAA;IAYzE,CAAC;IAVA,cAAc,CAAC,WAAwC;QACtD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAC/B,CAAC;IAED,iBAAiB,CAAC,YAA0B,EAAE,OAA2B;QACxE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;SACzC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACjE,CAAC;CACD;AAbD,0DAaC"}
+{"version":3,"file":"ProjectInitializer.js","sourceRoot":"","sources":["../../../src/project/ProjectInitializer.ts"],"names":[],"mappings":";;;AAGA,MAAa,kBAAkB;IAC9B,YACkB,wBAAkD;QAAlD,6BAAwB,GAAxB,wBAAwB,CAA0B;IACjE,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CAAC,OAA2B;QAClD,MAAM,IAAI,CAAC,wBAAwB,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAA;IACpE,CAAC;CACD;AARD,gDAQC;AAED,MAAa,uBAAuB;IAApC;QACS,gBAAW,GAA4C,SAAS,CAAA;IAYzE,CAAC;IAVA,cAAc,CAAC,WAAwC;QACtD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAC/B,CAAC;IAED,iBAAiB,CAAC,OAA2B;QAC5C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;SACzC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACnD,CAAC;CACD;AAbD,0DAaC"}

package/dist/src/project/ProjectSchemaResolver.d.ts

@@ -1,4 +1,4 @@
-import { ProjectGroup, ProjectSchemaResolver as ProjectSchemaResolverInterface } from '@contember/engine-tenant-api';
+import { ProjectSchemaResolver as ProjectSchemaResolverInterface } from '@contember/engine-tenant-api';
 import { SchemaVersionBuilder } from '@contember/engine-system-api';
 import { ProjectContainerResolver } from '@contember/engine-http';
 import { Schema } from '@contember/schema';
@@ -6,11 +6,11 @@ export declare class ProjectSchemaResolver implements ProjectSchemaResolverInter
     private readonly projectContainerResolver;
     private readonly schemaVersionBuilder;
     constructor(projectContainerResolver: ProjectContainerResolver, schemaVersionBuilder: SchemaVersionBuilder);
-    getSchema(projectGroup: ProjectGroup, slug: string): Promise<import("@contember/engine-system-api").VersionedSchema | undefined>;
+    getSchema(slug: string): Promise<import("@contember/engine-system-api").VersionedSchema | undefined>;
 }
 export declare class ProjectSchemaResolverProxy implements ProjectSchemaResolverInterface {
     private resolver;
     setResolver(resolver: ProjectSchemaResolver): void;
-    getSchema(projectGroup: ProjectGroup, projectSlug: string): Promise<Schema | undefined>;
+    getSchema(projectSlug: string): Promise<Schema | undefined>;
 }
 //# sourceMappingURL=ProjectSchemaResolver.d.ts.map

package/dist/src/project/ProjectSchemaResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectSchemaResolver.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectSchemaResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,YAAY,EACZ,qBAAqB,IAAI,8BAA8B,EACvD,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,qBAAa,qBAAsB,YAAW,8BAA8B;IAE1E,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBADpB,wBAAwB,EAAE,wBAAwB,EAClD,oBAAoB,EAAE,oBAAoB;IAGtD,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM;CAQxD;AAED,qBAAa,0BAA2B,YAAW,8BAA8B;IAChF,OAAO,CAAC,QAAQ,CAAmC;IAEnD,WAAW,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAIlD,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAMvF"}
+{"version":3,"file":"ProjectSchemaResolver.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectSchemaResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,IAAI,8BAA8B,EAAE,MAAM,8BAA8B,CAAA;AACtG,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,qBAAa,qBAAsB,YAAW,8BAA8B;IAE1E,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBADpB,wBAAwB,EAAE,wBAAwB,EAClD,oBAAoB,EAAE,oBAAoB;IAGtD,SAAS,CAAC,IAAI,EAAE,MAAM;CAQ5B;AAED,qBAAa,0BAA2B,YAAW,8BAA8B;IAChF,OAAO,CAAC,QAAQ,CAAmC;IAEnD,WAAW,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAIlD,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAM3D"}

package/dist/src/project/ProjectSchemaResolver.js

@@ -6,12 +6,12 @@ class ProjectSchemaResolver {
         this.projectContainerResolver = projectContainerResolver;
         this.schemaVersionBuilder = schemaVersionBuilder;
     }
-    async getSchema(projectGroup, slug) {
-        const container = await this.projectContainerResolver.getProjectContainer(projectGroup, slug);
+    async getSchema(slug) {
+        const container = await this.projectContainerResolver.getProjectContainer(slug);
         if (!container) {
             return undefined;
         }
-        const db = container.systemDatabaseContextFactory.create(undefined);
+        const db = container.systemDatabaseContextFactory.create();
         return await this.schemaVersionBuilder.buildSchema(db);
     }
 }
@@ -20,11 +20,11 @@ class ProjectSchemaResolverProxy {
     setResolver(resolver) {
         this.resolver = resolver;
     }
-    getSchema(projectGroup, projectSlug) {
+    getSchema(projectSlug) {
         if (!this.resolver) {
             throw new Error('Resolved is not set');
         }
-        return this.resolver.getSchema(projectGroup, projectSlug);
+        return this.resolver.getSchema(projectSlug);
     }
 }
 exports.ProjectSchemaResolverProxy = ProjectSchemaResolverProxy;

package/dist/src/project/ProjectSchemaResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectSchemaResolver.js","sourceRoot":"","sources":["../../../src/project/ProjectSchemaResolver.ts"],"names":[],"mappings":";;;AASA,MAAa,qBAAqB;IACjC,YACkB,wBAAkD,EAClD,oBAA0C;QAD1C,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,yBAAoB,GAApB,oBAAoB,CAAsB;IACzD,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,YAA0B,EAAE,IAAY;QACvD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;QAC7F,IAAI,CAAC,SAAS,EAAE;YACf,OAAO,SAAS,CAAA;SAChB;QACD,MAAM,EAAE,GAAG,SAAS,CAAC,4BAA4B,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACnE,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;IACvD,CAAC;CACD;AAdD,sDAcC;AAED,MAAa,0BAA0B;IAGtC,WAAW,CAAC,QAA+B;QAC1C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,YAA0B,EAAE,WAAmB;QACxD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;SACtC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;IAC1D,CAAC;CACD;AAbD,gEAaC"}
+{"version":3,"file":"ProjectSchemaResolver.js","sourceRoot":"","sources":["../../../src/project/ProjectSchemaResolver.ts"],"names":[],"mappings":";;;AAKA,MAAa,qBAAqB;IACjC,YACkB,wBAAkD,EAClD,oBAA0C;QAD1C,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,yBAAoB,GAApB,oBAAoB,CAAsB;IACzD,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,IAAY;QAC3B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC/E,IAAI,CAAC,SAAS,EAAE;YACf,OAAO,SAAS,CAAA;SAChB;QACD,MAAM,EAAE,GAAG,SAAS,CAAC,4BAA4B,CAAC,MAAM,EAAE,CAAA;QAC1D,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;IACvD,CAAC;CACD;AAdD,sDAcC;AAED,MAAa,0BAA0B;IAGtC,WAAW,CAAC,QAA+B;QAC1C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,WAAmB;QAC5B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;SACtC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IAC5C,CAAC;CACD;AAbD,gEAaC"}

package/dist/src/projectGroup/ProjectGroupContainer.d.ts

@@ -0,0 +1,23 @@
+import { TenantContainerFactory } from '@contember/engine-tenant-api';
+import { TenantConfig } from '../config/config';
+import { ProjectGroupContainer, Providers, SystemGraphQLHandlerFactory, TenantGraphQLHandlerFactory } from '@contember/engine-http';
+import { ProjectContainerFactoryFactory } from '../project';
+import { SystemContainerFactory } from '@contember/engine-system-api';
+import { ProjectConfigResolver } from '../config/projectConfigResolver';
+interface ProjectGroupContainerFactoryArgs {
+    config: TenantConfig;
+    slug: string | undefined;
+}
+export declare class ProjectGroupContainerFactory {
+    private readonly providers;
+    private readonly systemContainerFactory;
+    private readonly tenantContainerFactory;
+    private readonly projectContainerFactoryFactory;
+    private readonly projectConfigResolver;
+    private readonly tenantGraphQLHandlerFactory;
+    private readonly systemGraphQLHandlerFactory;
+    constructor(providers: Providers, systemContainerFactory: SystemContainerFactory, tenantContainerFactory: TenantContainerFactory, projectContainerFactoryFactory: ProjectContainerFactoryFactory, projectConfigResolver: ProjectConfigResolver, tenantGraphQLHandlerFactory: TenantGraphQLHandlerFactory, systemGraphQLHandlerFactory: SystemGraphQLHandlerFactory);
+    create({ config, slug }: ProjectGroupContainerFactoryArgs): ProjectGroupContainer;
+}
+export {};
+//# sourceMappingURL=ProjectGroupContainer.d.ts.map

package/dist/src/projectGroup/ProjectGroupContainer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProjectGroupContainer.d.ts","sourceRoot":"","sources":["../../../src/projectGroup/ProjectGroupContainer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAGN,qBAAqB,EACrB,SAAS,EACT,2BAA2B,EAC3B,2BAA2B,EAC3B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EACN,8BAA8B,EAM9B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AAGvE,UAAU,gCAAgC;IAEzC,MAAM,EAAE,YAAY,CAAA;IACpB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;CACxB;AAED,qBAAa,4BAA4B;IAEvC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,8BAA8B;IAC/C,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,2BAA2B;IAC5C,OAAO,CAAC,QAAQ,CAAC,2BAA2B;gBAN3B,SAAS,EAAE,SAAS,EACpB,sBAAsB,EAAE,sBAAsB,EAC9C,sBAAsB,EAAE,sBAAsB,EAC9C,8BAA8B,EAAE,8BAA8B,EAC9D,qBAAqB,EAAE,qBAAqB,EAC5C,2BAA2B,EAAE,2BAA2B,EACxD,2BAA2B,EAAE,2BAA2B;IAGnE,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,gCAAgC,GAAG,qBAAqB;CA8ExF"}