@contember/engine-server 1.1.0-alpha.1 → 1.1.0-alpha.4

package/alpine.dockerfile

@@ -4,6 +4,8 @@ WORKDIR /src
 RUN apk --no-cache add bash
 RUN apk --no-cache add --virtual builds-deps build-base python2
 COPY ./ ./
+
+RUN tar xf yarn.tar.gz -C "$(yarn cache dir)" .
 RUN /src/packages/engine-server/build.sh
 
 FROM node:14-alpine
@@ -13,7 +15,7 @@ RUN apk --no-cache add curl
 
 COPY --from=builder /src/server/server.js /src/
 COPY --from=builder /src/server/node_modules /src/node_modules
-COPY --from=builder /src/packages/engine-system-api/migrations /src/system-migrations
+COPY --from=builder /src/packages/engine-system-api/src/migrations /src/system-migrations
 COPY --from=builder /src/packages/engine-tenant-api/src/migrations /src/tenant-migrations
 COPY --from=builder /src/packages/engine-server/package.json /src/package.json
 COPY --from=builder /src/license.md /src/

package/debian.dockerfile

@@ -2,6 +2,8 @@ FROM node:14 as builder
 
 WORKDIR /src
 COPY ./ ./
+
+RUN tar xf yarn.tar.gz -C "$(yarn cache dir)" .
 RUN /src/packages/engine-server/build.sh
 
 FROM node:14
@@ -10,7 +12,7 @@ WORKDIR /src
 
 COPY --from=builder /src/server/server.js /src/
 COPY --from=builder /src/server/node_modules /src/node_modules
-COPY --from=builder /src/packages/engine-system-api/migrations /src/system-migrations
+COPY --from=builder /src/packages/engine-system-api/src/migrations /src/system-migrations
 COPY --from=builder /src/packages/engine-tenant-api/src/migrations /src/tenant-migrations
 COPY --from=builder /src/packages/engine-server/package.json /src/package.json
 COPY --from=builder /src/license.md /src/

package/dist/src/MasterContainer.d.ts

@@ -1,27 +1,123 @@
-import { ProjectInitializer as ProjectInitializerInterface } from '@contember/engine-tenant-api';
-import { Config } from './config/config';
+/// <reference types="koa" />
+/// <reference types="koa-bodyparser" />
+import { SystemContainerFactory } from '@contember/engine-system-api';
+import { TenantContainerFactory } from '@contember/engine-tenant-api';
+import { Builder } from '@contember/dic';
+import { ServerConfig } from './config/config';
 import { ProcessType } from './utils';
+import { ModificationHandlerFactory } from '@contember/schema-migrations';
 import { Initializer } from './bootstrap';
 import { Plugin } from '@contember/engine-plugins';
