@contember/engine-system-api 1.1.0-alpha.1 → 1.1.0-alpha.4

package/{migrations → dist/src/migrations}/2021-05-19-1232000-event-log-fix-constraint.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const __1 = require("..");
+const model_1 = require("../model");
 const recreateTrigger = (builder, tableName) => {
     builder.dropTrigger(tableName, 'log_event_trx', { ifExists: true });
     builder.dropTrigger(tableName, 'log_event_statement', { ifExists: true });
@@ -19,8 +19,8 @@ const recreateTrigger = (builder, tableName) => {
 };
 async function default_1(builder, args) {
     const schema = await args.schemaResolver();
-    const junctionTables = (0, __1.getJunctionTables)(schema.model);
-    const schemas = args.project.stages.map(__1.formatSchemaName);
+    const junctionTables = (0, model_1.getJunctionTables)(schema.model);
+    const schemas = args.project.stages.map(it => `stage_${it.slug}`);
     for (const table of junctionTables) {
         for (const schema of schemas) {
             recreateTrigger(builder, { name: table.tableName, schema });
@@ -33,3 +33,4 @@ async function default_1(builder, args) {
     }
 }
 exports.default = default_1;
+//# sourceMappingURL=2021-05-19-1232000-event-log-fix-constraint.js.map

package/dist/src/migrations/2021-05-19-1232000-event-log-fix-constraint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"2021-05-19-1232000-event-log-fix-constraint.js","sourceRoot":"","sources":["../../../src/migrations/2021-05-19-1232000-event-log-fix-constraint.ts"],"names":[],"mappings":";;AAEA,oCAA4C;AAE5C,MAAM,eAAe,GAAG,CAAC,OAAyB,EAAE,SAAe,EAAE,EAAE;IACtE,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACnE,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,qBAAqB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACzE,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE;QACjD,IAAI,EAAE,OAAO;QACb,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;QACzC,KAAK,EAAE,KAAK;QACZ,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE;YACT,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,sBAAsB;SAC5B;KACD,CAAC,CAAA;AACH,CAAC,CAAA;AAEc,KAAK,oBAAW,OAAyB,EAAE,IAAyB;IAClF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;IAC1C,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACtD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;IAEjE,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE;QACnC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC7B,eAAe,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,CAAA;SAC3D;KACD;IACD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;QAC1D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC7B,eAAe,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,CAAA;SAC5D;KACD;AACF,CAAC;AAfD,4BAeC"}

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

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

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

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

package/dist/src/{model/dependencies/content → migrations}/index.js

@@ -10,5 +10,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./EntitiesSelector"), exports);
+__exportStar(require("./runner"), exports);
+__exportStar(require("./types"), exports);
 //# sourceMappingURL=index.js.map

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

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

package/dist/src/migrations/runner.d.ts

@@ -0,0 +1,3 @@
+import { Migration } from '@contember/database-migrations';
+export declare const getSystemMigrations: () => Promise<Migration[]>;
+//# sourceMappingURL=runner.d.ts.map

package/dist/src/migrations/runner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/migrations/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAE,MAAM,gCAAgC,CAAA;AAO1E,eAAO,MAAM,mBAAmB,QAAO,QAAQ,SAAS,EAAE,CAQzD,CAAA"}

package/{migrations/index.js → dist/src/migrations/runner.js}

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSystemMigrations = void 0;
 const database_migrations_1 = require("@contember/database-migrations");
 const _2020_03_27_130000_project_migrations_1 = __importDefault(require("./2020-03-27-130000-project-migrations"));
 const _2020_05_06_150000_composed_primary_1 = __importDefault(require("./2020-05-06-150000-composed-primary"));
 const _2020_06_01_103000_event_trigger_perf_1 = __importDefault(require("./2020-06-01-103000-event-trigger-perf"));
 const _2021_05_07_155800_event_log_rework_1 = __importDefault(require("./2021-05-07-155800-event-log-rework"));
 const _2021_05_19_1232000_event_log_fix_constraint_1 = __importDefault(require("./2021-05-19-1232000-event-log-fix-constraint"));
-function default_1() {
+const getSystemMigrations = () => {
     return (0, database_migrations_1.loadMigrations)(process.env.CONTEMBER_SYSTEM_MIGRATIONS_DIR || __dirname, [
         new database_migrations_1.Migration('2020-03-27-130000-project-migrations', _2020_03_27_130000_project_migrations_1.default),
         new database_migrations_1.Migration('2020-05-06-150000-composed-primary', _2020_05_06_150000_composed_primary_1.default),
@@ -17,5 +18,6 @@ function default_1() {
         new database_migrations_1.Migration('2021-05-07-155800-event-log-rework', _2021_05_07_155800_event_log_rework_1.default),
         new database_migrations_1.Migration('2021-05-19-1232000-event-log-fix-constraint', _2021_05_19_1232000_event_log_fix_constraint_1.default),
     ]);
-}
-exports.default = default_1;
+};
+exports.getSystemMigrations = getSystemMigrations;
+//# sourceMappingURL=runner.js.map

package/dist/src/migrations/runner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/migrations/runner.ts"],"names":[],"mappings":";;;;;;AAAA,wEAA0E;AAC1E,mHAAsE;AACtE,+GAAkE;AAClE,mHAAqE;AACrE,+GAAiE;AACjE,iIAAiF;AAE1E,MAAM,mBAAmB,GAAG,GAAyB,EAAE;IAC7D,OAAO,IAAA,oCAAc,EAAC,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,SAAS,EAAE;QAC/E,IAAI,+BAAS,CAAC,sCAAsC,EAAE,+CAAiB,CAAC;QACxE,IAAI,+BAAS,CAAC,oCAAoC,EAAE,6CAAe,CAAC;QACpE,IAAI,+BAAS,CAAC,sCAAsC,EAAE,+CAAgB,CAAC;QACvE,IAAI,+BAAS,CAAC,oCAAoC,EAAE,6CAAc,CAAC;QACnE,IAAI,+BAAS,CAAC,6CAA6C,EAAE,sDAAqB,CAAC;KACnF,CAAC,CAAA;AACH,CAAC,CAAA;AARY,QAAA,mBAAmB,uBAQ/B"}

package/dist/src/migrations/types.d.ts

@@ -0,0 +1,7 @@
+import { Schema } from '@contember/schema';
+import { ProjectConfig } from '../types';
+export interface SystemMigrationArgs {
+    schemaResolver: () => Promise<Schema>;
+    project: ProjectConfig;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/src/migrations/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/migrations/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,MAAM,WAAW,mBAAmB;IACnC,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;IACrC,OAAO,EAAE,aAAa,CAAA;CACtB"}

package/dist/src/{migrations.js → migrations/types.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=migrations.js.map
+//# sourceMappingURL=types.js.map

package/dist/src/migrations/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/migrations/types.ts"],"names":[],"mappings":""}

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectInitializer.d.ts","sourceRoot":"","sources":["../../../src/model/ProjectInitializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAe,MAAM,UAAU,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAmB,sBAAsB,EAAE,MAAM,YAAY,CAAA;AACpE,OAAO,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAEN,mBAAmB,EAInB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAExD,qBAAa,kBAAkB;IAE7B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,+BAA+B;IAChD,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBAHpB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,+BAA+B,EAAE,+BAA+B,EAChE,oBAAoB,EAAE,oBAAoB;IAG/C,UAAU,CACtB,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,aAAa,GAAG;QAAE,EAAE,CAAC,EAAE,mBAAmB,CAAA;KAAE,EACrD,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,SAAS,EAAE;YAiCX,UAAU;CAwBxB"}
+{"version":3,"file":"ProjectInitializer.d.ts","sourceRoot":"","sources":["../../../src/model/ProjectInitializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAmB,sBAAsB,EAAE,MAAM,YAAY,CAAA;AACpE,OAAO,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAGN,mBAAmB,EAGnB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAGxD,qBAAa,kBAAkB;IAE7B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,+BAA+B;IAChD,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBAHpB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,+BAA+B,EAAE,+BAA+B,EAChE,oBAAoB,EAAE,oBAAoB;IAG/C,UAAU,CACtB,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,aAAa,GAAG;QAAE,EAAE,CAAC,EAAE,mBAAmB,CAAA;KAAE,EACrD,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,SAAS,EAAE;YA+BX,UAAU;CA0BxB"}

package/dist/src/model/ProjectInitializer.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectInitializer = void 0;
-const helpers_1 = require("./helpers");
 const database_1 = require("@contember/database");
-const database_migrations_1 = require("@contember/database-migrations");
+const queries_1 = require("./queries");
 class ProjectInitializer {
     constructor(projectMigrator, stageCreator, systemDbMigrationsRunnerFactory, schemaVersionBuilder) {
         this.projectMigrator = projectMigrator;
@@ -12,24 +11,22 @@ class ProjectInitializer {
         this.schemaVersionBuilder = schemaVersionBuilder;
     }
     async initialize(databaseContextFactory, project, logger, migrations) {
-        const dbContext = databaseContextFactory.create(helpers_1.unnamedIdentity);
+        const dbContext = databaseContextFactory.create();
         if (project.db) {
             // todo: use dbContext
             logger.group(`Executing system schema migration`);
-            await (0, database_migrations_1.createDatabaseIfNotExists)(project.db, logger.write.bind(logger));
-            const pgClient = await (0, database_migrations_1.createPgClient)(project.db);
-            await pgClient.connect();
-            const singleConnection = new database_1.SingleConnection(pgClient, {}, new database_1.EventManager(), true);
+            await (0, database_1.createDatabaseIfNotExists)(project.db, logger.write.bind(logger));
+            const singleConnection = new database_1.SingleConnection(project.db, {});
+            const systemSchema = dbContext.client.schema;
             const dbContextMigrations = databaseContextFactory
-                .withClient(singleConnection.createClient('system', { module: 'system' }))
-                .create(helpers_1.unnamedIdentity);
+                .withClient(singleConnection.createClient(systemSchema, { module: 'system' }))
+                .create();
             const schemaResolver = () => this.schemaVersionBuilder.buildSchema(dbContextMigrations);
-            await this.systemDbMigrationsRunnerFactory(project.db, pgClient).migrate(logger.write.bind(logger), {
+            await this.systemDbMigrationsRunnerFactory(singleConnection, systemSchema).migrate(logger.write.bind(logger), {
                 schemaResolver,
                 project,
-                queryHandler: dbContextMigrations.queryHandler,
             });
-            await pgClient.end();
+            await singleConnection.end();
             logger.groupEnd();
         }
         return await (0, database_1.retryTransaction)(() => dbContext.transaction(async (trx) => {
@@ -50,7 +47,8 @@ class ProjectInitializer {
         logger.groupEnd();
         if (migrations) {
             logger.group(`Executing project migrations`);
-            await this.projectMigrator.migrate(db, project, migrations, logger.write.bind(logger));
+            const stages = await db.queryHandler.fetch(new queries_1.StagesQuery());
+            await this.projectMigrator.migrate(db, stages, migrations, logger.write.bind(logger));
             logger.groupEnd();
         }
     }

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectInitializer.js","sourceRoot":"","sources":["../../../src/model/ProjectInitializer.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAM3C,kDAM4B;AAC5B,wEAA0F;AAI1F,MAAa,kBAAkB;IAC9B,YACkB,eAAgC,EAChC,YAA0B,EAC1B,+BAAgE,EAChE,oBAA0C;QAH1C,oBAAe,GAAf,eAAe,CAAiB;QAChC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,oCAA+B,GAA/B,+BAA+B,CAAiC;QAChE,yBAAoB,GAApB,oBAAoB,CAAsB;IACzD,CAAC;IAEG,KAAK,CAAC,UAAU,CACtB,sBAA8C,EAC9C,OAAqD,EACrD,MAAc,EACd,UAAwB;QAExB,MAAM,SAAS,GAAG,sBAAsB,CAAC,MAAM,CAAC,yBAAe,CAAC,CAAA;QAChE,IAAI,OAAO,CAAC,EAAE,EAAE;YACf,sBAAsB;YACtB,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAA;YACjD,MAAM,IAAA,+CAAyB,EAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;YACtE,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAAc,EAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACjD,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAA;YACxB,MAAM,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,uBAAY,EAAE,EAAE,IAAI,CAAC,CAAA;YACrF,MAAM,mBAAmB,GAAG,sBAAsB;iBAChD,UAAU,CAAC,gBAAgB,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;iBACzE,MAAM,CAAC,yBAAe,CAAC,CAAA;YAEzB,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YACvF,MAAM,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,OAAO,CACvE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EACzB;gBACC,cAAc;gBACd,OAAO;gBACP,YAAY,EAAE,mBAAmB,CAAC,YAAY;aAC9C,CACD,CAAA;YACD,MAAM,QAAQ,CAAC,GAAG,EAAE,CAAA;YACpB,MAAM,CAAC,QAAQ,EAAE,CAAA;SACjB;QACD,OAAO,MAAM,IAAA,2BAAgB,EAAC,GAAG,EAAE,CAClC,SAAS,CAAC,WAAW,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;YACjC,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;QACxD,CAAC,CAAC,CACF,CAAA;IACF,CAAC;IAEO,KAAK,CAAC,UAAU,CACvB,EAA+C,EAC/C,OAAsB,EACtB,MAAc,EACd,UAAwB;QAGxB,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAC/B,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;YACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YAC9D,IAAI,OAAO,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,iBAAiB,KAAK,CAAC,IAAI,GAAG,CAAC,CAAA;aAC5C;iBAAM;gBACN,MAAM,CAAC,UAAU,CAAC,iBAAiB,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;aAChD;SACD;QAED,MAAM,CAAC,QAAQ,EAAE,CAAA;QACjB,IAAI,UAAU,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;YAC5C,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;YACtF,MAAM,CAAC,QAAQ,EAAE,CAAA;SACjB;IACF,CAAC;CACD;AArED,gDAqEC"}
+{"version":3,"file":"ProjectInitializer.js","sourceRoot":"","sources":["../../../src/model/ProjectInitializer.ts"],"names":[],"mappings":"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"}

package/dist/src/model/ProjectTruncateExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectTruncateExecutor.d.ts","sourceRoot":"","sources":["../../../src/model/ProjectTruncateExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAGxC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG1C,qBAAa,uBAAuB;IACtB,eAAe,CAAC,EAAE,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM;CAexF"}
+{"version":3,"file":"ProjectTruncateExecutor.d.ts","sourceRoot":"","sources":["../../../src/model/ProjectTruncateExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAGxC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI1C,qBAAa,uBAAuB;IACtB,eAAe,CAAC,EAAE,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM;CAexF"}

package/dist/src/model/ProjectTruncateExecutor.js

@@ -4,6 +4,7 @@ exports.ProjectTruncateExecutor = void 0;
 const commands_1 = require("./commands");
 const helpers_1 = require("./helpers");
 const database_1 = require("@contember/database");
+const queries_1 = require("./queries");
 class ProjectTruncateExecutor {
     async truncateProject(db, project, schema) {
         await db.transaction(async (trx) => {
@@ -11,9 +12,9 @@ class ProjectTruncateExecutor {
             const tableNames = Object.values(schema.model.entities).filter(it => !it.view).map(it => it.tableName);
             const junctionTableNames = (0, helpers_1.getJunctionTables)(schema.model).map(it => it.tableName);
             const allTableNames = [...tableNames, ...junctionTableNames];
-            for (const stage of project.stages) {
-                const schemaName = (0, helpers_1.formatSchemaName)(stage);
-                const wrappedNames = allTableNames.map(it => `${(0, database_1.wrapIdentifier)(schemaName)}.${(0, database_1.wrapIdentifier)(it)}`);
+            const stages = await db.queryHandler.fetch(new queries_1.StagesQuery());
+            for (const stage of stages) {
+                const wrappedNames = allTableNames.map(it => `${(0, database_1.wrapIdentifier)(stage.schema)}.${(0, database_1.wrapIdentifier)(it)}`);
                 await trx.client.query(`TRUNCATE ${wrappedNames}`);
             }
             await trx.client.query('SET CONSTRAINTS ALL IMMEDIATE');

package/dist/src/model/ProjectTruncateExecutor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectTruncateExecutor.js","sourceRoot":"","sources":["../../../src/model/ProjectTruncateExecutor.ts"],"names":[],"mappings":";;;AAEA,yCAAkD;AAClD,uCAA+D;AAE/D,kDAAoD;AAEpD,MAAa,uBAAuB;IAC5B,KAAK,CAAC,eAAe,CAAC,EAAmB,EAAE,OAAsB,EAAE,MAAc;QACvF,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;YAChC,MAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACtD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;YACtG,MAAM,kBAAkB,GAAG,IAAA,2BAAiB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;YAClF,MAAM,aAAa,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,kBAAkB,CAAC,CAAA;YAC5D,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBACnC,MAAM,UAAU,GAAG,IAAA,0BAAgB,EAAC,KAAK,CAAC,CAAA;gBAC1C,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAA,yBAAc,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAc,EAAC,EAAE,CAAC,EAAE,CAAC,CAAA;gBACnG,MAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,YAAY,EAAE,CAAC,CAAA;aAClD;YACD,MAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;YACvD,MAAM,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,gCAAqB,EAAE,CAAC,CAAA;QAC1D,CAAC,CAAC,CAAA;IACH,CAAC;CACD;AAhBD,0DAgBC"}
+{"version":3,"file":"ProjectTruncateExecutor.js","sourceRoot":"","sources":["../../../src/model/ProjectTruncateExecutor.ts"],"names":[],"mappings":";;;AAEA,yCAAkD;AAClD,uCAA6C;AAE7C,kDAAoD;AACpD,uCAAuC;AAEvC,MAAa,uBAAuB;IAC5B,KAAK,CAAC,eAAe,CAAC,EAAmB,EAAE,OAAsB,EAAE,MAAc;QACvF,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;YAChC,MAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACtD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;YACtG,MAAM,kBAAkB,GAAG,IAAA,2BAAiB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;YAClF,MAAM,aAAa,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,kBAAkB,CAAC,CAAA;YAC5D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,qBAAW,EAAE,CAAC,CAAA;YAC7D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBAC3B,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAA,yBAAc,EAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAA,yBAAc,EAAC,EAAE,CAAC,EAAE,CAAC,CAAA;gBACrG,MAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,YAAY,EAAE,CAAC,CAAA;aAClD;YACD,MAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;YACvD,MAAM,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,gCAAqB,EAAE,CAAC,CAAA;QAC1D,CAAC,CAAC,CAAA;IACH,CAAC;CACD;AAhBD,0DAgBC"}

package/dist/src/model/commands/stages/CreateStageCommand.d.ts

@@ -0,0 +1,8 @@
+import { StageConfig } from '../../../types';
+import { Command } from '../Command';
+export declare class CreateStageCommand implements Command<void> {
+    private readonly stage;
+    constructor(stage: StageConfig);
+    execute({ db, providers }: Command.Args): Promise<void>;
+}
+//# sourceMappingURL=CreateStageCommand.d.ts.map

package/dist/src/model/commands/stages/CreateStageCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreateStageCommand.d.ts","sourceRoot":"","sources":["../../../../../src/model/commands/stages/CreateStageCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAGpC,qBAAa,kBAAmB,YAAW,OAAO,CAAC,IAAI,CAAC;IAC3C,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,WAAW;IAElC,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CAcpE"}

package/dist/src/model/commands/stages/{CreateOrUpdateStageCommand.js → CreateStageCommand.js}

@@ -1,27 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateOrUpdateStageCommand = void 0;
+exports.CreateStageCommand = void 0;
 const database_1 = require("@contember/database");
 const helpers_1 = require("../../helpers");
-class CreateOrUpdateStageCommand {
+class CreateStageCommand {
     constructor(stage) {
         this.stage = stage;
     }
     async execute({ db, providers }) {
-        const result = await database_1.InsertBuilder.create()
+        var _a;
+        const schemaName = (_a = this.stage.schema) !== null && _a !== void 0 ? _a : (0, helpers_1.formatSchemaName)(this.stage);
+        await database_1.InsertBuilder.create()
             .into('stage')
             .values({
             id: providers.uuid(),
             name: this.stage.name,
             slug: this.stage.slug,
-        })
-            .onConflict(database_1.ConflictActionType.update, ['slug'], {
-            name: this.stage.name,
+            schema: schemaName,
         })
             .execute(db);
-        await db.query('CREATE SCHEMA IF NOT EXISTS ' + (0, database_1.wrapIdentifier)((0, helpers_1.formatSchemaName)(this.stage)));
-        return result > 0;
+        await db.query('CREATE SCHEMA IF NOT EXISTS ' + (0, database_1.wrapIdentifier)(schemaName));
     }
 }
-exports.CreateOrUpdateStageCommand = CreateOrUpdateStageCommand;
-//# sourceMappingURL=CreateOrUpdateStageCommand.js.map
+exports.CreateStageCommand = CreateStageCommand;
+//# sourceMappingURL=CreateStageCommand.js.map

package/dist/src/model/commands/stages/CreateStageCommand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreateStageCommand.js","sourceRoot":"","sources":["../../../../../src/model/commands/stages/CreateStageCommand.ts"],"names":[],"mappings":";;;AAAA,kDAAmE;AAGnE,2CAAgD;AAEhD,MAAa,kBAAkB;IAC9B,YAA6B,KAAkB;QAAlB,UAAK,GAAL,KAAK,CAAa;IAAG,CAAC;IAE5C,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAgB;;QACnD,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,MAAM,mCAAI,IAAA,0BAAgB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACpE,MAAM,wBAAa,CAAC,MAAM,EAAE;aAC1B,IAAI,CAAC,OAAO,CAAC;aACb,MAAM,CAAC;YACP,EAAE,EAAE,SAAS,CAAC,IAAI,EAAE;YACpB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;YACrB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;YACrB,MAAM,EAAE,UAAU;SAClB,CAAC;aACD,OAAO,CAAC,EAAE,CAAC,CAAA;QAEb,MAAM,EAAE,CAAC,KAAK,CAAC,8BAA8B,GAAG,IAAA,yBAAc,EAAC,UAAU,CAAC,CAAC,CAAA;IAC5E,CAAC;CACD;AAjBD,gDAiBC"}

package/dist/src/model/commands/stages/index.d.ts

@@ -1,3 +1,3 @@
-export * from './CreateOrUpdateStageCommand';
+export * from './CreateStageCommand';
 export * from './TruncateStagesCommand';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/model/commands/stages/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/model/commands/stages/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAA;AAC5C,cAAc,yBAAyB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/model/commands/stages/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA"}

package/dist/src/model/commands/stages/index.js

@@ -10,6 +10,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./CreateOrUpdateStageCommand"), exports);
+__exportStar(require("./CreateStageCommand"), exports);
 __exportStar(require("./TruncateStagesCommand"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/model/commands/stages/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/model/commands/stages/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA4C;AAC5C,0DAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/model/commands/stages/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAoC;AACpC,0DAAuC"}

package/dist/src/model/database/DatabaseContext.d.ts

@@ -12,7 +12,7 @@ export declare class DatabaseContextFactory {
     private readonly client;
     private readonly providers;
     constructor(client: Client, providers: UuidProvider);
-    create(identityId: string | undefined): DatabaseContext;
+    create(): DatabaseContext;
     withClient(client: Client): DatabaseContextFactory;
 }
 //# sourceMappingURL=DatabaseContext.d.ts.map

package/dist/src/model/database/DatabaseContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseContext.d.ts","sourceRoot":"","sources":["../../../../src/model/database/DatabaseContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAGxC,MAAM,WAAW,eAAe,CAAC,cAAc,SAAS,UAAU,CAAC,cAAc,GAAG,UAAU,CAAC,cAAc;IAC5G,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;IAC9B,YAAY,EAAE,YAAY,CAAC,iBAAiB,CAAC,CAAA;IAC7C,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACvG,UAAU,EAAE,UAAU,CAAA;CACtB;AAED,qBAAa,sBAAsB;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAA1C,MAAM,EAAE,MAAM,EAAmB,SAAS,EAAE,YAAY;IAE9E,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,eAAe;IAIvD,UAAU,CAAC,MAAM,EAAE,MAAM;CAGhC"}
+{"version":3,"file":"DatabaseContext.d.ts","sourceRoot":"","sources":["../../../../src/model/database/DatabaseContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,WAAW,eAAe,CAAC,cAAc,SAAS,UAAU,CAAC,cAAc,GAAG,UAAU,CAAC,cAAc;IAC5G,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;IAC9B,YAAY,EAAE,YAAY,CAAC,iBAAiB,CAAC,CAAA;IAC7C,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACvG,UAAU,EAAE,UAAU,CAAA;CACtB;AAED,qBAAa,sBAAsB;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAA1C,MAAM,EAAE,MAAM,EAAmB,SAAS,EAAE,YAAY;IAE9E,MAAM,IAAI,eAAe;IAIzB,UAAU,CAAC,MAAM,EAAE,MAAM;CAGhC"}

package/dist/src/model/database/DatabaseContext.js

@@ -3,29 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseContextFactory = void 0;
 const database_1 = require("@contember/database");
 const commands_1 = require("../commands");
-const helpers_1 = require("../helpers");
 class DatabaseContextFactory {
     constructor(client, providers) {
         this.client = client;
         this.providers = providers;
     }
-    create(identityId) {
-        return createDatabaseContext(this.client, identityId, this.providers);
+    create() {
+        return createDatabaseContext(this.client, this.providers);
     }
     withClient(client) {
         return new DatabaseContextFactory(client, this.providers);
     }
 }
 exports.DatabaseContextFactory = DatabaseContextFactory;
-const createDatabaseContext = (client, identityId, providers) => ({
+const createDatabaseContext = (client, providers) => ({
     client,
     queryHandler: client.createQueryHandler(),
     transaction: cb => client.transaction(async (client) => {
         await client.query(database_1.Connection.REPEATABLE_READ);
-        if (identityId) {
-            await (0, helpers_1.setupSystemVariables)(client, identityId, providers);
-        }
-        return cb(createDatabaseContext(client, undefined, providers));
+        return cb(createDatabaseContext(client, providers));
     }),
     commandBus: new commands_1.CommandBus(client, providers),
 });

package/dist/src/model/database/DatabaseContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseContext.js","sourceRoot":"","sources":["../../../../src/model/database/DatabaseContext.ts"],"names":[],"mappings":";;;AAAA,kDAA2E;AAG3E,0CAAwC;AACxC,wCAAiD;AASjD,MAAa,sBAAsB;IAClC,YAA6B,MAAc,EAAmB,SAAuB;QAAxD,WAAM,GAAN,MAAM,CAAQ;QAAmB,cAAS,GAAT,SAAS,CAAc;IAAG,CAAC;IAElF,MAAM,CAAC,UAA8B;QAC3C,OAAO,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IACtE,CAAC;IAEM,UAAU,CAAC,MAAc;QAC/B,OAAO,IAAI,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC1D,CAAC;CACD;AAVD,wDAUC;AAED,MAAM,qBAAqB,GAAG,CAC7B,MAA8B,EAC9B,UAA8B,EAC9B,SAAuB,EACW,EAAE,CAAC,CAAC;IACtC,MAAM;IACN,YAAY,EAAE,MAAM,CAAC,kBAAkB,EAAE;IACzC,WAAW,EAAE,EAAE,CAAC,EAAE,CACjB,MAAM,CAAC,WAAW,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QACjC,MAAM,MAAM,CAAC,KAAK,CAAC,qBAAU,CAAC,eAAe,CAAC,CAAA;QAC9C,IAAI,UAAU,EAAE;YACf,MAAM,IAAA,8BAAoB,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAA;SACzD;QACD,OAAO,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;IAC/D,CAAC,CAAC;IACH,UAAU,EAAE,IAAI,qBAAU,CAAC,MAAM,EAAE,SAAS,CAAC;CAC7C,CAAC,CAAA"}
+{"version":3,"file":"DatabaseContext.js","sourceRoot":"","sources":["../../../../src/model/database/DatabaseContext.ts"],"names":[],"mappings":";;;AAAA,kDAA2E;AAG3E,0CAAwC;AASxC,MAAa,sBAAsB;IAClC,YAA6B,MAAc,EAAmB,SAAuB;QAAxD,WAAM,GAAN,MAAM,CAAQ;QAAmB,cAAS,GAAT,SAAS,CAAc;IAAG,CAAC;IAElF,MAAM;QACZ,OAAO,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC1D,CAAC;IAEM,UAAU,CAAC,MAAc;QAC/B,OAAO,IAAI,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC1D,CAAC;CACD;AAVD,wDAUC;AAED,MAAM,qBAAqB,GAAG,CAC7B,MAA8B,EAC9B,SAAuB,EACW,EAAE,CAAC,CAAC;IACtC,MAAM;IACN,YAAY,EAAE,MAAM,CAAC,kBAAkB,EAAE;IACzC,WAAW,EAAE,EAAE,CAAC,EAAE,CACjB,MAAM,CAAC,WAAW,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QACjC,MAAM,MAAM,CAAC,KAAK,CAAC,qBAAU,CAAC,eAAe,CAAC,CAAA;QAC9C,OAAO,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;IACpD,CAAC,CAAC;IACH,UAAU,EAAE,IAAI,qBAAU,CAAC,MAAM,EAAE,SAAS,CAAC;CAC7C,CAAC,CAAA"}

package/dist/src/model/dependencies/index.d.ts

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

package/dist/src/model/dependencies/index.d.ts.map

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

package/dist/src/model/dependencies/index.js

@@ -10,6 +10,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./content"), exports);
 __exportStar(require("./tenant"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/model/dependencies/index.js.map

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

package/dist/src/model/dependencies/tenant/IdentityFetcher.d.ts

@@ -1,6 +1,5 @@
-import { Client } from '@contember/database';
 export interface IdentityFetcher {
-    fetchIdentities(client: Client, ids: string[]): Promise<TenantIdentity[]>;
+    fetchIdentities(ids: string[]): Promise<TenantIdentity[]>;
 }
 export declare type TenantIdentity = PersonIdentity | ApiKeyIdentity;
 export interface PersonIdentity {

package/dist/src/model/dependencies/tenant/IdentityFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IdentityFetcher.d.ts","sourceRoot":"","sources":["../../../../../src/model/dependencies/tenant/IdentityFetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,WAAW,eAAe;IAC/B,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAAA;CACzE;AAED,oBAAY,cAAc,GAAG,cAAc,GAAG,cAAc,CAAA;AAE5D,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,MAAM,EAAE;QAChB,EAAE,EAAE,MAAM,CAAA;QACV,IAAI,EAAE,MAAM,CAAA;KACZ,CAAA;CACD;AAED,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAC5B"}
+{"version":3,"file":"IdentityFetcher.d.ts","sourceRoot":"","sources":["../../../../../src/model/dependencies/tenant/IdentityFetcher.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,eAAe;IAC/B,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAAA;CACzD;AAED,oBAAY,cAAc,GAAG,cAAc,GAAG,cAAc,CAAA;AAE5D,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,MAAM,EAAE;QAChB,EAAE,EAAE,MAAM,CAAA;QACV,IAAI,EAAE,MAAM,CAAA;KACZ,CAAA;CACD;AAED,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAC5B"}

package/dist/src/model/dtos/Stage.d.ts

@@ -1,9 +1,7 @@
 export interface Stage {
+    readonly id: string;
     readonly name: string;
     readonly slug: string;
+    readonly schema: string;
 }
-export interface StageWithId extends Stage {
-    readonly id: string;
-}
-export declare type StageWithoutEvent = Pick<Stage, Exclude<keyof Stage, 'event_id'>>;
 //# sourceMappingURL=Stage.d.ts.map

package/dist/src/model/dtos/Stage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Stage.d.ts","sourceRoot":"","sources":["../../../../src/model/dtos/Stage.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,KAAK;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,WAAY,SAAQ,KAAK;IACzC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CACnB;AAED,oBAAY,iBAAiB,GAAG,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,KAAK,EAAE,UAAU,CAAC,CAAC,CAAA"}
+{"version":3,"file":"Stage.d.ts","sourceRoot":"","sources":["../../../../src/model/dtos/Stage.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,KAAK;IACrB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACvB"}

package/dist/src/model/events/EventResponseBuilder.d.ts

@@ -1,11 +1,10 @@
 import { AnyEvent } from '@contember/engine-common';
 import { CreateEvent, DeleteEvent, UpdateEvent } from '../../schema';
 import { IdentityFetcher } from '../dependencies';
-import { Client } from '@contember/database';
 export declare class EventResponseBuilder {
     private readonly identityFetcher;
     constructor(identityFetcher: IdentityFetcher);
-    buildResponse(tenantDb: Client, events: AnyEvent[]): Promise<(CreateEvent | DeleteEvent | UpdateEvent)[]>;
+    buildResponse(events: AnyEvent[]): Promise<(CreateEvent | DeleteEvent | UpdateEvent)[]>;
     private formatDescription;
 }
 //# sourceMappingURL=EventResponseBuilder.d.ts.map

package/dist/src/model/events/EventResponseBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventResponseBuilder.d.ts","sourceRoot":"","sources":["../../../../src/model/events/EventResponseBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,WAAW,EAA6B,WAAW,EAAE,MAAM,cAAc,CAAA;AAE/F,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAGjD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,qBAAa,oBAAoB;IACpB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,EAAE,eAAe;IAEhD,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAC,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC,EAAE,CAAC;IAiCtH,OAAO,CAAC,iBAAiB;CAYzB"}
+{"version":3,"file":"EventResponseBuilder.d.ts","sourceRoot":"","sources":["../../../../src/model/events/EventResponseBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,WAAW,EAA6B,WAAW,EAAE,MAAM,cAAc,CAAA;AAE/F,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAIjD,qBAAa,oBAAoB;IACpB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,EAAE,eAAe;IAEhD,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAC,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC,EAAE,CAAC;IAiCpG,OAAO,CAAC,iBAAiB;CAYzB"}

package/dist/src/model/events/EventResponseBuilder.js

@@ -10,14 +10,14 @@ class EventResponseBuilder {
     constructor(identityFetcher) {
         this.identityFetcher = identityFetcher;
     }
-    async buildResponse(tenantDb, events) {
+    async buildResponse(events) {
         const apiEventTypeMapping = {
             [engine_common_1.EventType.create]: schema_1.EventType.Create,
             [engine_common_1.EventType.update]: schema_1.EventType.Update,
             [engine_common_1.EventType.delete]: schema_1.EventType.Delete,
         };
         const identityIds = events.map(it => it.identityId).filter((it, index, ids) => ids.indexOf(it) === index);
-        const identities = await this.identityFetcher.fetchIdentities(tenantDb, identityIds);
+        const identities = await this.identityFetcher.fetchIdentities(identityIds);
         const identitiesMap = Object.fromEntries(identities.map(it => [it.identityId, it]));
         return events.map(it => {
             const commonData = {

package/dist/src/model/events/EventResponseBuilder.js.map

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

package/dist/src/model/migrations/ProjectMigrator.d.ts

@@ -1,15 +1,15 @@
 import { Migration, MigrationDescriber } from '@contember/schema-migrations';
+import { Stage } from '../dtos';
 import { DatabaseContext } from '../database';
 import { ExecutedMigrationsResolver } from './ExecutedMigrationsResolver';
 import { MigrateErrorCode } from '../../schema';
-import { ProjectConfig } from '../../types';
 import { SchemaVersionBuilder } from './SchemaVersionBuilder';
 export declare class ProjectMigrator {
     private readonly migrationDescriber;
     private readonly schemaVersionBuilder;
     private readonly executedMigrationsResolver;
     constructor(migrationDescriber: MigrationDescriber, schemaVersionBuilder: SchemaVersionBuilder, executedMigrationsResolver: ExecutedMigrationsResolver);
-    migrate(db: DatabaseContext, project: ProjectConfig, migrationsToExecute: readonly Migration[], logger: (message: string) => void, ignoreOrder?: boolean): Promise<void>;
+    migrate(db: DatabaseContext, stages: Stage[], migrationsToExecute: readonly Migration[], logger: (message: string) => void, ignoreOrder?: boolean): Promise<void>;
     private validateMigrations;
     private applyModification;
     private executeOnStage;

package/dist/src/model/migrations/ProjectMigrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectMigrator.d.ts","sourceRoot":"","sources":["../../../../src/model/migrations/ProjectMigrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAM5E,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,qBAAa,eAAe;IAE1B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAF1B,kBAAkB,EAAE,kBAAkB,EACtC,oBAAoB,EAAE,oBAAoB,EAC1C,0BAA0B,EAAE,0BAA0B;IAG3D,OAAO,CACnB,EAAE,EAAE,eAAe,EACnB,OAAO,EAAE,aAAa,EACtB,mBAAmB,EAAE,SAAS,SAAS,EAAE,EACzC,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,EACjC,WAAW,GAAE,OAAe;YA+Bf,kBAAkB;YA+BlB,iBAAiB;YAmBjB,cAAc;CAa5B;AAED,8BAAsB,cAAe,SAAQ,KAAK;aAGrB,OAAO,EAAE,MAAM;aAAkB,cAAc,EAAE,MAAM;IAFnF,SAAgB,IAAI,EAAE,gBAAgB,CAAA;gBAEV,OAAO,EAAE,MAAM,EAAkB,cAAc,EAAE,MAAM;CAGnF;AAED,qBAAa,8BAA+B,SAAQ,cAAc;IACjE,IAAI,mBAAoC;CACxC;AAED,qBAAa,6BAA8B,SAAQ,cAAc;IAChE,IAAI,mBAAmC;CACvC;AAED,qBAAa,oBAAqB,SAAQ,cAAc;IACvD,IAAI,mBAAmC;CACvC;AAED,qBAAa,kBAAmB,SAAQ,cAAc;IACrD,IAAI,mBAAiC;CACrC"}
+{"version":3,"file":"ProjectMigrator.d.ts","sourceRoot":"","sources":["../../../../src/model/migrations/ProjectMigrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAK5E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,qBAAa,eAAe;IAE1B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAF1B,kBAAkB,EAAE,kBAAkB,EACtC,oBAAoB,EAAE,oBAAoB,EAC1C,0BAA0B,EAAE,0BAA0B;IAG3D,OAAO,CACnB,EAAE,EAAE,eAAe,EACnB,MAAM,EAAE,KAAK,EAAE,EACf,mBAAmB,EAAE,SAAS,SAAS,EAAE,EACzC,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,EACjC,WAAW,GAAE,OAAe;YAgCf,kBAAkB;YA+BlB,iBAAiB;YAoBjB,cAAc;CAa5B;AAED,8BAAsB,cAAe,SAAQ,KAAK;aAGrB,OAAO,EAAE,MAAM;aAAkB,cAAc,EAAE,MAAM;IAFnF,SAAgB,IAAI,EAAE,gBAAgB,CAAA;gBAEV,OAAO,EAAE,MAAM,EAAkB,cAAc,EAAE,MAAM;CAGnF;AAED,qBAAa,8BAA+B,SAAQ,cAAc;IACjE,IAAI,mBAAoC;CACxC;AAED,qBAAa,6BAA8B,SAAQ,cAAc;IAChE,IAAI,mBAAmC;CACvC;AAED,qBAAa,oBAAqB,SAAQ,cAAc;IACvD,IAAI,mBAAmC;CACvC;AAED,qBAAa,kBAAmB,SAAQ,cAAc;IACrD,IAAI,mBAAiC;CACrC"}

package/dist/src/model/migrations/ProjectMigrator.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvalidSchemaError = exports.MigrationFailedError = exports.AlreadyExecutedMigrationError = exports.MustFollowLatestMigrationError = exports.MigrationError = exports.ProjectMigrator = void 0;
 const database_1 = require("@contember/database");
-const helpers_1 = require("../helpers");
 const commands_1 = require("../commands");
 const schema_1 = require("../../schema");
 class ProjectMigrator {
@@ -11,7 +10,7 @@ class ProjectMigrator {
         this.schemaVersionBuilder = schemaVersionBuilder;
         this.executedMigrationsResolver = executedMigrationsResolver;
     }
-    async migrate(db, project, migrationsToExecute, logger, ignoreOrder = false) {
+    async migrate(db, stages, migrationsToExecute, logger, ignoreOrder = false) {
         if (migrationsToExecute.length === 0) {
             return;
         }
@@ -22,7 +21,7 @@ class ProjectMigrator {
             logger(`Executing migration ${migration.name}...`);
             const formatVersion = migration.formatVersion;
             for (const modification of migration.modifications) {
-                [schema] = await this.applyModification(db.client, project.stages, schema, modification, formatVersion, migration.version);
+                [schema] = await this.applyModification(db.client, stages, schema, modification, formatVersion, migration.version, db.client.schema);
             }
             await db.commandBus.execute(new commands_1.SaveMigrationCommand(migration));
             logger(`Done`);
@@ -38,7 +37,7 @@ class ProjectMigrator {
             if (migration.version < version && !ignoreOrder) {
                 throw new MustFollowLatestMigrationError(migration.version, `Must follow latest executed migration ${version}`);
             }
-            const described = await this.migrationDescriber.describeModifications(schema, migration);
+            const described = await this.migrationDescriber.describeModifications(schema, migration, 'system'); // system schema name not important here
             if (described.length === 0) {
                 continue;
             }
@@ -50,15 +49,15 @@ class ProjectMigrator {
             }
         }
     }
-    async applyModification(db, stages, schema, modification, formatVersion, migrationVersion) {
-        const { sql, schema: newSchema, handler, } = await this.migrationDescriber.describeModification(schema, modification, formatVersion);
+    async applyModification(db, stages, schema, modification, formatVersion, migrationVersion, systemSchema) {
+        const { sql, schema: newSchema, handler, } = await this.migrationDescriber.describeModification(schema, modification, { systemSchema, formatVersion });
         for (const stage of stages) {
             await this.executeOnStage(db, stage, sql, migrationVersion);
         }
         return [newSchema];
     }
     async executeOnStage(db, stage, sql, migrationVersion) {
-        await db.query('SET search_path TO ' + (0, database_1.wrapIdentifier)((0, helpers_1.formatSchemaName)(stage)));
+        await db.query('SET search_path TO ' + (0, database_1.wrapIdentifier)(stage.schema));
         try {
             await db.query(sql);
         }

package/dist/src/model/migrations/ProjectMigrator.js.map

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