-import { Koa, ProjectConfigResolver, Providers } from '@contember/engine-http';
-import { ProjectContainerResolver } from './project';
+import { ContentApiMiddlewareFactory, ContentGraphQLContextFactory, ContentQueryHandlerFactory, ErrorMiddlewareFactory, Koa, NotModifiedChecker, ProjectGroupResolver, Providers, SystemApiMiddlewareFactory, SystemGraphQLContextFactory, SystemGraphQLHandlerFactory, TenantApiMiddlewareFactory, TenantGraphQLContextFactory, TenantGraphQLHandlerFactory } from '@contember/engine-http';
+import prom from 'prom-client';
+import { ProjectContainerFactoryFactory } from './project';
+import { ProjectConfigResolver } from './config/projectConfigResolver';
+import { TenantConfigResolver } from './config/tenantConfigResolver';
+import { ProjectGroupContainerResolver } from './projectGroup/ProjectGroupContainerResolver';
+import { ProjectGroupContainerFactory } from './projectGroup/ProjectGroupContainer';
 export interface MasterContainer {
     initializer: Initializer;
     koa: Koa;
     monitoringKoa: Koa;
-    projectContainerResolver: ProjectContainerResolver;
-    projectInitializer: ProjectInitializerInterface;
     providers: Providers;
 }
 export interface MasterContainerArgs {
     debugMode: boolean;
-    config: Config;
+    serverConfig: ServerConfig;
     projectConfigResolver: ProjectConfigResolver;
+    tenantConfigResolver: TenantConfigResolver;
     plugins: Plugin[];
     processType: ProcessType;
     version?: string;
 }
 export declare class MasterContainerFactory {
-    create({ config, debugMode, plugins, projectConfigResolver, processType, version, }: MasterContainerArgs): MasterContainer;
+    createBuilder({ serverConfig, debugMode, plugins, projectConfigResolver, tenantConfigResolver, processType, version, }: MasterContainerArgs): Builder<{
+        serverConfig: {
+            readonly port: number;
+            readonly monitoringPort: number;
+            readonly http: {
+                readonly requestBodySize?: string | undefined;
+            };
+            readonly logging: {} | {
+                readonly sentry?: {
+                    readonly dsn: string;
+                } | undefined;
+            };
+        } & {
+            readonly workerCount?: string | number | undefined;
+            readonly projectGroup?: ({
+                readonly domainMapping: string;
+            } & {
+                readonly configHeader?: string | undefined;
+                readonly configEncryptionKey?: string | undefined;
+            }) | undefined;
+        };
+    } & {
+        debugMode: boolean;
+    } & {
+        processType: ProcessType;
+    } & {
+        version: string | undefined;
+    } & {
+        projectConfigResolver: ProjectConfigResolver;
+    } & {
+        tenantConfigResolver: TenantConfigResolver;
+    } & {
+        plugins: Plugin<Record<string, unknown>>[];
+    } & {
+        providers: {
+            uuid: () => string;
+            now: () => Date;
+            bcrypt: (value: string) => Promise<string>;
+            bcryptCompare: (data: any, hash: string) => Promise<boolean>;
+            randomBytes: (bytes: number) => Promise<Buffer>;
+            hash: (value: import("crypto").BinaryLike, algo: string) => Buffer;
+        };
+    } & {
+        tenantContainerFactory: TenantContainerFactory;
+    } & {
+        modificationHandlerFactory: ModificationHandlerFactory;
+    } & {
+        systemContainerFactory: SystemContainerFactory;
+    } & {
+        projectContainerFactoryFactory: ProjectContainerFactoryFactory;
+    } & {
+        tenantGraphQLHandlerFactory: TenantGraphQLHandlerFactory;
+    } & {
+        systemGraphQLHandlerFactory: SystemGraphQLHandlerFactory;
+    } & {
+        projectGroupContainerFactory: ProjectGroupContainerFactory;
+    } & {
+        projectGroupContainerResolver: ProjectGroupContainerResolver;
+    } & {
+        promRegistry: prom.Registry;
+    } & {
+        httpErrorMiddlewareFactory: ErrorMiddlewareFactory;
+    } & {
+        projectGroupResolver: ProjectGroupResolver;
+    } & {
+        notModifiedChecker: NotModifiedChecker;
+    } & {
+        contentGraphqlContextFactory: ContentGraphQLContextFactory;
+    } & {
+        contentQueryHandlerFactory: ContentQueryHandlerFactory;
+    } & {
+        contentApiMiddlewareFactory: ContentApiMiddlewareFactory;
+    } & {
+        tenantGraphQLContextFactory: TenantGraphQLContextFactory;
+    } & {
+        tenantApiMiddlewareFactory: TenantApiMiddlewareFactory;
+    } & {
+        systemGraphQLContextFactory: SystemGraphQLContextFactory;
+    } & {
+        systemApiMiddlewareFactory: SystemApiMiddlewareFactory;
+    } & {
+        koa: Koa<Koa.DefaultState, Koa.DefaultContext>;
+    } & {
+        monitoringKoa: Koa<Koa.DefaultState, Koa.DefaultContext>;
+    } & {
+        initializer: Initializer;
+    }>;
+    create(args: MasterContainerArgs): MasterContainer;
 }
 //# sourceMappingURL=MasterContainer.d.ts.map

package/dist/src/MasterContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MasterContainer.d.ts","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,IAAI,2BAA2B,EAA0B,MAAM,8BAA8B,CAAA;AAGxH,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAA4C,WAAW,EAAE,MAAM,SAAS,CAAA;AAE/E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAGlD,OAAO,EAWN,GAAG,EAEH,qBAAqB,EAIrB,SAAS,EAKT,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAEN,wBAAwB,EAKxB,MAAM,WAAW,CAAA;AAMlB,MAAM,WAAW,eAAe;IAC/B,WAAW,EAAE,WAAW,CAAA;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,aAAa,EAAE,GAAG,CAAA;IAClB,wBAAwB,EAAE,wBAAwB,CAAA;IAClD,kBAAkB,EAAE,2BAA2B,CAAA;IAC/C,SAAS,EAAE,SAAS,CAAA;CACpB;AAED,MAAM,WAAW,mBAAmB;IACnC,SAAS,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,qBAAqB,CAAA;IAC5C,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,WAAW,EAAE,WAAW,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,sBAAsB;IAClC,MAAM,CAAC,EACN,MAAM,EACN,SAAS,EACT,OAAO,EACP,qBAAqB,EACrB,WAAW,EACX,OAAO,GACP,EAAE,mBAAmB,GAAG,eAAe;CAsMxC"}
+{"version":3,"file":"MasterContainer.d.ts","sourceRoot":"","sources":["../../src/MasterContainer.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAA4C,WAAW,EAAE,MAAM,SAAS,CAAA;AAC/E,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAElD,OAAO,EAEN,2BAA2B,EAC3B,4BAA4B,EAC5B,0BAA0B,EAQ1B,sBAAsB,EACtB,GAAG,EACH,kBAAkB,EAClB,oBAAoB,EACpB,SAAS,EACF,0BAA0B,EAAE,2BAA2B,EAC9D,2BAA2B,EAAE,0BAA0B,EAAE,2BAA2B,EACpF,2BAA2B,EAC3B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAA;AAI1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAA;AAC5F,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAA;AAGnF,MAAM,WAAW,eAAe;IAC/B,WAAW,EAAE,WAAW,CAAA;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,aAAa,EAAE,GAAG,CAAA;IAClB,SAAS,EAAE,SAAS,CAAA;CACpB;AAED,MAAM,WAAW,mBAAmB;IACnC,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,YAAY,CAAA;IAC1B,qBAAqB,EAAE,qBAAqB,CAAA;IAC5C,oBAAoB,EAAE,oBAAoB,CAAA;IAC1C,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,WAAW,EAAE,WAAW,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,sBAAsB;IAClC,aAAa,CAAC,EACb,YAAY,EACZ,SAAS,EACT,OAAO,EACP,qBAAqB,EACrB,oBAAoB,EACpB,WAAW,EACX,OAAO,GACP,EAAE,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoJtB,MAAM,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe;CAIlD"}

package/dist/src/MasterContainer.js

@@ -4,15 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MasterContainerFactory = void 0;
-const engine_content_api_1 = require("@contember/engine-content-api");
 const engine_system_api_1 = require("@contember/engine-system-api");
 const engine_tenant_api_1 = require("@contember/engine-tenant-api");
-const migrations_1 = __importDefault(require("@contember/engine-system-api/migrations"));
 const dic_1 = require("@contember/dic");
 const utils_1 = require("./utils");
 const schema_migrations_1 = require("@contember/schema-migrations");
 const bootstrap_1 = require("./bootstrap");
-const database_migrations_1 = require("@contember/database-migrations");
 const http_1 = require("./http");
 const engine_http_1 = require("@contember/engine-http");
 const prom_client_1 = __importDefault(require("prom-client"));
@@ -20,56 +17,29 @@ const project_1 = require("./project");
 const crypto_1 = require("crypto");
 const koa_compress_1 = __importDefault(require("koa-compress"));
 const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
+const ProjectGroupContainerResolver_1 = require("./projectGroup/ProjectGroupContainerResolver");
+const ProjectGroupContainer_1 = require("./projectGroup/ProjectGroupContainer");
+const cors_1 = __importDefault(require("@koa/cors"));
 class MasterContainerFactory {
-    create({ config, debugMode, plugins, projectConfigResolver, processType, version, }) {
-        const masterContainer = new dic_1.Builder({})
-            .addService('config', () => config)
+    createBuilder({ serverConfig, debugMode, plugins, projectConfigResolver, tenantConfigResolver, processType, version, }) {
+        return new dic_1.Builder({})
+            .addService('serverConfig', () => serverConfig)
             .addService('debugMode', () => debugMode)
             .addService('processType', () => processType)
             .addService('version', () => version)
             .addService('projectConfigResolver', () => projectConfigResolver)
+            .addService('tenantConfigResolver', () => tenantConfigResolver)
             .addService('plugins', () => plugins)
-            .addService('tenantContainerFactory', ({ config }) => new engine_tenant_api_1.TenantContainerFactory(config.tenant.db, config.tenant.mailer, config.tenant.credentials))
-            .addService('systemContainerFactory', () => new engine_system_api_1.SystemContainerFactory())
-            .addService('providers', ({ config }) => {
-            const encryptionKey = config.tenant.secrets.encryptionKey
-                ? (0, crypto_1.createSecretKey)(Buffer.from(config.tenant.secrets.encryptionKey, 'hex'))
-                : undefined;
-            return (0, engine_http_1.createProviders)({ encryptionKey });
-        })
-            .addService('projectSchemaResolver', () => new project_1.ProjectSchemaResolverProxy())
-            .addService('projectInitializer', () => new project_1.ProjectInitializerProxy())
-            .addService('tenantContainer', ({ tenantContainerFactory, providers, projectSchemaResolver, projectInitializer }) => tenantContainerFactory.create({
-            providers,
-            projectSchemaResolver,
-            projectInitializer,
-        }))
+            .addService('providers', () => (0, engine_http_1.createProviders)())
+            .addService('tenantContainerFactory', ({ providers }) => new engine_tenant_api_1.TenantContainerFactory(providers))
             .addService('modificationHandlerFactory', () => new schema_migrations_1.ModificationHandlerFactory(schema_migrations_1.ModificationHandlerFactory.defaultFactoryMap))
-            .addService('permissionsByIdentityFactory', ({}) => new engine_content_api_1.PermissionsByIdentityFactory())
-            .addService('entitiesSelector', ({ permissionsByIdentityFactory, providers }) => {
-            const mapperFactory = (db, schema, identityVariables, permissions) => (0, engine_content_api_1.createMapperContainer)({
-                schema,
-                identityVariables,
-                permissions,
-                providers,
-            }).mapperFactory(db);
-            return new engine_content_api_1.EntitiesSelector(mapperFactory, permissionsByIdentityFactory);
-        })
-            .addService('systemDbMigrationsRunnerFactory', () => (db, dbClient) => new database_migrations_1.MigrationsRunner(db, 'system', migrations_1.default, dbClient))
-            .addService('systemContainer', ({ systemContainerFactory, entitiesSelector, modificationHandlerFactory, providers, systemDbMigrationsRunnerFactory, tenantContainer }) => systemContainerFactory.create({
-            entitiesSelector,
-            modificationHandlerFactory,
-            providers,
-            systemDbMigrationsRunnerFactory,
-            identityFetcher: tenantContainer.identityFetcher,
-        }))
-            .addService('schemaVersionBuilder', ({ systemContainer }) => systemContainer.schemaVersionBuilder)
-            .addService('projectContainerFactory', ({ debugMode, plugins, schemaVersionBuilder, providers }) => new project_1.ProjectContainerFactory(debugMode, plugins, schemaVersionBuilder, providers))
-            .addService('tenantProjectManager', ({ tenantContainer }) => tenantContainer.projectManager)
-            .addService('projectContainerResolver', ({ tenantProjectManager, projectContainerFactory, projectConfigResolver, systemContainer }) => new project_1.ProjectContainerResolver(projectContainerFactory, projectConfigResolver, tenantProjectManager, systemContainer.projectInitializer))
-            .addService('tenantGraphQlMiddlewareFactory', ({ tenantContainer }) => new engine_http_1.TenantGraphQLMiddlewareFactory(tenantContainer.resolvers, tenantContainer.resolverContextFactory, utils_1.logSentryError))
-            .addService('systemGraphQLMiddlewareFactory', ({ systemContainer, debugMode }) => new engine_http_1.SystemGraphQLMiddlewareFactory(systemContainer.systemResolversFactory, systemContainer.resolverContextFactory, utils_1.logSentryError, debugMode))
-            .addService('promRegistry', ({ projectContainerResolver, processType, tenantContainer }) => {
+            .addService('systemContainerFactory', ({ providers, modificationHandlerFactory }) => new engine_system_api_1.SystemContainerFactory(providers, modificationHandlerFactory))
+            .addService('projectContainerFactoryFactory', ({ debugMode, plugins, providers }) => new project_1.ProjectContainerFactoryFactory(debugMode, plugins, providers))
+            .addService('tenantGraphQLHandlerFactory', () => new engine_http_1.TenantGraphQLHandlerFactory(utils_1.logSentryError))
+            .addService('systemGraphQLHandlerFactory', ({ debugMode }) => new engine_http_1.SystemGraphQLHandlerFactory(utils_1.logSentryError, debugMode))
+            .addService('projectGroupContainerFactory', ({ providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory }) => new ProjectGroupContainer_1.ProjectGroupContainerFactory(providers, systemContainerFactory, tenantContainerFactory, projectContainerFactoryFactory, projectConfigResolver, tenantGraphQLHandlerFactory, systemGraphQLHandlerFactory))
+            .addService('projectGroupContainerResolver', ({ tenantConfigResolver, projectGroupContainerFactory }) => new ProjectGroupContainerResolver_1.ProjectGroupContainerResolver(tenantConfigResolver, projectGroupContainerFactory))
+            .addService('promRegistry', ({ processType, projectGroupContainerResolver }) => {
             if (processType === utils_1.ProcessType.clusterMaster) {
                 const register = new prom_client_1.default.AggregatorRegistry();
                 prom_client_1.default.collectDefaultMetrics({ register });
@@ -78,54 +48,69 @@ class MasterContainerFactory {
             const register = prom_client_1.default.register;
             prom_client_1.default.collectDefaultMetrics({ register });
             const registrar = (0, utils_1.createDbMetricsRegistrar)(register);
-            registrar({ connection: tenantContainer.connection, module: 'tenant', project: 'unknown' });
-            projectContainerResolver.onCreate.push(container => registrar({
-                connection: container.connection,
-                module: 'content',
-                project: container.project.slug,
-            }));
+            projectGroupContainerResolver.onCreate.push((groupContainer, slug) => {
+                groupContainer.projectContainerResolver.onCreate.push(projectContainer => registrar({
+                    connection: projectContainer.connection,
+                    labels: {
+                        contember_module: 'content',
+                        contember_project: projectContainer.project.slug,
+                        contember_project_group: slug !== null && slug !== void 0 ? slug : 'unknown',
+                    },
+                }));
+                return registrar({
+                    connection: groupContainer.tenantContainer.connection,
+                    labels: {
+                        contember_module: 'tenant',
+                        contember_project_group: slug !== null && slug !== void 0 ? slug : 'unknown',
+                        contember_project: 'unknown',
+                    },
+                });
+            });
             return register;
         })
-            .addService('httpErrorFactory', ({ debugMode }) => new engine_http_1.ErrorFactory(debugMode))
-            .addService('authMiddlewareFactory', ({ tenantContainer, httpErrorFactory }) => new engine_http_1.AuthMiddlewareFactory(tenantContainer.apiKeyManager, httpErrorFactory))
-            .addService('projectGroupMiddlewareFactory', ({ tenantContainer, httpErrorFactory }) => { var _a; return new engine_http_1.ProjectGroupMiddlewareFactory((_a = config.server.projectGroup) === null || _a === void 0 ? void 0 : _a.domainMapping, tenantContainer.projectGroupProvider, httpErrorFactory); })
-            .addService('projectResolverMiddlewareFactory', ({ projectContainerResolver, httpErrorFactory }) => new engine_http_1.ProjectResolveMiddlewareFactory(projectContainerResolver, httpErrorFactory))
-            .addService('apiMiddlewareFactory', ({ projectGroupMiddlewareFactory, authMiddlewareFactory }) => new engine_http_1.ApiMiddlewareFactory(projectGroupMiddlewareFactory, authMiddlewareFactory))
-            .addService('stageResolveMiddlewareFactory', ({ httpErrorFactory }) => new engine_http_1.StageResolveMiddlewareFactory(httpErrorFactory))
-            .addService('notModifiedMiddlewareFactory', () => new engine_http_1.NotModifiedMiddlewareFactory())
-            .addService('projectMemberMiddlewareFactory', ({ debugMode, tenantContainer, httpErrorFactory }) => new engine_http_1.ProjectMemberMiddlewareFactory(debugMode, tenantContainer.projectMemberManager, httpErrorFactory))
-            .addService('contentServerMiddlewareFactory', () => new engine_http_1.ContentServerMiddlewareFactory())
-            .addService('koa', ({ tenantGraphQlMiddlewareFactory, systemGraphQLMiddlewareFactory, apiMiddlewareFactory, projectResolverMiddlewareFactory, stageResolveMiddlewareFactory, notModifiedMiddlewareFactory, projectMemberMiddlewareFactory, contentServerMiddlewareFactory, promRegistry, debugMode, version, config, }) => {
+            .addService('httpErrorMiddlewareFactory', ({ debugMode }) => new engine_http_1.ErrorMiddlewareFactory(debugMode))
+            .addService('projectGroupResolver', ({ projectGroupContainerResolver, serverConfig }) => {
+            var _a, _b, _c, _d, _e;
+            const encryptionKey = ((_a = serverConfig.projectGroup) === null || _a === void 0 ? void 0 : _a.configEncryptionKey)
+                ? (0, crypto_1.createSecretKey)(Buffer.from((_b = serverConfig.projectGroup) === null || _b === void 0 ? void 0 : _b.configEncryptionKey, 'hex'))
+                : undefined;
+            return new engine_http_1.ProjectGroupResolver((_c = serverConfig.projectGroup) === null || _c === void 0 ? void 0 : _c.domainMapping, (_d = serverConfig.projectGroup) === null || _d === void 0 ? void 0 : _d.configHeader, ((_e = serverConfig.projectGroup) === null || _e === void 0 ? void 0 : _e.configEncryptionKey) ? new engine_http_1.CryptoWrapper(encryptionKey) : undefined, projectGroupContainerResolver);
+        })
+            .addService('notModifiedChecker', () => new engine_http_1.NotModifiedChecker())
+            .addService('contentGraphqlContextFactory', ({ providers }) => new engine_http_1.ContentGraphQLContextFactory(providers))
+            .addService('contentQueryHandlerFactory', ({ debugMode }) => new engine_http_1.ContentQueryHandlerFactory(debugMode, utils_1.logSentryError))
+            .addService('contentApiMiddlewareFactory', ({ debugMode, projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory }) => new engine_http_1.ContentApiMiddlewareFactory(debugMode, projectGroupResolver, notModifiedChecker, contentGraphqlContextFactory, contentQueryHandlerFactory))
+            .addService('tenantGraphQLContextFactory', () => new engine_http_1.TenantGraphQLContextFactory())
+            .addService('tenantApiMiddlewareFactory', ({ debugMode, projectGroupResolver, tenantGraphQLContextFactory }) => new engine_http_1.TenantApiMiddlewareFactory(debugMode, projectGroupResolver, tenantGraphQLContextFactory))
+            .addService('systemGraphQLContextFactory', () => new engine_http_1.SystemGraphQLContextFactory())
+            .addService('systemApiMiddlewareFactory', ({ debugMode, projectGroupResolver, systemGraphQLContextFactory }) => new engine_http_1.SystemApiMiddlewareFactory(debugMode, projectGroupResolver, systemGraphQLContextFactory))
+            .addService('koa', ({ contentApiMiddlewareFactory, tenantApiMiddlewareFactory, systemApiMiddlewareFactory, httpErrorMiddlewareFactory, promRegistry, debugMode, version, serverConfig }) => {
             const app = new engine_http_1.Koa();
             app.use((0, engine_http_1.compose)([
                 (0, koa_compress_1.default)({
                     br: false,
                 }),
                 (0, koa_bodyparser_1.default)({
-                    jsonLimit: config.server.http.requestBodySize || '1mb',
+                    jsonLimit: serverConfig.http.requestBodySize || '1mb',
                 }),
                 (0, engine_http_1.createPoweredByHeaderMiddleware)(debugMode, version !== null && version !== void 0 ? version : 'unknown'),
+                httpErrorMiddlewareFactory.create(),
                 (0, http_1.createColllectHttpMetricsMiddleware)(promRegistry),
                 (0, engine_http_1.createTimerMiddleware)(),
                 (0, engine_http_1.route)('/playground$', (0, engine_http_1.createPlaygroundMiddleware)()),
                 (0, engine_http_1.createHomepageMiddleware)(),
+                (0, cors_1.default)(),
                 (0, engine_http_1.route)('/content/:projectSlug/:stageSlug$', (0, engine_http_1.compose)([
-                    apiMiddlewareFactory.create('content'),
-                    projectResolverMiddlewareFactory.create(),
-                    stageResolveMiddlewareFactory.create(),
-                    notModifiedMiddlewareFactory.create(),
-                    projectMemberMiddlewareFactory.create(),
-                    contentServerMiddlewareFactory.create(),
+                    (0, engine_http_1.createModuleInfoMiddleware)('content'),
+                    contentApiMiddlewareFactory.create(),
                 ])),
                 (0, engine_http_1.route)('/tenant$', (0, engine_http_1.compose)([
-                    apiMiddlewareFactory.create('tenant'),
-                    tenantGraphQlMiddlewareFactory.create(),
+                    (0, engine_http_1.createModuleInfoMiddleware)('tenant'),
+                    tenantApiMiddlewareFactory.create(),
                 ])),
                 (0, engine_http_1.route)('/system/:projectSlug$', (0, engine_http_1.compose)([
-                    apiMiddlewareFactory.create('system'),
-                    projectResolverMiddlewareFactory.create(),
-                    projectMemberMiddlewareFactory.create(),
-                    systemGraphQLMiddlewareFactory.create(),
+                    (0, engine_http_1.createModuleInfoMiddleware)('system'),
+                    systemApiMiddlewareFactory.create(),
                 ])),
             ]));
             return app;
@@ -135,15 +120,11 @@ class MasterContainerFactory {
             app.use((0, http_1.createShowMetricsMiddleware)(promRegistry));
             return app;
         })
-            .addService('initializer', ({ tenantContainer, systemContainer, projectContainerResolver }) => new bootstrap_1.Initializer(tenantContainer.migrationsRunnerFactory, tenantContainer.projectManager, systemContainer.projectInitializer, projectContainerResolver, tenantContainer.projectGroupProvider))
-            .setupService('projectSchemaResolver', (it, { projectContainerResolver, schemaVersionBuilder }) => {
-            it.setResolver(new project_1.ProjectSchemaResolver(projectContainerResolver, schemaVersionBuilder));
-        })
-            .setupService('projectInitializer', (it, { projectContainerResolver }) => {
-            it.setInitializer(new project_1.ProjectInitializer(projectContainerResolver));
-        })
-            .build();
-        return masterContainer.pick('initializer', 'koa', 'monitoringKoa', 'projectContainerResolver', 'projectInitializer', 'providers');
+            .addService('initializer', ({ projectGroupContainerResolver }) => new bootstrap_1.Initializer(projectGroupContainerResolver));
+    }
+    create(args) {
+        const container = this.createBuilder(args).build();
+        return container.pick('initializer', 'koa', 'monitoringKoa', 'providers');
     }
 }
 exports.MasterContainerFactory = MasterContainerFactory;

package/dist/src/MasterContainer.js.map

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

package/dist/src/bootstrap/Initializer.d.ts

@@ -1,16 +1,7 @@
-import { MigrationsRunnerFactory, ProjectGroupProvider, ProjectManager } from '@contember/engine-tenant-api';
-import { ProjectInitializer } from '@contember/engine-system-api';
-import { ProjectContainerResolver } from '../project';
-import { ProjectConfig } from '@contember/engine-http';
-import { Migration } from '@contember/schema-migrations';
+import { ProjectGroupContainerResolver } from '../projectGroup/ProjectGroupContainerResolver';
 export declare class Initializer {
-    private readonly tenantDbMigrationsRunnerFactory;
-    private readonly projectManager;
-    private readonly projectInitializer;
-    private readonly projectContainerResolver;
-    private readonly projectGroupProvider;
-    constructor(tenantDbMigrationsRunnerFactory: MigrationsRunnerFactory, projectManager: ProjectManager, projectInitializer: ProjectInitializer, projectContainerResolver: ProjectContainerResolver, projectGroupProvider: ProjectGroupProvider);
+    private readonly projectGroupContainerResolver;
+    constructor(projectGroupContainerResolver: ProjectGroupContainerResolver);
     initialize(): Promise<string[]>;
-    createProject(project: ProjectConfig, migrations: Migration[]): Promise<void>;
 }
 //# sourceMappingURL=Initializer.d.ts.map

package/dist/src/bootstrap/Initializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Initializer.d.ts","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC5G,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAExD,qBAAa,WAAW;IAEtB,OAAO,CAAC,QAAQ,CAAC,+BAA+B;IAChD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBAJpB,+BAA+B,EAAE,uBAAuB,EACxD,cAAc,EAAE,cAAc,EAC9B,kBAAkB,EAAE,kBAAkB,EACtC,wBAAwB,EAAE,wBAAwB,EAClD,oBAAoB,EAAE,oBAAoB;IAG/C,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAsB/B,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkB1F"}
+{"version":3,"file":"Initializer.d.ts","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,+CAA+C,CAAA;AAE7F,qBAAa,WAAW;IAEtB,OAAO,CAAC,QAAQ,CAAC,6BAA6B;gBAA7B,6BAA6B,EAAE,6BAA6B;IAGjE,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAuB5C"}

package/dist/src/bootstrap/Initializer.js

@@ -3,46 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Initializer = void 0;
 const engine_common_1 = require("@contember/engine-common");
 class Initializer {
-    constructor(tenantDbMigrationsRunnerFactory, projectManager, projectInitializer, projectContainerResolver, projectGroupProvider) {
-        this.tenantDbMigrationsRunnerFactory = tenantDbMigrationsRunnerFactory;
-        this.projectManager = projectManager;
-        this.projectInitializer = projectInitializer;
-        this.projectContainerResolver = projectContainerResolver;
-        this.projectGroupProvider = projectGroupProvider;
+    constructor(projectGroupContainerResolver) {
+        this.projectGroupContainerResolver = projectGroupContainerResolver;
     }
     async initialize() {
         // eslint-disable-next-line no-console
         const logger = new engine_common_1.Logger(console.log);
         logger.group('\nInitializing tenant database');
         // todo
-        await this.tenantDbMigrationsRunnerFactory.create('tenant').run(logger.write.bind(logger));
+        const groupContainer = await this.projectGroupContainerResolver.getProjectGroupContainer(undefined);
+        await groupContainer.tenantContainer.migrationsRunner.run(logger.write.bind(logger));
         logger.groupEnd();
+        const systemContainer = groupContainer.systemContainer;
         const projects = [];
-        const group = await this.projectGroupProvider.getGroup(undefined);
-        for (const container of await this.projectContainerResolver.getAllProjectContainers(group)) {
-            const project = container.project;
+        for (const projectContainer of await groupContainer.projectContainerResolver.getAllProjectContainers()) {
+            const project = projectContainer.project;
             projects.push(project.slug);
             logger.group(`\nUpdating project ${project.slug}`);
-            await this.projectInitializer.initialize(container.systemDatabaseContextFactory, project, logger);
+            await systemContainer.projectInitializer.initialize(projectContainer.systemDatabaseContextFactory, project, logger);
             logger.groupEnd();
         }
         // eslint-disable-next-line no-console
         console.log('');
         return projects;
     }
-    async createProject(project, migrations) {
-        const { slug, name, ...config } = project;
-        const group = await this.projectGroupProvider.getGroup(undefined);
-        const result = await this.projectManager.createProject(group, { slug, name, config, secrets: {} }, undefined);
-        if (!result) {
-            throw new Error('Project already exists');
-        }
-        const container = await this.projectContainerResolver.getProjectContainer(group, project.slug);
-        if (!container) {
-            throw new Error('Should not happen');
-        }
-        await this.projectInitializer.initialize(container.systemDatabaseContextFactory, project, new engine_common_1.Logger(() => null), migrations);
-    }
 }
 exports.Initializer = Initializer;
 //# sourceMappingURL=Initializer.js.map

package/dist/src/bootstrap/Initializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Initializer.js","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":";;;AAEA,4DAAiD;AAKjD,MAAa,WAAW;IACvB,YACkB,+BAAwD,EACxD,cAA8B,EAC9B,kBAAsC,EACtC,wBAAkD,EAClD,oBAA0C;QAJ1C,oCAA+B,GAA/B,+BAA+B,CAAyB;QACxD,mBAAc,GAAd,cAAc,CAAgB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,yBAAoB,GAApB,oBAAoB,CAAsB;IACzD,CAAC;IAEG,KAAK,CAAC,UAAU;QACtB,sCAAsC;QACtC,MAAM,MAAM,GAAG,IAAI,sBAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC9C,OAAO;QACP,MAAM,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1F,MAAM,CAAC,QAAQ,EAAE,CAAA;QAEjB,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QACjE,KAAK,MAAM,SAAS,IAAI,MAAM,IAAI,CAAC,wBAAwB,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE;YAC3F,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;YACjC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAC3B,MAAM,CAAC,KAAK,CAAC,sBAAsB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;YAClD,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,4BAA4B,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;YACjG,MAAM,CAAC,QAAQ,EAAE,CAAA;SACjB;QACD,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,OAAO,QAAQ,CAAA;IAChB,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAsB,EAAE,UAAuB;QACzE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,CAAA;QACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QACjE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAA;QAC7G,IAAI,CAAC,MAAM,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;SACzC;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;QAC9F,IAAI,CAAC,SAAS,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;SACpC;QACD,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CACvC,SAAS,CAAC,4BAA4B,EACtC,OAAO,EACP,IAAI,sBAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EACtB,UAAU,CACV,CAAA;IACF,CAAC;CACD;AAjDD,kCAiDC"}
+{"version":3,"file":"Initializer.js","sourceRoot":"","sources":["../../../src/bootstrap/Initializer.ts"],"names":[],"mappings":";;;AAAA,4DAAiD;AAGjD,MAAa,WAAW;IACvB,YACkB,6BAA4D;QAA5D,kCAA6B,GAA7B,6BAA6B,CAA+B;IAC3E,CAAC;IAEG,KAAK,CAAC,UAAU;QACtB,sCAAsC;QACtC,MAAM,MAAM,GAAG,IAAI,sBAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC9C,OAAO;QACP,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAA;QAEnG,MAAM,cAAc,CAAC,eAAe,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QACpF,MAAM,CAAC,QAAQ,EAAE,CAAA;QAEjB,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAA;QACtD,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,KAAK,MAAM,gBAAgB,IAAI,MAAM,cAAc,CAAC,wBAAwB,CAAC,uBAAuB,EAAE,EAAE;YACvG,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAA;YACxC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAC3B,MAAM,CAAC,KAAK,CAAC,sBAAsB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;YAClD,MAAM,eAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,gBAAgB,CAAC,4BAA4B,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;YACnH,MAAM,CAAC,QAAQ,EAAE,CAAA;SACjB;QACD,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,OAAO,QAAQ,CAAA;IAChB,CAAC;CACD;AA5BD,kCA4BC"}

package/dist/src/config/config.d.ts

@@ -1,58 +1,16 @@
 import { ConfigProcessor } from '@contember/engine-plugins';
-import { Typesafe } from '@contember/engine-common';
-import { ProjectConfigResolver } from '@contember/engine-http';
-import { MailerOptions } from '@contember/engine-tenant-api';
-export declare type Config = ReturnType<typeof configSchema>;
-export declare type TenantConfig = Config['tenant'];
-declare const configSchema: Typesafe.Type<{
-    readonly tenant: {
-        readonly db: {
-            readonly host: string;
-            readonly port: number;
-            readonly user: string;
-            readonly password: string;
-            readonly database: string;
-        } & {
-            readonly ssl?: boolean | undefined;
-        };
-        readonly mailer: MailerOptions;
-        readonly credentials: {
-            readonly rootToken?: string | undefined;
-            readonly rootTokenHash?: string | undefined;
-            readonly rootPassword?: string | undefined;
-            readonly rootEmail?: string | undefined;
-            readonly loginToken?: string | undefined;
-        };
-    } & {
-        readonly secrets: {
-            readonly encryptionKey?: string | undefined;
-        };
-    };
-    readonly server: {
-        readonly port: number;
-        readonly monitoringPort: number;
-        readonly http: {
-            readonly requestBodySize?: string | undefined;
-        };
-        readonly logging: {} | {
-            readonly sentry?: {
-                readonly dsn: string;
-            } | undefined;
-        };
-    } & {
-        readonly workerCount?: string | number | undefined;
-        readonly projectGroup?: {
-            readonly domainMapping: string;
-        } | undefined;
-    };
-}>;
+import { serverConfigSchema, tenantConfigSchema } from './configSchema';
+import { ProjectConfigResolver } from './projectConfigResolver';
+import { TenantConfigResolver } from './tenantConfigResolver';
+export declare type ServerConfig = ReturnType<typeof serverConfigSchema>;
+export declare type TenantConfig = ReturnType<typeof tenantConfigSchema>;
 export declare type ConfigSource = {
     data: string;
     type: 'file' | 'json' | 'yaml';
 };
 export declare function readConfig(configSources: ConfigSource[], configProcessors?: ConfigProcessor[]): Promise<{
-    config: Config;
+    serverConfig: ServerConfig;
     projectConfigResolver: ProjectConfigResolver;
+    tenantConfigResolver: TenantConfigResolver;
 }>;
-export {};
 //# sourceMappingURL=config.d.ts.map

package/dist/src/config/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAE5D,oBAAY,MAAM,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAA;AACpD,oBAAY,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;AAoE3C,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGhB,CAAA;AAsFF,oBAAY,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAE3E,wBAAsB,UAAU,CAC/B,aAAa,EAAE,YAAY,EAAE,EAC7B,gBAAgB,GAAE,eAAe,EAAO,GACtC,OAAO,CAAC;IACV,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,qBAAqB,CAAA;CAC5C,CAAC,CAqFD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEvE,OAAO,EAA+B,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC5F,OAAO,EAA8B,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAEzF,oBAAY,YAAY,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAChE,oBAAY,YAAY,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAEhE,oBAAY,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAI3E,wBAAsB,UAAU,CAC/B,aAAa,EAAE,YAAY,EAAE,EAC7B,gBAAgB,GAAE,eAAe,EAAO,GACtC,OAAO,CAAC;IACV,YAAY,EAAE,YAAY,CAAA;IAC1B,qBAAqB,EAAE,qBAAqB,CAAA;IAC5C,oBAAoB,EAAE,oBAAoB,CAAA;CAC1C,CAAC,CA4BD"}