@contember/engine-system-api 2.0.0-alpha.12 → 2.0.0-alpha.14

package/dist/production/src/model/migrations/SchemaProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SchemaProvider.js","sources":["../../../../../../packages/engine-system-api/src/model/migrations/SchemaProvider.ts"],"sourcesContent":["import { SchemaQuery } from '../queries'\nimport { DatabaseContext } from '../database'\nimport { calculateSchemaChecksum, emptySchema, normalizeSchema } from '@contember/schema-utils'\nimport { ExecutedMigrationsResolver } from './ExecutedMigrationsResolver'\nimport { SchemaMigrator } from '@contember/schema-migrations'\nimport { Schema } from '@contember/schema'\n\nexport type SchemaMeta = {\n\tchecksum: string\n\tversion: string\n\tupdatedAt: Date\n\tid: number\n}\n\nexport const emptyVersionedSchema: SchemaWithMeta = {\n\tschema: emptySchema,\n\tmeta: {},\n}\n\nexport type SchemaWithMeta = {\n\tschema: Schema\n\tmeta: SchemaMeta | { [K in keyof SchemaMeta]?: undefined }\n}\n\nexport class SchemaProvider {\n\tconstructor(\n\t\tprivate readonly executedMigrationsResolver: ExecutedMigrationsResolver,\n\t\tprivate readonly schemaMigrator: SchemaMigrator,\n\t) {\n\t}\n\n\tasync buildSchemaFromMigrations(db: DatabaseContext): Promise<SchemaWithMeta> {\n\t\tconst newMigrations = (await this.executedMigrationsResolver.getMigrations(db))\n\n\t\tconst partialResult = newMigrations.reduce<SchemaWithMeta>(\n\t\t\t(schema, migration) => {\n\t\t\t\tif (migration.type !== 'schema') {\n\t\t\t\t\treturn schema\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\tschema: this.schemaMigrator.applyModifications(schema.schema, migration.modifications, migration.formatVersion),\n\t\t\t\t\tmeta: {\n\t\t\t\t\t\tversion: migration.version,\n\t\t\t\t\t\tid: migration.id,\n\t\t\t\t\t\tupdatedAt: migration.executedAt,\n\t\t\t\t\t\tchecksum: '',\n\t\t\t\t\t},\n\t\t\t\t}\n\t\t\t},\n\t\t\temptyVersionedSchema,\n\t\t)\n\n\t\tif (!partialResult.meta.version) {\n\t\t\treturn emptyVersionedSchema\n\t\t}\n\n\t\treturn {\n\t\t\tschema: partialResult.schema,\n\t\t\tmeta: {\n\t\t\t\t...partialResult.meta,\n\t\t\t\tchecksum: calculateSchemaChecksum(partialResult.schema),\n\t\t\t},\n\t\t}\n\t}\n\n\tpublic async fetch({ db, currentSchema  }: {\n\t\tdb: DatabaseContext\n\t\tcurrentSchema?: SchemaWithMeta | null\n\t}): Promise<SchemaWithMeta> {\n\t\tconst newSchema = await db.queryHandler.fetch(new SchemaQuery(currentSchema?.meta.checksum))\n\t\tif (!newSchema) {\n\t\t\treturn currentSchema ?? emptyVersionedSchema\n\t\t}\n\n\t\treturn newSchema\n\t}\n}\n"],"names":[],"mappings":";;;;;;AAcO,MAAM,uBAAuC;AAAA,EACnD,QAAQ;AAAA,EACR,MAAM,CAAC;AACR;AAOO,MAAM,eAAe;AAAA,EAC3B,YACkB,4BACA,gBAChB;AAFgB,SAAA,6BAAA;AACA,SAAA,iBAAA;AAAA,EAElB;AAAA,EAEA,MAAM,0BAA0B,IAA8C;AAC7E,UAAM,gBAAiB,MAAM,KAAK,2BAA2B,cAAc,EAAE;AAE7E,UAAM,gBAAgB,cAAc;AAAA,MACnC,CAAC,QAAQ,cAAc;AAClB,YAAA,UAAU,SAAS,UAAU;AACzB,iBAAA;AAAA,QACR;AACO,eAAA;AAAA,UACN,QAAQ,KAAK,eAAe,mBAAmB,OAAO,QAAQ,UAAU,eAAe,UAAU,aAAa;AAAA,UAC9G,MAAM;AAAA,YACL,SAAS,UAAU;AAAA,YACnB,IAAI,UAAU;AAAA,YACd,WAAW,UAAU;AAAA,YACrB,UAAU;AAAA,UACX;AAAA,QAAA;AAAA,MAEF;AAAA,MACA;AAAA,IAAA;AAGG,QAAA,CAAC,cAAc,KAAK,SAAS;AACzB,aAAA;AAAA,IACR;AAEO,WAAA;AAAA,MACN,QAAQ,cAAc;AAAA,MACtB,MAAM;AAAA,QACL,GAAG,cAAc;AAAA,QACjB,UAAU,wBAAwB,cAAc,MAAM;AAAA,MACvD;AAAA,IAAA;AAAA,EAEF;AAAA,EAEA,MAAa,MAAM,EAAE,IAAI,iBAGG;AACrB,UAAA,YAAY,MAAM,GAAG,aAAa,MAAM,IAAI,YAAY,eAAe,KAAK,QAAQ,CAAC;AAC3F,QAAI,CAAC,WAAW;AACf,aAAO,iBAAiB;AAAA,IACzB;AAEO,WAAA;AAAA,EACR;AACD;"}

package/dist/production/src/model/queries/events/EventsQuery.cjs

@@ -49,23 +49,19 @@ class EventsQuery extends Database.DatabaseQuery {
           return qb2.orderBy("created_at", "desc");
       }
     }).match(createInMatcher("type", this.filter.types?.map((it) => it.toLowerCase()))).match(createInMatcher("table_name", this.filter.tables)).match(createInMatcher("transaction_id", this.filter.transactions)).match(createInMatcher("identity_id", this.filter.identities)).match(createDateMatcher("created_at", this.filter.createdAt ?? void 0)).match(createDateMatcher("applied_at", this.filter.appliedAt ?? void 0)).match((qb2) => {
-      var _a;
       if (!this.filter.rows) {
         return qb2;
       }
-      const byTable = {};
-      for (const row of this.filter.rows) {
-        byTable[_a = row.tableName] ?? (byTable[_a] = []);
-        byTable[row.tableName].push(row.primaryKey);
-      }
-      const rowFilters = Object.entries(byTable);
-      const ors = rowFilters.reduce(
-        (expr, [table, rowIds]) => expr.and(
-          Database.ConditionBuilder.create().compare("table_name", Database.Operator.eq, table).in("row_ids", rowIds.map((it) => JSON.stringify(it)))
-        ),
-        Database.ConditionBuilder.create()
-      );
-      return qb2.where(Database.ConditionBuilder.create().or(ors));
+      const ors = this.filter.rows.map((row) => {
+        const builder = Database.ConditionBuilder.create().compare("table_name", Database.Operator.eq, row.tableName);
+        return row.primaryKey.reduce((expr, val, index) => {
+          if (val === null) {
+            return expr;
+          }
+          return expr.raw(`"row_ids"->${index} = ?::jsonb`, JSON.stringify(val));
+        }, builder).getSql();
+      }).filter((it) => it !== null);
+      return qb2.where(Database.ConditionBuilder.create().or(Database.ConditionBuilder.create(ors)));
     }).limit(this.limit, this.offset);
     return EventQueryHelpers.createEventsFromRows(await qb.getResult(db));
   }

package/dist/production/src/model/queries/events/EventsQuery.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"EventsQuery.cjs","sources":["../../../../../../../packages/engine-system-api/src/model/queries/events/EventsQuery.ts"],"sourcesContent":["import {\n\tConditionBuilder,\n\tDatabaseQuery,\n\tDatabaseQueryable,\n\tOperator,\n\tSelectBuilder,\n\tSelectBuilderSpecification, Value,\n} from '@contember/database'\nimport { ContentEvent } from '../../events'\nimport { EventsFilter, EventsFilterDate, EventsOrder } from '../../../schema'\nimport { createEventsFromRows, EventRow } from './EventQueryHelpers'\n\nexport class EventsQuery extends DatabaseQuery<ContentEvent[]> {\n\tconstructor(\n\t\tprivate readonly filter: EventsFilter,\n\t\tprivate readonly order: EventsOrder,\n\t\tprivate readonly offset: number,\n\t\tprivate readonly limit: number,\n\t) {\n\t\tsuper()\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<ContentEvent[]> {\n\t\tconst createDateMatcher = (column: string, dateFilter: EventsFilterDate | undefined): SelectBuilderSpecification => qb => {\n\t\t\tif (!dateFilter) {\n\t\t\t\treturn qb\n\t\t\t}\n\t\t\tconst { from, to } = dateFilter\n\t\t\tif (from) {\n\t\t\t\tqb = qb.where(expr => expr.compare(column, Operator.gte, from))\n\t\t\t}\n\t\t\tif (to) {\n\t\t\t\tqb = qb.where(expr => expr.compare(column, Operator.lte, to))\n\t\t\t}\n\t\t\treturn qb\n\t\t}\n\t\tconst createInMatcher = (column: string | [string, string], values?: readonly Value[] | null): SelectBuilderSpecification => qb => {\n\t\t\tif (!values) {\n\t\t\t\treturn qb\n\t\t\t}\n\t\t\treturn qb.where(ConditionBuilder.create().in(column, values))\n\t\t}\n\n\t\tconst qb = SelectBuilder.create<EventRow>()\n\t\t\t.select('id')\n\t\t\t.select('type')\n\t\t\t.select('table_name')\n\t\t\t.select('row_ids')\n\t\t\t.select('values')\n\t\t\t.select('created_at')\n\t\t\t.select('applied_at')\n\t\t\t.select('identity_id')\n\t\t\t.select(['event_data', 'transaction_id'])\n\n\t\t\t.from('event_data')\n\t\t\t.join('stage_transaction', undefined, on =>\n\t\t\t\ton.columnsEq(['event_data', 'transaction_id'], ['stage_transaction', 'transaction_id']),\n\t\t\t)\n\t\t\t.match(qb => {\n\t\t\t\tswitch (this.order) {\n\t\t\t\t\tcase EventsOrder.AppliedAtAsc:\n\t\t\t\t\t\treturn qb.orderBy('applied_at', 'asc')\n\t\t\t\t\tcase EventsOrder.AppliedAtDesc:\n\t\t\t\t\t\treturn qb.orderBy('applied_at', 'desc')\n\t\t\t\t\tcase EventsOrder.CreatedAtAsc:\n\t\t\t\t\t\treturn qb.orderBy('created_at', 'asc')\n\t\t\t\t\tcase EventsOrder.CreatedAtDesc:\n\t\t\t\t\t\treturn qb.orderBy('created_at', 'desc')\n\t\t\t\t}\n\t\t\t})\n\t\t\t.match(createInMatcher('type', this.filter.types?.map(it => it.toLowerCase())))\n\t\t\t.match(createInMatcher('table_name', this.filter.tables))\n\t\t\t.match(createInMatcher('transaction_id', this.filter.transactions))\n\t\t\t.match(createInMatcher('identity_id', this.filter.identities))\n\t\t\t.match(createDateMatcher('created_at', this.filter.createdAt ?? undefined))\n\t\t\t.match(createDateMatcher('applied_at', this.filter.appliedAt ?? undefined))\n\t\t\t.match(qb => {\n\t\t\t\tif (!this.filter.rows) {\n\t\t\t\t\treturn qb\n\t\t\t\t}\n\t\t\t\ttype PrimaryKey = readonly string[]\n\t\t\t\tconst byTable: Record<string, PrimaryKey[]> = {}\n\t\t\t\tfor (const row of this.filter.rows) {\n\t\t\t\t\tbyTable[row.tableName] ??= []\n\t\t\t\t\tbyTable[row.tableName].push(row.primaryKey)\n\t\t\t\t}\n\t\t\t\tconst rowFilters = Object.entries(byTable)\n\t\t\t\tconst ors = rowFilters.reduce(\n\t\t\t\t\t(expr, [table, rowIds]) =>\n\t\t\t\t\t\texpr.and(\n\t\t\t\t\t\t\tConditionBuilder.create()\n\t\t\t\t\t\t\t\t.compare('table_name', Operator.eq, table)\n\t\t\t\t\t\t\t\t.in('row_ids', rowIds.map(it => JSON.stringify(it))),\n\t\t\t\t\t\t),\n\t\t\t\t\tConditionBuilder.create(),\n\t\t\t\t)\n\t\t\t\treturn qb.where(ConditionBuilder.create().or(ors))\n\t\t\t})\n\n\t\t\t.limit(this.limit, this.offset)\n\n\t\treturn createEventsFromRows(await qb.getResult(db))\n\t}\n\n}\n"],"names":["DatabaseQuery","qb","Operator","ConditionBuilder","SelectBuilder","EventsOrder","createEventsFromRows"],"mappings":"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"}
+{"version":3,"file":"EventsQuery.cjs","sources":["../../../../../../../packages/engine-system-api/src/model/queries/events/EventsQuery.ts"],"sourcesContent":["import {\n\tConditionBuilder,\n\tDatabaseQuery,\n\tDatabaseQueryable,\n\tLiteral,\n\tOperator,\n\tSelectBuilder,\n\tSelectBuilderSpecification, Value,\n} from '@contember/database'\nimport { ContentEvent } from '../../events'\nimport { EventsFilter, EventsFilterDate, EventsOrder } from '../../../schema'\nimport { createEventsFromRows, EventRow } from './EventQueryHelpers'\n\nexport class EventsQuery extends DatabaseQuery<ContentEvent[]> {\n\tconstructor(\n\t\tprivate readonly filter: EventsFilter,\n\t\tprivate readonly order: EventsOrder,\n\t\tprivate readonly offset: number,\n\t\tprivate readonly limit: number,\n\t) {\n\t\tsuper()\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<ContentEvent[]> {\n\t\tconst createDateMatcher = (column: string, dateFilter: EventsFilterDate | undefined): SelectBuilderSpecification => qb => {\n\t\t\tif (!dateFilter) {\n\t\t\t\treturn qb\n\t\t\t}\n\t\t\tconst { from, to } = dateFilter\n\t\t\tif (from) {\n\t\t\t\tqb = qb.where(expr => expr.compare(column, Operator.gte, from))\n\t\t\t}\n\t\t\tif (to) {\n\t\t\t\tqb = qb.where(expr => expr.compare(column, Operator.lte, to))\n\t\t\t}\n\t\t\treturn qb\n\t\t}\n\t\tconst createInMatcher = (column: string | [string, string], values?: readonly Value[] | null): SelectBuilderSpecification => qb => {\n\t\t\tif (!values) {\n\t\t\t\treturn qb\n\t\t\t}\n\t\t\treturn qb.where(ConditionBuilder.create().in(column, values))\n\t\t}\n\n\t\tconst qb = SelectBuilder.create<EventRow>()\n\t\t\t.select('id')\n\t\t\t.select('type')\n\t\t\t.select('table_name')\n\t\t\t.select('row_ids')\n\t\t\t.select('values')\n\t\t\t.select('created_at')\n\t\t\t.select('applied_at')\n\t\t\t.select('identity_id')\n\t\t\t.select(['event_data', 'transaction_id'])\n\n\t\t\t.from('event_data')\n\t\t\t.join('stage_transaction', undefined, on =>\n\t\t\t\ton.columnsEq(['event_data', 'transaction_id'], ['stage_transaction', 'transaction_id']),\n\t\t\t)\n\t\t\t.match(qb => {\n\t\t\t\tswitch (this.order) {\n\t\t\t\t\tcase EventsOrder.AppliedAtAsc:\n\t\t\t\t\t\treturn qb.orderBy('applied_at', 'asc')\n\t\t\t\t\tcase EventsOrder.AppliedAtDesc:\n\t\t\t\t\t\treturn qb.orderBy('applied_at', 'desc')\n\t\t\t\t\tcase EventsOrder.CreatedAtAsc:\n\t\t\t\t\t\treturn qb.orderBy('created_at', 'asc')\n\t\t\t\t\tcase EventsOrder.CreatedAtDesc:\n\t\t\t\t\t\treturn qb.orderBy('created_at', 'desc')\n\t\t\t\t}\n\t\t\t})\n\t\t\t.match(createInMatcher('type', this.filter.types?.map(it => it.toLowerCase())))\n\t\t\t.match(createInMatcher('table_name', this.filter.tables))\n\t\t\t.match(createInMatcher('transaction_id', this.filter.transactions))\n\t\t\t.match(createInMatcher('identity_id', this.filter.identities))\n\t\t\t.match(createDateMatcher('created_at', this.filter.createdAt ?? undefined))\n\t\t\t.match(createDateMatcher('applied_at', this.filter.appliedAt ?? undefined))\n\t\t\t.match(qb => {\n\t\t\t\tif (!this.filter.rows) {\n\t\t\t\t\treturn qb\n\t\t\t\t}\n\n\t\t\t\tconst ors: Literal[] = this.filter.rows.map(row => {\n\t\t\t\t\tconst builder = ConditionBuilder.create()\n\t\t\t\t\t\t.compare('table_name', Operator.eq, row.tableName)\n\n\t\t\t\t\treturn row.primaryKey.reduce((expr, val, index) => {\n\t\t\t\t\t\tif (val === null) {\n\t\t\t\t\t\t\treturn expr\n\t\t\t\t\t\t}\n\t\t\t\t\t\treturn expr.raw(`\"row_ids\"->${index} = ?::jsonb`, JSON.stringify(val))\n\t\t\t\t\t}, builder).getSql()\n\t\t\t\t}).filter((it): it is Literal => it !== null)\n\n\t\t\t\treturn qb.where(ConditionBuilder.create().or(ConditionBuilder.create(ors)))\n\t\t\t})\n\n\t\t\t.limit(this.limit, this.offset)\n\n\t\treturn createEventsFromRows(await qb.getResult(db))\n\t}\n\n}\n"],"names":["DatabaseQuery","qb","Operator","ConditionBuilder","SelectBuilder","EventsOrder","createEventsFromRows"],"mappings":"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"}

package/dist/production/src/model/queries/events/EventsQuery.js

@@ -47,23 +47,19 @@ class EventsQuery extends DatabaseQuery {
           return qb2.orderBy("created_at", "desc");
       }
     }).match(createInMatcher("type", this.filter.types?.map((it) => it.toLowerCase()))).match(createInMatcher("table_name", this.filter.tables)).match(createInMatcher("transaction_id", this.filter.transactions)).match(createInMatcher("identity_id", this.filter.identities)).match(createDateMatcher("created_at", this.filter.createdAt ?? void 0)).match(createDateMatcher("applied_at", this.filter.appliedAt ?? void 0)).match((qb2) => {
-      var _a;
       if (!this.filter.rows) {
         return qb2;
       }
-      const byTable = {};
-      for (const row of this.filter.rows) {
-        byTable[_a = row.tableName] ?? (byTable[_a] = []);
-        byTable[row.tableName].push(row.primaryKey);
-      }
-      const rowFilters = Object.entries(byTable);
-      const ors = rowFilters.reduce(
-        (expr, [table, rowIds]) => expr.and(
-          ConditionBuilder.create().compare("table_name", Operator.eq, table).in("row_ids", rowIds.map((it) => JSON.stringify(it)))
-        ),
-        ConditionBuilder.create()
-      );
-      return qb2.where(ConditionBuilder.create().or(ors));
+      const ors = this.filter.rows.map((row) => {
+        const builder = ConditionBuilder.create().compare("table_name", Operator.eq, row.tableName);
+        return row.primaryKey.reduce((expr, val, index) => {
+          if (val === null) {
+            return expr;
+          }
+          return expr.raw(`"row_ids"->${index} = ?::jsonb`, JSON.stringify(val));
+        }, builder).getSql();
+      }).filter((it) => it !== null);
+      return qb2.where(ConditionBuilder.create().or(ConditionBuilder.create(ors)));
     }).limit(this.limit, this.offset);
     return createEventsFromRows(await qb.getResult(db));
   }

package/dist/production/src/model/queries/events/EventsQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventsQuery.js","sources":["../../../../../../../packages/engine-system-api/src/model/queries/events/EventsQuery.ts"],"sourcesContent":["import {\n\tConditionBuilder,\n\tDatabaseQuery,\n\tDatabaseQueryable,\n\tOperator,\n\tSelectBuilder,\n\tSelectBuilderSpecification, Value,\n} from '@contember/database'\nimport { ContentEvent } from '../../events'\nimport { EventsFilter, EventsFilterDate, EventsOrder } from '../../../schema'\nimport { createEventsFromRows, EventRow } from './EventQueryHelpers'\n\nexport class EventsQuery extends DatabaseQuery<ContentEvent[]> {\n\tconstructor(\n\t\tprivate readonly filter: EventsFilter,\n\t\tprivate readonly order: EventsOrder,\n\t\tprivate readonly offset: number,\n\t\tprivate readonly limit: number,\n\t) {\n\t\tsuper()\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<ContentEvent[]> {\n\t\tconst createDateMatcher = (column: string, dateFilter: EventsFilterDate | undefined): SelectBuilderSpecification => qb => {\n\t\t\tif (!dateFilter) {\n\t\t\t\treturn qb\n\t\t\t}\n\t\t\tconst { from, to } = dateFilter\n\t\t\tif (from) {\n\t\t\t\tqb = qb.where(expr => expr.compare(column, Operator.gte, from))\n\t\t\t}\n\t\t\tif (to) {\n\t\t\t\tqb = qb.where(expr => expr.compare(column, Operator.lte, to))\n\t\t\t}\n\t\t\treturn qb\n\t\t}\n\t\tconst createInMatcher = (column: string | [string, string], values?: readonly Value[] | null): SelectBuilderSpecification => qb => {\n\t\t\tif (!values) {\n\t\t\t\treturn qb\n\t\t\t}\n\t\t\treturn qb.where(ConditionBuilder.create().in(column, values))\n\t\t}\n\n\t\tconst qb = SelectBuilder.create<EventRow>()\n\t\t\t.select('id')\n\t\t\t.select('type')\n\t\t\t.select('table_name')\n\t\t\t.select('row_ids')\n\t\t\t.select('values')\n\t\t\t.select('created_at')\n\t\t\t.select('applied_at')\n\t\t\t.select('identity_id')\n\t\t\t.select(['event_data', 'transaction_id'])\n\n\t\t\t.from('event_data')\n\t\t\t.join('stage_transaction', undefined, on =>\n\t\t\t\ton.columnsEq(['event_data', 'transaction_id'], ['stage_transaction', 'transaction_id']),\n\t\t\t)\n\t\t\t.match(qb => {\n\t\t\t\tswitch (this.order) {\n\t\t\t\t\tcase EventsOrder.AppliedAtAsc:\n\t\t\t\t\t\treturn qb.orderBy('applied_at', 'asc')\n\t\t\t\t\tcase EventsOrder.AppliedAtDesc:\n\t\t\t\t\t\treturn qb.orderBy('applied_at', 'desc')\n\t\t\t\t\tcase EventsOrder.CreatedAtAsc:\n\t\t\t\t\t\treturn qb.orderBy('created_at', 'asc')\n\t\t\t\t\tcase EventsOrder.CreatedAtDesc:\n\t\t\t\t\t\treturn qb.orderBy('created_at', 'desc')\n\t\t\t\t}\n\t\t\t})\n\t\t\t.match(createInMatcher('type', this.filter.types?.map(it => it.toLowerCase())))\n\t\t\t.match(createInMatcher('table_name', this.filter.tables))\n\t\t\t.match(createInMatcher('transaction_id', this.filter.transactions))\n\t\t\t.match(createInMatcher('identity_id', this.filter.identities))\n\t\t\t.match(createDateMatcher('created_at', this.filter.createdAt ?? undefined))\n\t\t\t.match(createDateMatcher('applied_at', this.filter.appliedAt ?? undefined))\n\t\t\t.match(qb => {\n\t\t\t\tif (!this.filter.rows) {\n\t\t\t\t\treturn qb\n\t\t\t\t}\n\t\t\t\ttype PrimaryKey = readonly string[]\n\t\t\t\tconst byTable: Record<string, PrimaryKey[]> = {}\n\t\t\t\tfor (const row of this.filter.rows) {\n\t\t\t\t\tbyTable[row.tableName] ??= []\n\t\t\t\t\tbyTable[row.tableName].push(row.primaryKey)\n\t\t\t\t}\n\t\t\t\tconst rowFilters = Object.entries(byTable)\n\t\t\t\tconst ors = rowFilters.reduce(\n\t\t\t\t\t(expr, [table, rowIds]) =>\n\t\t\t\t\t\texpr.and(\n\t\t\t\t\t\t\tConditionBuilder.create()\n\t\t\t\t\t\t\t\t.compare('table_name', Operator.eq, table)\n\t\t\t\t\t\t\t\t.in('row_ids', rowIds.map(it => JSON.stringify(it))),\n\t\t\t\t\t\t),\n\t\t\t\t\tConditionBuilder.create(),\n\t\t\t\t)\n\t\t\t\treturn qb.where(ConditionBuilder.create().or(ors))\n\t\t\t})\n\n\t\t\t.limit(this.limit, this.offset)\n\n\t\treturn createEventsFromRows(await qb.getResult(db))\n\t}\n\n}\n"],"names":["qb"],"mappings":";;;;;AAYO,MAAM,oBAAoB,cAA8B;AAAA,EAC9D,YACkB,QACA,OACA,QACA,OAChB;AACK;AALW,SAAA,SAAA;AACA,SAAA,QAAA;AACA,SAAA,SAAA;AACA,SAAA,QAAA;AAAA,EAGlB;AAAA,EAEA,MAAM,MAAM,EAAE,MAAkD;AAC/D,UAAM,oBAAoB,CAAC,QAAgB,eAAyE,CAAAA,QAAM;AACzH,UAAI,CAAC,YAAY;AACTA,eAAAA;AAAAA,MACR;AACM,YAAA,EAAE,MAAM,GAAO,IAAA;AACrB,UAAI,MAAM;AACTA,cAAKA,IAAG,MAAM,CAAQ,SAAA,KAAK,QAAQ,QAAQ,SAAS,KAAK,IAAI,CAAC;AAAA,MAC/D;AACA,UAAI,IAAI;AACPA,cAAKA,IAAG,MAAM,CAAQ,SAAA,KAAK,QAAQ,QAAQ,SAAS,KAAK,EAAE,CAAC;AAAA,MAC7D;AACOA,aAAAA;AAAAA,IAAA;AAER,UAAM,kBAAkB,CAAC,QAAmC,WAAiE,CAAAA,QAAM;AAClI,UAAI,CAAC,QAAQ;AACLA,eAAAA;AAAAA,MACR;AACOA,aAAAA,IAAG,MAAM,iBAAiB,SAAS,GAAG,QAAQ,MAAM,CAAC;AAAA,IAAA;AAG7D,UAAM,KAAK,cAAc,OACvB,EAAA,OAAO,IAAI,EACX,OAAO,MAAM,EACb,OAAO,YAAY,EACnB,OAAO,SAAS,EAChB,OAAO,QAAQ,EACf,OAAO,YAAY,EACnB,OAAO,YAAY,EACnB,OAAO,aAAa,EACpB,OAAO,CAAC,cAAc,gBAAgB,CAAC,EAEvC,KAAK,YAAY,EACjB;AAAA,MAAK;AAAA,MAAqB;AAAA,MAAW,CAAA,OACrC,GAAG,UAAU,CAAC,cAAc,gBAAgB,GAAG,CAAC,qBAAqB,gBAAgB,CAAC;AAAA,IAAA,EAEtF,MAAM,CAAAA,QAAM;AACZ,cAAQ,KAAK,OAAO;AAAA,QACnB,KAAK,YAAY;AACTA,iBAAAA,IAAG,QAAQ,cAAc,KAAK;AAAA,QACtC,KAAK,YAAY;AACTA,iBAAAA,IAAG,QAAQ,cAAc,MAAM;AAAA,QACvC,KAAK,YAAY;AACTA,iBAAAA,IAAG,QAAQ,cAAc,KAAK;AAAA,QACtC,KAAK,YAAY;AACTA,iBAAAA,IAAG,QAAQ,cAAc,MAAM;AAAA,MACxC;AAAA,IACA,CAAA,EACA,MAAM,gBAAgB,QAAQ,KAAK,OAAO,OAAO,IAAI,CAAA,OAAM,GAAG,YAAA,CAAa,CAAC,CAAC,EAC7E,MAAM,gBAAgB,cAAc,KAAK,OAAO,MAAM,CAAC,EACvD,MAAM,gBAAgB,kBAAkB,KAAK,OAAO,YAAY,CAAC,EACjE,MAAM,gBAAgB,eAAe,KAAK,OAAO,UAAU,CAAC,EAC5D,MAAM,kBAAkB,cAAc,KAAK,OAAO,aAAa,MAAS,CAAC,EACzE,MAAM,kBAAkB,cAAc,KAAK,OAAO,aAAa,MAAS,CAAC,EACzE,MAAM,CAAAA,QAAM;AA5EhB,UAAA;AA6EQ,UAAA,CAAC,KAAK,OAAO,MAAM;AACfA,eAAAA;AAAAA,MACR;AAEA,YAAM,UAAwC,CAAA;AACnC,iBAAA,OAAO,KAAK,OAAO,MAAM;AAC3B,gBAAA,KAAA,IAAI,SAAZ,MAAA,QAAA,EAAA,IAA2B,CAAA;AAC3B,gBAAQ,IAAI,SAAS,EAAE,KAAK,IAAI,UAAU;AAAA,MAC3C;AACM,YAAA,aAAa,OAAO,QAAQ,OAAO;AACzC,YAAM,MAAM,WAAW;AAAA,QACtB,CAAC,MAAM,CAAC,OAAO,MAAM,MACpB,KAAK;AAAA,UACJ,iBAAiB,OAAO,EACtB,QAAQ,cAAc,SAAS,IAAI,KAAK,EACxC,GAAG,WAAW,OAAO,IAAI,CAAA,OAAM,KAAK,UAAU,EAAE,CAAC,CAAC;AAAA,QACrD;AAAA,QACD,iBAAiB,OAAO;AAAA,MAAA;AAEzB,aAAOA,IAAG,MAAM,iBAAiB,SAAS,GAAG,GAAG,CAAC;AAAA,IAAA,CACjD,EAEA,MAAM,KAAK,OAAO,KAAK,MAAM;AAE/B,WAAO,qBAAqB,MAAM,GAAG,UAAU,EAAE,CAAC;AAAA,EACnD;AAED;"}
+{"version":3,"file":"EventsQuery.js","sources":["../../../../../../../packages/engine-system-api/src/model/queries/events/EventsQuery.ts"],"sourcesContent":["import {\n\tConditionBuilder,\n\tDatabaseQuery,\n\tDatabaseQueryable,\n\tLiteral,\n\tOperator,\n\tSelectBuilder,\n\tSelectBuilderSpecification, Value,\n} from '@contember/database'\nimport { ContentEvent } from '../../events'\nimport { EventsFilter, EventsFilterDate, EventsOrder } from '../../../schema'\nimport { createEventsFromRows, EventRow } from './EventQueryHelpers'\n\nexport class EventsQuery extends DatabaseQuery<ContentEvent[]> {\n\tconstructor(\n\t\tprivate readonly filter: EventsFilter,\n\t\tprivate readonly order: EventsOrder,\n\t\tprivate readonly offset: number,\n\t\tprivate readonly limit: number,\n\t) {\n\t\tsuper()\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<ContentEvent[]> {\n\t\tconst createDateMatcher = (column: string, dateFilter: EventsFilterDate | undefined): SelectBuilderSpecification => qb => {\n\t\t\tif (!dateFilter) {\n\t\t\t\treturn qb\n\t\t\t}\n\t\t\tconst { from, to } = dateFilter\n\t\t\tif (from) {\n\t\t\t\tqb = qb.where(expr => expr.compare(column, Operator.gte, from))\n\t\t\t}\n\t\t\tif (to) {\n\t\t\t\tqb = qb.where(expr => expr.compare(column, Operator.lte, to))\n\t\t\t}\n\t\t\treturn qb\n\t\t}\n\t\tconst createInMatcher = (column: string | [string, string], values?: readonly Value[] | null): SelectBuilderSpecification => qb => {\n\t\t\tif (!values) {\n\t\t\t\treturn qb\n\t\t\t}\n\t\t\treturn qb.where(ConditionBuilder.create().in(column, values))\n\t\t}\n\n\t\tconst qb = SelectBuilder.create<EventRow>()\n\t\t\t.select('id')\n\t\t\t.select('type')\n\t\t\t.select('table_name')\n\t\t\t.select('row_ids')\n\t\t\t.select('values')\n\t\t\t.select('created_at')\n\t\t\t.select('applied_at')\n\t\t\t.select('identity_id')\n\t\t\t.select(['event_data', 'transaction_id'])\n\n\t\t\t.from('event_data')\n\t\t\t.join('stage_transaction', undefined, on =>\n\t\t\t\ton.columnsEq(['event_data', 'transaction_id'], ['stage_transaction', 'transaction_id']),\n\t\t\t)\n\t\t\t.match(qb => {\n\t\t\t\tswitch (this.order) {\n\t\t\t\t\tcase EventsOrder.AppliedAtAsc:\n\t\t\t\t\t\treturn qb.orderBy('applied_at', 'asc')\n\t\t\t\t\tcase EventsOrder.AppliedAtDesc:\n\t\t\t\t\t\treturn qb.orderBy('applied_at', 'desc')\n\t\t\t\t\tcase EventsOrder.CreatedAtAsc:\n\t\t\t\t\t\treturn qb.orderBy('created_at', 'asc')\n\t\t\t\t\tcase EventsOrder.CreatedAtDesc:\n\t\t\t\t\t\treturn qb.orderBy('created_at', 'desc')\n\t\t\t\t}\n\t\t\t})\n\t\t\t.match(createInMatcher('type', this.filter.types?.map(it => it.toLowerCase())))\n\t\t\t.match(createInMatcher('table_name', this.filter.tables))\n\t\t\t.match(createInMatcher('transaction_id', this.filter.transactions))\n\t\t\t.match(createInMatcher('identity_id', this.filter.identities))\n\t\t\t.match(createDateMatcher('created_at', this.filter.createdAt ?? undefined))\n\t\t\t.match(createDateMatcher('applied_at', this.filter.appliedAt ?? undefined))\n\t\t\t.match(qb => {\n\t\t\t\tif (!this.filter.rows) {\n\t\t\t\t\treturn qb\n\t\t\t\t}\n\n\t\t\t\tconst ors: Literal[] = this.filter.rows.map(row => {\n\t\t\t\t\tconst builder = ConditionBuilder.create()\n\t\t\t\t\t\t.compare('table_name', Operator.eq, row.tableName)\n\n\t\t\t\t\treturn row.primaryKey.reduce((expr, val, index) => {\n\t\t\t\t\t\tif (val === null) {\n\t\t\t\t\t\t\treturn expr\n\t\t\t\t\t\t}\n\t\t\t\t\t\treturn expr.raw(`\"row_ids\"->${index} = ?::jsonb`, JSON.stringify(val))\n\t\t\t\t\t}, builder).getSql()\n\t\t\t\t}).filter((it): it is Literal => it !== null)\n\n\t\t\t\treturn qb.where(ConditionBuilder.create().or(ConditionBuilder.create(ors)))\n\t\t\t})\n\n\t\t\t.limit(this.limit, this.offset)\n\n\t\treturn createEventsFromRows(await qb.getResult(db))\n\t}\n\n}\n"],"names":["qb"],"mappings":"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"}

package/dist/production/src/model/queries/schema/SchemaQuery.cjs

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const Database = require("@contember/database");
+class SchemaQuery extends Database.DatabaseQuery {
+  constructor(currentHash) {
+    super();
+    this.currentHash = currentHash;
+  }
+  async fetch(queryable) {
+    const query = Database.SelectBuilder.create().from("schema").select(new Database.Literal("*")).where({
+      id: "single"
+    }).match((it) => {
+      if (!this.currentHash) {
+        return it;
+      }
+      return it.where((it2) => it2.raw("checksum != ?", this.currentHash));
+    });
+    const row = this.fetchOneOrNull(await query.getResult(queryable.db));
+    if (!row) {
+      return null;
+    }
+    return {
+      schema: row.schema,
+      meta: {
+        checksum: row.checksum,
+        version: row.version,
+        updatedAt: row.updated_at,
+        id: row.migration_id
+      }
+    };
+  }
+}
+exports.SchemaQuery = SchemaQuery;
+//# sourceMappingURL=SchemaQuery.cjs.map

package/dist/production/src/model/queries/schema/SchemaQuery.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"SchemaQuery.cjs","sources":["../../../../../../../packages/engine-system-api/src/model/queries/schema/SchemaQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Literal, SelectBuilder } from '@contember/database'\nimport { Schema } from '@contember/schema'\nimport { SchemaWithMeta } from '../../migrations'\n\nexport class SchemaQuery extends DatabaseQuery<SchemaWithMeta | null> {\n\n\tconstructor(\n\t\tprivate readonly currentHash?: string,\n\t) {\n\t\tsuper()\n\t}\n\n\n\tasync fetch(queryable: DatabaseQueryable): Promise<SchemaWithMeta | null> {\n\t\tconst query = SelectBuilder.create<{\n\t\t\tschema: Schema\n\t\t\tchecksum: string\n\t\t\tversion: string\n\t\t\tupdated_at: Date\n\t\t\tmigration_id: number\n\t\t}>()\n\t\t\t.from('schema')\n\t\t\t.select(new Literal('*'))\n\t\t\t.where({\n\t\t\t\tid: 'single',\n\t\t\t})\n\t\t\t.match(it => {\n\t\t\t\tif (!this.currentHash) {\n\t\t\t\t\treturn it\n\t\t\t\t}\n\t\t\t\treturn it.where(it => it.raw('checksum != ?', this.currentHash))\n\t\t\t})\n\n\t\tconst row =  this.fetchOneOrNull(await query.getResult(queryable.db))\n\t\tif (!row) {\n\t\t\treturn null\n\t\t}\n\t\treturn {\n\t\t\tschema: row.schema,\n\t\t\tmeta: {\n\t\t\t\tchecksum: row.checksum,\n\t\t\t\tversion: row.version,\n\t\t\t\tupdatedAt: row.updated_at,\n\t\t\t\tid: row.migration_id,\n\t\t\t},\n\t\t}\n\t}\n}\n"],"names":["DatabaseQuery","SelectBuilder","Literal","it"],"mappings":";;;AAIO,MAAM,oBAAoBA,SAAAA,cAAqC;AAAA,EAErE,YACkB,aAChB;AACK;AAFW,SAAA,cAAA;AAAA,EAGlB;AAAA,EAGA,MAAM,MAAM,WAA8D;AACzE,UAAM,QAAQC,SAAAA,cAAc,OAMzB,EACD,KAAK,QAAQ,EACb,OAAO,IAAIC,SAAA,QAAQ,GAAG,CAAC,EACvB,MAAM;AAAA,MACN,IAAI;AAAA,IAAA,CACJ,EACA,MAAM,CAAM,OAAA;AACR,UAAA,CAAC,KAAK,aAAa;AACf,eAAA;AAAA,MACR;AACO,aAAA,GAAG,MAAM,CAAAC,QAAMA,IAAG,IAAI,iBAAiB,KAAK,WAAW,CAAC;AAAA,IAAA,CAC/D;AAEI,UAAA,MAAO,KAAK,eAAe,MAAM,MAAM,UAAU,UAAU,EAAE,CAAC;AACpE,QAAI,CAAC,KAAK;AACF,aAAA;AAAA,IACR;AACO,WAAA;AAAA,MACN,QAAQ,IAAI;AAAA,MACZ,MAAM;AAAA,QACL,UAAU,IAAI;AAAA,QACd,SAAS,IAAI;AAAA,QACb,WAAW,IAAI;AAAA,QACf,IAAI,IAAI;AAAA,MACT;AAAA,IAAA;AAAA,EAEF;AACD;;"}

package/dist/production/src/model/queries/schema/SchemaQuery.js

@@ -0,0 +1,34 @@
+import { DatabaseQuery, SelectBuilder, Literal } from "@contember/database";
+class SchemaQuery extends DatabaseQuery {
+  constructor(currentHash) {
+    super();
+    this.currentHash = currentHash;
+  }
+  async fetch(queryable) {
+    const query = SelectBuilder.create().from("schema").select(new Literal("*")).where({
+      id: "single"
+    }).match((it) => {
+      if (!this.currentHash) {
+        return it;
+      }
+      return it.where((it2) => it2.raw("checksum != ?", this.currentHash));
+    });
+    const row = this.fetchOneOrNull(await query.getResult(queryable.db));
+    if (!row) {
+      return null;
+    }
+    return {
+      schema: row.schema,
+      meta: {
+        checksum: row.checksum,
+        version: row.version,
+        updatedAt: row.updated_at,
+        id: row.migration_id
+      }
+    };
+  }
+}
+export {
+  SchemaQuery
+};
+//# sourceMappingURL=SchemaQuery.js.map

package/dist/production/src/model/queries/schema/SchemaQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SchemaQuery.js","sources":["../../../../../../../packages/engine-system-api/src/model/queries/schema/SchemaQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Literal, SelectBuilder } from '@contember/database'\nimport { Schema } from '@contember/schema'\nimport { SchemaWithMeta } from '../../migrations'\n\nexport class SchemaQuery extends DatabaseQuery<SchemaWithMeta | null> {\n\n\tconstructor(\n\t\tprivate readonly currentHash?: string,\n\t) {\n\t\tsuper()\n\t}\n\n\n\tasync fetch(queryable: DatabaseQueryable): Promise<SchemaWithMeta | null> {\n\t\tconst query = SelectBuilder.create<{\n\t\t\tschema: Schema\n\t\t\tchecksum: string\n\t\t\tversion: string\n\t\t\tupdated_at: Date\n\t\t\tmigration_id: number\n\t\t}>()\n\t\t\t.from('schema')\n\t\t\t.select(new Literal('*'))\n\t\t\t.where({\n\t\t\t\tid: 'single',\n\t\t\t})\n\t\t\t.match(it => {\n\t\t\t\tif (!this.currentHash) {\n\t\t\t\t\treturn it\n\t\t\t\t}\n\t\t\t\treturn it.where(it => it.raw('checksum != ?', this.currentHash))\n\t\t\t})\n\n\t\tconst row =  this.fetchOneOrNull(await query.getResult(queryable.db))\n\t\tif (!row) {\n\t\t\treturn null\n\t\t}\n\t\treturn {\n\t\t\tschema: row.schema,\n\t\t\tmeta: {\n\t\t\t\tchecksum: row.checksum,\n\t\t\t\tversion: row.version,\n\t\t\t\tupdatedAt: row.updated_at,\n\t\t\t\tid: row.migration_id,\n\t\t\t},\n\t\t}\n\t}\n}\n"],"names":["it"],"mappings":";AAIO,MAAM,oBAAoB,cAAqC;AAAA,EAErE,YACkB,aAChB;AACK;AAFW,SAAA,cAAA;AAAA,EAGlB;AAAA,EAGA,MAAM,MAAM,WAA8D;AACzE,UAAM,QAAQ,cAAc,OAMzB,EACD,KAAK,QAAQ,EACb,OAAO,IAAI,QAAQ,GAAG,CAAC,EACvB,MAAM;AAAA,MACN,IAAI;AAAA,IAAA,CACJ,EACA,MAAM,CAAM,OAAA;AACR,UAAA,CAAC,KAAK,aAAa;AACf,eAAA;AAAA,MACR;AACO,aAAA,GAAG,MAAM,CAAAA,QAAMA,IAAG,IAAI,iBAAiB,KAAK,WAAW,CAAC;AAAA,IAAA,CAC/D;AAEI,UAAA,MAAO,KAAK,eAAe,MAAM,MAAM,UAAU,UAAU,EAAE,CAAC;AACpE,QAAI,CAAC,KAAK;AACF,aAAA;AAAA,IACR;AACO,WAAA;AAAA,MACN,QAAQ,IAAI;AAAA,MACZ,MAAM;AAAA,QACL,UAAU,IAAI;AAAA,QACd,SAAS,IAAI;AAAA,QACb,WAAW,IAAI;AAAA,QACf,IAAI,IAAI;AAAA,MACT;AAAA,IAAA;AAAA,EAEF;AACD;"}

package/dist/production/src/resolvers/ResolverFactory.cjs

@@ -7,7 +7,7 @@ const assertNever = require("../utils/assertNever.cjs");
 const graphqlUtils = require("@contember/graphql-utils");
 const graphql = require("graphql");
 class ResolverFactory {
-  constructor(stagesQueryResolver, executedMigrationsQueryResolver, migrateMutationResolver, truncateMutationResolver, migrationAlterMutationResolver, eventsQueryResolver, eventOldValuesResolver) {
+  constructor(stagesQueryResolver, executedMigrationsQueryResolver, migrateMutationResolver, truncateMutationResolver, migrationAlterMutationResolver, eventsQueryResolver, eventOldValuesResolver, schemaQueryResolver) {
     this.stagesQueryResolver = stagesQueryResolver;
     this.executedMigrationsQueryResolver = executedMigrationsQueryResolver;
     this.migrateMutationResolver = migrateMutationResolver;
@@ -15,12 +15,14 @@ class ResolverFactory {
     this.migrationAlterMutationResolver = migrationAlterMutationResolver;
     this.eventsQueryResolver = eventsQueryResolver;
     this.eventOldValuesResolver = eventOldValuesResolver;
+    this.schemaQueryResolver = schemaQueryResolver;
   }
   create(debugMode) {
     const resolvers = {
       DateTime: graphqlUtils.DateTimeType,
       Json: graphqlUtils.JSONType,
       PrimaryKey: PrimaryKeyType,
+      Schema: SchemaType,
       Event: {
         __resolveType: (obj) => {
           switch (obj.type) {
@@ -41,7 +43,8 @@ class ResolverFactory {
       Query: {
         stages: this.stagesQueryResolver.stages.bind(this.stagesQueryResolver),
         executedMigrations: this.executedMigrationsQueryResolver.executedMigrations.bind(this.executedMigrationsQueryResolver),
-        events: this.eventsQueryResolver.events.bind(this.eventsQueryResolver)
+        events: this.eventsQueryResolver.events.bind(this.eventsQueryResolver),
+        schema: this.schemaQueryResolver.schema.bind(this.schemaQueryResolver)
       },
       Mutation: {
         migrate: this.migrateMutationResolver.migrate.bind(this.migrateMutationResolver)
@@ -68,6 +71,7 @@ const parseValue = (value) => {
   }
   throw new graphql.GraphQLError("PrimaryKey cannot represent value: " + JSON.stringify(value));
 };
+const SchemaType = graphqlUtils.createJsonLikeType("Schema", "Content schema custom scalar type");
 const PrimaryKeyType = new graphql.GraphQLScalarType({
   name: "PrimaryKey",
   description: "PrimaryKey custom scalar type. Can be Int or String",

package/dist/production/src/resolvers/ResolverFactory.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ResolverFactory.cjs","sources":["../../../../../packages/engine-system-api/src/resolvers/ResolverFactory.ts"],"sourcesContent":["import { EventsQueryResolver, ExecutedMigrationsQueryResolver, StagesQueryResolver } from './query'\nimport { Event, EventType, Resolvers } from '../schema'\nimport { assertNever } from '../utils'\nimport { MigrateMutationResolver, MigrationAlterMutationResolver, TruncateMutationResolver } from './mutation'\nimport { DateTimeType, JSONType } from '@contember/graphql-utils'\nimport { EventOldValuesResolver } from './types'\nimport { GraphQLError, GraphQLScalarType, Kind } from 'graphql'\n\nexport class ResolverFactory {\n\tpublic constructor(\n\t\tprivate readonly stagesQueryResolver: StagesQueryResolver,\n\t\tprivate readonly executedMigrationsQueryResolver: ExecutedMigrationsQueryResolver,\n\t\tprivate readonly migrateMutationResolver: MigrateMutationResolver,\n\t\tprivate readonly truncateMutationResolver: TruncateMutationResolver,\n\t\tprivate readonly migrationAlterMutationResolver: MigrationAlterMutationResolver,\n\t\tprivate readonly eventsQueryResolver: EventsQueryResolver,\n\t\tprivate readonly eventOldValuesResolver: EventOldValuesResolver,\n\t) {}\n\n\tcreate(debugMode: boolean): Resolvers {\n\t\tconst resolvers: Resolvers & Required<Pick<Resolvers, 'Mutation'>> = {\n\t\t\tDateTime: DateTimeType,\n\t\t\tJson: JSONType,\n\t\t\tPrimaryKey: PrimaryKeyType,\n\t\t\tEvent: {\n\t\t\t\t__resolveType: (obj: Event) => {\n\t\t\t\t\tswitch (obj.type) {\n\t\t\t\t\t\tcase EventType.Create:\n\t\t\t\t\t\t\treturn 'CreateEvent'\n\t\t\t\t\t\tcase EventType.Update:\n\t\t\t\t\t\t\treturn 'UpdateEvent'\n\t\t\t\t\t\tcase EventType.Delete:\n\t\t\t\t\t\t\treturn 'DeleteEvent'\n\t\t\t\t\t\tcase null:\n\t\t\t\t\t\tcase undefined:\n\t\t\t\t\t\t\treturn null\n\t\t\t\t\t\tdefault:\n\t\t\t\t\t\t\treturn assertNever(obj.type)\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t},\n\t\t\tQuery: {\n\t\t\t\tstages: this.stagesQueryResolver.stages.bind(this.stagesQueryResolver),\n\t\t\t\texecutedMigrations: this.executedMigrationsQueryResolver.executedMigrations.bind(this.executedMigrationsQueryResolver),\n\t\t\t\tevents: this.eventsQueryResolver.events.bind(this.eventsQueryResolver),\n\t\t\t},\n\t\t\tMutation: {\n\t\t\t\tmigrate: this.migrateMutationResolver.migrate.bind(this.migrateMutationResolver),\n\t\t\t},\n\t\t\tDeleteEvent: {\n\t\t\t\toldValues: this.eventOldValuesResolver.oldValues.bind(this.eventOldValuesResolver),\n\t\t\t},\n\t\t\tUpdateEvent: {\n\t\t\t\toldValues: this.eventOldValuesResolver.oldValues.bind(this.eventOldValuesResolver),\n\t\t\t},\n\t\t}\n\t\tif (debugMode) {\n\t\t\tresolvers.Mutation.truncate = this.truncateMutationResolver.truncate.bind(this.truncateMutationResolver)\n\t\t\tresolvers.Mutation.migrationDelete = this.migrationAlterMutationResolver.migrationDelete.bind(this.migrationAlterMutationResolver)\n\t\t\tresolvers.Mutation.migrationModify = this.migrationAlterMutationResolver.migrationModify.bind(this.migrationAlterMutationResolver)\n\t\t\tresolvers.Mutation.forceMigrate = this.migrateMutationResolver.migrateForce.bind(this.migrateMutationResolver)\n\t\t}\n\t\treturn resolvers\n\t}\n}\n\nconst parseValue = (value: any)  => {\n\tif ((typeof value === 'string' && value !== '') || typeof value === 'number' && isFinite(value) && Math.floor(value) === value) {\n\t\treturn value\n\t}\n\tthrow new GraphQLError('PrimaryKey cannot represent value: ' + JSON.stringify(value))\n}\nexport const PrimaryKeyType = new GraphQLScalarType({\n\tname: 'PrimaryKey',\n\tdescription: 'PrimaryKey custom scalar type. Can be Int or String',\n\tserialize: parseValue,\n\tparseValue: parseValue,\n\tparseLiteral(ast) {\n\t\tif (ast.kind === Kind.STRING) {\n\t\t\treturn ast.value\n\t\t}\n\t\tif (ast.kind === Kind.INT) {\n\t\t\treturn Number.parseInt(ast.value, 10)\n\t\t}\n\t\treturn null\n\t},\n})\n"],"names":["DateTimeType","JSONType","EventType","assertNever","GraphQLError","GraphQLScalarType","Kind"],"mappings":";;;;;;;;AAQO,MAAM,gBAAgB;AAAA,EACrB,YACW,qBACA,iCACA,yBACA,0BACA,gCACA,qBACA,wBAChB;AAPgB,SAAA,sBAAA;AACA,SAAA,kCAAA;AACA,SAAA,0BAAA;AACA,SAAA,2BAAA;AACA,SAAA,iCAAA;AACA,SAAA,sBAAA;AACA,SAAA,yBAAA;AAAA,EACf;AAAA,EAEH,OAAO,WAA+B;AACrC,UAAM,YAA+D;AAAA,MACpE,UAAUA,aAAA;AAAA,MACV,MAAMC,aAAA;AAAA,MACN,YAAY;AAAA,MACZ,OAAO;AAAA,QACN,eAAe,CAAC,QAAe;AAC9B,kBAAQ,IAAI,MAAM;AAAA,YACjB,KAAKC,MAAU,UAAA;AACP,qBAAA;AAAA,YACR,KAAKA,MAAU,UAAA;AACP,qBAAA;AAAA,YACR,KAAKA,MAAU,UAAA;AACP,qBAAA;AAAA,YACR,KAAK;AAAA,YACL,KAAK;AACG,qBAAA;AAAA,YACR;AACQ,qBAAAC,YAAA,YAAY,IAAI,IAAI;AAAA,UAC7B;AAAA,QACD;AAAA,MACD;AAAA,MACA,OAAO;AAAA,QACN,QAAQ,KAAK,oBAAoB,OAAO,KAAK,KAAK,mBAAmB;AAAA,QACrE,oBAAoB,KAAK,gCAAgC,mBAAmB,KAAK,KAAK,+BAA+B;AAAA,QACrH,QAAQ,KAAK,oBAAoB,OAAO,KAAK,KAAK,mBAAmB;AAAA,MACtE;AAAA,MACA,UAAU;AAAA,QACT,SAAS,KAAK,wBAAwB,QAAQ,KAAK,KAAK,uBAAuB;AAAA,MAChF;AAAA,MACA,aAAa;AAAA,QACZ,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAClF;AAAA,MACA,aAAa;AAAA,QACZ,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAClF;AAAA,IAAA;AAED,QAAI,WAAW;AACd,gBAAU,SAAS,WAAW,KAAK,yBAAyB,SAAS,KAAK,KAAK,wBAAwB;AACvG,gBAAU,SAAS,kBAAkB,KAAK,+BAA+B,gBAAgB,KAAK,KAAK,8BAA8B;AACjI,gBAAU,SAAS,kBAAkB,KAAK,+BAA+B,gBAAgB,KAAK,KAAK,8BAA8B;AACjI,gBAAU,SAAS,eAAe,KAAK,wBAAwB,aAAa,KAAK,KAAK,uBAAuB;AAAA,IAC9G;AACO,WAAA;AAAA,EACR;AACD;AAEA,MAAM,aAAa,CAAC,UAAgB;AACnC,MAAK,OAAO,UAAU,YAAY,UAAU,MAAO,OAAO,UAAU,YAAY,SAAS,KAAK,KAAK,KAAK,MAAM,KAAK,MAAM,OAAO;AACxH,WAAA;AAAA,EACR;AACA,QAAM,IAAIC,QAAa,aAAA,wCAAwC,KAAK,UAAU,KAAK,CAAC;AACrF;AACa,MAAA,iBAAiB,IAAIC,QAAAA,kBAAkB;AAAA,EACnD,MAAM;AAAA,EACN,aAAa;AAAA,EACb,WAAW;AAAA,EACX;AAAA,EACA,aAAa,KAAK;AACb,QAAA,IAAI,SAASC,QAAA,KAAK,QAAQ;AAC7B,aAAO,IAAI;AAAA,IACZ;AACI,QAAA,IAAI,SAASA,QAAA,KAAK,KAAK;AAC1B,aAAO,OAAO,SAAS,IAAI,OAAO,EAAE;AAAA,IACrC;AACO,WAAA;AAAA,EACR;AACD,CAAC;;;"}
+{"version":3,"file":"ResolverFactory.cjs","sources":["../../../../../packages/engine-system-api/src/resolvers/ResolverFactory.ts"],"sourcesContent":["import { EventsQueryResolver, ExecutedMigrationsQueryResolver, StagesQueryResolver } from './query'\nimport { Event, EventType, Resolvers } from '../schema'\nimport { assertNever } from '../utils'\nimport { MigrateMutationResolver, MigrationAlterMutationResolver, TruncateMutationResolver } from './mutation'\nimport { DateTimeType, JSONType, createJsonLikeType } from '@contember/graphql-utils'\nimport { EventOldValuesResolver } from './types'\nimport { GraphQLError, GraphQLScalarType, Kind } from 'graphql'\nimport { SchemaQueryResolver } from './query/SchemaQueryResolver'\n\nexport class ResolverFactory {\n\tpublic constructor(\n\t\tprivate readonly stagesQueryResolver: StagesQueryResolver,\n\t\tprivate readonly executedMigrationsQueryResolver: ExecutedMigrationsQueryResolver,\n\t\tprivate readonly migrateMutationResolver: MigrateMutationResolver,\n\t\tprivate readonly truncateMutationResolver: TruncateMutationResolver,\n\t\tprivate readonly migrationAlterMutationResolver: MigrationAlterMutationResolver,\n\t\tprivate readonly eventsQueryResolver: EventsQueryResolver,\n\t\tprivate readonly eventOldValuesResolver: EventOldValuesResolver,\n\t\tprivate readonly schemaQueryResolver: SchemaQueryResolver,\n\t) {}\n\n\tcreate(debugMode: boolean): Resolvers {\n\t\tconst resolvers: Resolvers & Required<Pick<Resolvers, 'Mutation'>> = {\n\t\t\tDateTime: DateTimeType,\n\t\t\tJson: JSONType,\n\t\t\tPrimaryKey: PrimaryKeyType,\n\t\t\tSchema: SchemaType,\n\t\t\tEvent: {\n\t\t\t\t__resolveType: (obj: Event) => {\n\t\t\t\t\tswitch (obj.type) {\n\t\t\t\t\t\tcase EventType.Create:\n\t\t\t\t\t\t\treturn 'CreateEvent'\n\t\t\t\t\t\tcase EventType.Update:\n\t\t\t\t\t\t\treturn 'UpdateEvent'\n\t\t\t\t\t\tcase EventType.Delete:\n\t\t\t\t\t\t\treturn 'DeleteEvent'\n\t\t\t\t\t\tcase null:\n\t\t\t\t\t\tcase undefined:\n\t\t\t\t\t\t\treturn null\n\t\t\t\t\t\tdefault:\n\t\t\t\t\t\t\treturn assertNever(obj.type)\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t},\n\t\t\tQuery: {\n\t\t\t\tstages: this.stagesQueryResolver.stages.bind(this.stagesQueryResolver),\n\t\t\t\texecutedMigrations: this.executedMigrationsQueryResolver.executedMigrations.bind(this.executedMigrationsQueryResolver),\n\t\t\t\tevents: this.eventsQueryResolver.events.bind(this.eventsQueryResolver),\n\t\t\t\tschema: this.schemaQueryResolver.schema.bind(this.schemaQueryResolver),\n\t\t\t},\n\t\t\tMutation: {\n\t\t\t\tmigrate: this.migrateMutationResolver.migrate.bind(this.migrateMutationResolver),\n\t\t\t},\n\t\t\tDeleteEvent: {\n\t\t\t\toldValues: this.eventOldValuesResolver.oldValues.bind(this.eventOldValuesResolver),\n\t\t\t},\n\t\t\tUpdateEvent: {\n\t\t\t\toldValues: this.eventOldValuesResolver.oldValues.bind(this.eventOldValuesResolver),\n\t\t\t},\n\t\t}\n\t\tif (debugMode) {\n\t\t\tresolvers.Mutation.truncate = this.truncateMutationResolver.truncate.bind(this.truncateMutationResolver)\n\t\t\tresolvers.Mutation.migrationDelete = this.migrationAlterMutationResolver.migrationDelete.bind(this.migrationAlterMutationResolver)\n\t\t\tresolvers.Mutation.migrationModify = this.migrationAlterMutationResolver.migrationModify.bind(this.migrationAlterMutationResolver)\n\t\t\tresolvers.Mutation.forceMigrate = this.migrateMutationResolver.migrateForce.bind(this.migrateMutationResolver)\n\t\t}\n\t\treturn resolvers\n\t}\n}\n\nconst parseValue = (value: any)  => {\n\tif ((typeof value === 'string' && value !== '') || typeof value === 'number' && isFinite(value) && Math.floor(value) === value) {\n\t\treturn value\n\t}\n\tthrow new GraphQLError('PrimaryKey cannot represent value: ' + JSON.stringify(value))\n}\n\nconst SchemaType = createJsonLikeType('Schema', 'Content schema custom scalar type')\n\n\nexport const PrimaryKeyType = new GraphQLScalarType({\n\tname: 'PrimaryKey',\n\tdescription: 'PrimaryKey custom scalar type. Can be Int or String',\n\tserialize: parseValue,\n\tparseValue: parseValue,\n\tparseLiteral(ast) {\n\t\tif (ast.kind === Kind.STRING) {\n\t\t\treturn ast.value\n\t\t}\n\t\tif (ast.kind === Kind.INT) {\n\t\t\treturn Number.parseInt(ast.value, 10)\n\t\t}\n\t\treturn null\n\t},\n})\n"],"names":["DateTimeType","JSONType","EventType","assertNever","GraphQLError","createJsonLikeType","GraphQLScalarType","Kind"],"mappings":";;;;;;;;AASO,MAAM,gBAAgB;AAAA,EACrB,YACW,qBACA,iCACA,yBACA,0BACA,gCACA,qBACA,wBACA,qBAChB;AARgB,SAAA,sBAAA;AACA,SAAA,kCAAA;AACA,SAAA,0BAAA;AACA,SAAA,2BAAA;AACA,SAAA,iCAAA;AACA,SAAA,sBAAA;AACA,SAAA,yBAAA;AACA,SAAA,sBAAA;AAAA,EACf;AAAA,EAEH,OAAO,WAA+B;AACrC,UAAM,YAA+D;AAAA,MACpE,UAAUA,aAAA;AAAA,MACV,MAAMC,aAAA;AAAA,MACN,YAAY;AAAA,MACZ,QAAQ;AAAA,MACR,OAAO;AAAA,QACN,eAAe,CAAC,QAAe;AAC9B,kBAAQ,IAAI,MAAM;AAAA,YACjB,KAAKC,MAAU,UAAA;AACP,qBAAA;AAAA,YACR,KAAKA,MAAU,UAAA;AACP,qBAAA;AAAA,YACR,KAAKA,MAAU,UAAA;AACP,qBAAA;AAAA,YACR,KAAK;AAAA,YACL,KAAK;AACG,qBAAA;AAAA,YACR;AACQ,qBAAAC,YAAA,YAAY,IAAI,IAAI;AAAA,UAC7B;AAAA,QACD;AAAA,MACD;AAAA,MACA,OAAO;AAAA,QACN,QAAQ,KAAK,oBAAoB,OAAO,KAAK,KAAK,mBAAmB;AAAA,QACrE,oBAAoB,KAAK,gCAAgC,mBAAmB,KAAK,KAAK,+BAA+B;AAAA,QACrH,QAAQ,KAAK,oBAAoB,OAAO,KAAK,KAAK,mBAAmB;AAAA,QACrE,QAAQ,KAAK,oBAAoB,OAAO,KAAK,KAAK,mBAAmB;AAAA,MACtE;AAAA,MACA,UAAU;AAAA,QACT,SAAS,KAAK,wBAAwB,QAAQ,KAAK,KAAK,uBAAuB;AAAA,MAChF;AAAA,MACA,aAAa;AAAA,QACZ,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAClF;AAAA,MACA,aAAa;AAAA,QACZ,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAClF;AAAA,IAAA;AAED,QAAI,WAAW;AACd,gBAAU,SAAS,WAAW,KAAK,yBAAyB,SAAS,KAAK,KAAK,wBAAwB;AACvG,gBAAU,SAAS,kBAAkB,KAAK,+BAA+B,gBAAgB,KAAK,KAAK,8BAA8B;AACjI,gBAAU,SAAS,kBAAkB,KAAK,+BAA+B,gBAAgB,KAAK,KAAK,8BAA8B;AACjI,gBAAU,SAAS,eAAe,KAAK,wBAAwB,aAAa,KAAK,KAAK,uBAAuB;AAAA,IAC9G;AACO,WAAA;AAAA,EACR;AACD;AAEA,MAAM,aAAa,CAAC,UAAgB;AACnC,MAAK,OAAO,UAAU,YAAY,UAAU,MAAO,OAAO,UAAU,YAAY,SAAS,KAAK,KAAK,KAAK,MAAM,KAAK,MAAM,OAAO;AACxH,WAAA;AAAA,EACR;AACA,QAAM,IAAIC,QAAa,aAAA,wCAAwC,KAAK,UAAU,KAAK,CAAC;AACrF;AAEA,MAAM,aAAaC,aAAmB,mBAAA,UAAU,mCAAmC;AAGtE,MAAA,iBAAiB,IAAIC,QAAAA,kBAAkB;AAAA,EACnD,MAAM;AAAA,EACN,aAAa;AAAA,EACb,WAAW;AAAA,EACX;AAAA,EACA,aAAa,KAAK;AACb,QAAA,IAAI,SAASC,QAAA,KAAK,QAAQ;AAC7B,aAAO,IAAI;AAAA,IACZ;AACI,QAAA,IAAI,SAASA,QAAA,KAAK,KAAK;AAC1B,aAAO,OAAO,SAAS,IAAI,OAAO,EAAE;AAAA,IACrC;AACO,WAAA;AAAA,EACR;AACD,CAAC;;;"}

package/dist/production/src/resolvers/ResolverFactory.js

@@ -2,10 +2,10 @@ import { EventType } from "../schema/types.js";
 import "../schema/dev.graphql.js";
 import "../schema/system.graphql.js";
 import { assertNever } from "../utils/assertNever.js";
-import { DateTimeType, JSONType } from "@contember/graphql-utils";
+import { createJsonLikeType, DateTimeType, JSONType } from "@contember/graphql-utils";
 import { GraphQLScalarType, Kind, GraphQLError } from "graphql";
 class ResolverFactory {
-  constructor(stagesQueryResolver, executedMigrationsQueryResolver, migrateMutationResolver, truncateMutationResolver, migrationAlterMutationResolver, eventsQueryResolver, eventOldValuesResolver) {
+  constructor(stagesQueryResolver, executedMigrationsQueryResolver, migrateMutationResolver, truncateMutationResolver, migrationAlterMutationResolver, eventsQueryResolver, eventOldValuesResolver, schemaQueryResolver) {
     this.stagesQueryResolver = stagesQueryResolver;
     this.executedMigrationsQueryResolver = executedMigrationsQueryResolver;
     this.migrateMutationResolver = migrateMutationResolver;
@@ -13,12 +13,14 @@ class ResolverFactory {
     this.migrationAlterMutationResolver = migrationAlterMutationResolver;
     this.eventsQueryResolver = eventsQueryResolver;
     this.eventOldValuesResolver = eventOldValuesResolver;
+    this.schemaQueryResolver = schemaQueryResolver;
   }
   create(debugMode) {
     const resolvers = {
       DateTime: DateTimeType,
       Json: JSONType,
       PrimaryKey: PrimaryKeyType,
+      Schema: SchemaType,
       Event: {
         __resolveType: (obj) => {
           switch (obj.type) {
@@ -39,7 +41,8 @@ class ResolverFactory {
       Query: {
         stages: this.stagesQueryResolver.stages.bind(this.stagesQueryResolver),
         executedMigrations: this.executedMigrationsQueryResolver.executedMigrations.bind(this.executedMigrationsQueryResolver),
-        events: this.eventsQueryResolver.events.bind(this.eventsQueryResolver)
+        events: this.eventsQueryResolver.events.bind(this.eventsQueryResolver),
+        schema: this.schemaQueryResolver.schema.bind(this.schemaQueryResolver)
       },
       Mutation: {
         migrate: this.migrateMutationResolver.migrate.bind(this.migrateMutationResolver)
@@ -66,6 +69,7 @@ const parseValue = (value) => {
   }
   throw new GraphQLError("PrimaryKey cannot represent value: " + JSON.stringify(value));
 };
+const SchemaType = createJsonLikeType("Schema", "Content schema custom scalar type");
 const PrimaryKeyType = new GraphQLScalarType({
   name: "PrimaryKey",
   description: "PrimaryKey custom scalar type. Can be Int or String",

package/dist/production/src/resolvers/ResolverFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResolverFactory.js","sources":["../../../../../packages/engine-system-api/src/resolvers/ResolverFactory.ts"],"sourcesContent":["import { EventsQueryResolver, ExecutedMigrationsQueryResolver, StagesQueryResolver } from './query'\nimport { Event, EventType, Resolvers } from '../schema'\nimport { assertNever } from '../utils'\nimport { MigrateMutationResolver, MigrationAlterMutationResolver, TruncateMutationResolver } from './mutation'\nimport { DateTimeType, JSONType } from '@contember/graphql-utils'\nimport { EventOldValuesResolver } from './types'\nimport { GraphQLError, GraphQLScalarType, Kind } from 'graphql'\n\nexport class ResolverFactory {\n\tpublic constructor(\n\t\tprivate readonly stagesQueryResolver: StagesQueryResolver,\n\t\tprivate readonly executedMigrationsQueryResolver: ExecutedMigrationsQueryResolver,\n\t\tprivate readonly migrateMutationResolver: MigrateMutationResolver,\n\t\tprivate readonly truncateMutationResolver: TruncateMutationResolver,\n\t\tprivate readonly migrationAlterMutationResolver: MigrationAlterMutationResolver,\n\t\tprivate readonly eventsQueryResolver: EventsQueryResolver,\n\t\tprivate readonly eventOldValuesResolver: EventOldValuesResolver,\n\t) {}\n\n\tcreate(debugMode: boolean): Resolvers {\n\t\tconst resolvers: Resolvers & Required<Pick<Resolvers, 'Mutation'>> = {\n\t\t\tDateTime: DateTimeType,\n\t\t\tJson: JSONType,\n\t\t\tPrimaryKey: PrimaryKeyType,\n\t\t\tEvent: {\n\t\t\t\t__resolveType: (obj: Event) => {\n\t\t\t\t\tswitch (obj.type) {\n\t\t\t\t\t\tcase EventType.Create:\n\t\t\t\t\t\t\treturn 'CreateEvent'\n\t\t\t\t\t\tcase EventType.Update:\n\t\t\t\t\t\t\treturn 'UpdateEvent'\n\t\t\t\t\t\tcase EventType.Delete:\n\t\t\t\t\t\t\treturn 'DeleteEvent'\n\t\t\t\t\t\tcase null:\n\t\t\t\t\t\tcase undefined:\n\t\t\t\t\t\t\treturn null\n\t\t\t\t\t\tdefault:\n\t\t\t\t\t\t\treturn assertNever(obj.type)\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t},\n\t\t\tQuery: {\n\t\t\t\tstages: this.stagesQueryResolver.stages.bind(this.stagesQueryResolver),\n\t\t\t\texecutedMigrations: this.executedMigrationsQueryResolver.executedMigrations.bind(this.executedMigrationsQueryResolver),\n\t\t\t\tevents: this.eventsQueryResolver.events.bind(this.eventsQueryResolver),\n\t\t\t},\n\t\t\tMutation: {\n\t\t\t\tmigrate: this.migrateMutationResolver.migrate.bind(this.migrateMutationResolver),\n\t\t\t},\n\t\t\tDeleteEvent: {\n\t\t\t\toldValues: this.eventOldValuesResolver.oldValues.bind(this.eventOldValuesResolver),\n\t\t\t},\n\t\t\tUpdateEvent: {\n\t\t\t\toldValues: this.eventOldValuesResolver.oldValues.bind(this.eventOldValuesResolver),\n\t\t\t},\n\t\t}\n\t\tif (debugMode) {\n\t\t\tresolvers.Mutation.truncate = this.truncateMutationResolver.truncate.bind(this.truncateMutationResolver)\n\t\t\tresolvers.Mutation.migrationDelete = this.migrationAlterMutationResolver.migrationDelete.bind(this.migrationAlterMutationResolver)\n\t\t\tresolvers.Mutation.migrationModify = this.migrationAlterMutationResolver.migrationModify.bind(this.migrationAlterMutationResolver)\n\t\t\tresolvers.Mutation.forceMigrate = this.migrateMutationResolver.migrateForce.bind(this.migrateMutationResolver)\n\t\t}\n\t\treturn resolvers\n\t}\n}\n\nconst parseValue = (value: any)  => {\n\tif ((typeof value === 'string' && value !== '') || typeof value === 'number' && isFinite(value) && Math.floor(value) === value) {\n\t\treturn value\n\t}\n\tthrow new GraphQLError('PrimaryKey cannot represent value: ' + JSON.stringify(value))\n}\nexport const PrimaryKeyType = new GraphQLScalarType({\n\tname: 'PrimaryKey',\n\tdescription: 'PrimaryKey custom scalar type. Can be Int or String',\n\tserialize: parseValue,\n\tparseValue: parseValue,\n\tparseLiteral(ast) {\n\t\tif (ast.kind === Kind.STRING) {\n\t\t\treturn ast.value\n\t\t}\n\t\tif (ast.kind === Kind.INT) {\n\t\t\treturn Number.parseInt(ast.value, 10)\n\t\t}\n\t\treturn null\n\t},\n})\n"],"names":[],"mappings":";;;;;;AAQO,MAAM,gBAAgB;AAAA,EACrB,YACW,qBACA,iCACA,yBACA,0BACA,gCACA,qBACA,wBAChB;AAPgB,SAAA,sBAAA;AACA,SAAA,kCAAA;AACA,SAAA,0BAAA;AACA,SAAA,2BAAA;AACA,SAAA,iCAAA;AACA,SAAA,sBAAA;AACA,SAAA,yBAAA;AAAA,EACf;AAAA,EAEH,OAAO,WAA+B;AACrC,UAAM,YAA+D;AAAA,MACpE,UAAU;AAAA,MACV,MAAM;AAAA,MACN,YAAY;AAAA,MACZ,OAAO;AAAA,QACN,eAAe,CAAC,QAAe;AAC9B,kBAAQ,IAAI,MAAM;AAAA,YACjB,KAAK,UAAU;AACP,qBAAA;AAAA,YACR,KAAK,UAAU;AACP,qBAAA;AAAA,YACR,KAAK,UAAU;AACP,qBAAA;AAAA,YACR,KAAK;AAAA,YACL,KAAK;AACG,qBAAA;AAAA,YACR;AACQ,qBAAA,YAAY,IAAI,IAAI;AAAA,UAC7B;AAAA,QACD;AAAA,MACD;AAAA,MACA,OAAO;AAAA,QACN,QAAQ,KAAK,oBAAoB,OAAO,KAAK,KAAK,mBAAmB;AAAA,QACrE,oBAAoB,KAAK,gCAAgC,mBAAmB,KAAK,KAAK,+BAA+B;AAAA,QACrH,QAAQ,KAAK,oBAAoB,OAAO,KAAK,KAAK,mBAAmB;AAAA,MACtE;AAAA,MACA,UAAU;AAAA,QACT,SAAS,KAAK,wBAAwB,QAAQ,KAAK,KAAK,uBAAuB;AAAA,MAChF;AAAA,MACA,aAAa;AAAA,QACZ,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAClF;AAAA,MACA,aAAa;AAAA,QACZ,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAClF;AAAA,IAAA;AAED,QAAI,WAAW;AACd,gBAAU,SAAS,WAAW,KAAK,yBAAyB,SAAS,KAAK,KAAK,wBAAwB;AACvG,gBAAU,SAAS,kBAAkB,KAAK,+BAA+B,gBAAgB,KAAK,KAAK,8BAA8B;AACjI,gBAAU,SAAS,kBAAkB,KAAK,+BAA+B,gBAAgB,KAAK,KAAK,8BAA8B;AACjI,gBAAU,SAAS,eAAe,KAAK,wBAAwB,aAAa,KAAK,KAAK,uBAAuB;AAAA,IAC9G;AACO,WAAA;AAAA,EACR;AACD;AAEA,MAAM,aAAa,CAAC,UAAgB;AACnC,MAAK,OAAO,UAAU,YAAY,UAAU,MAAO,OAAO,UAAU,YAAY,SAAS,KAAK,KAAK,KAAK,MAAM,KAAK,MAAM,OAAO;AACxH,WAAA;AAAA,EACR;AACA,QAAM,IAAI,aAAa,wCAAwC,KAAK,UAAU,KAAK,CAAC;AACrF;AACa,MAAA,iBAAiB,IAAI,kBAAkB;AAAA,EACnD,MAAM;AAAA,EACN,aAAa;AAAA,EACb,WAAW;AAAA,EACX;AAAA,EACA,aAAa,KAAK;AACb,QAAA,IAAI,SAAS,KAAK,QAAQ;AAC7B,aAAO,IAAI;AAAA,IACZ;AACI,QAAA,IAAI,SAAS,KAAK,KAAK;AAC1B,aAAO,OAAO,SAAS,IAAI,OAAO,EAAE;AAAA,IACrC;AACO,WAAA;AAAA,EACR;AACD,CAAC;"}
+{"version":3,"file":"ResolverFactory.js","sources":["../../../../../packages/engine-system-api/src/resolvers/ResolverFactory.ts"],"sourcesContent":["import { EventsQueryResolver, ExecutedMigrationsQueryResolver, StagesQueryResolver } from './query'\nimport { Event, EventType, Resolvers } from '../schema'\nimport { assertNever } from '../utils'\nimport { MigrateMutationResolver, MigrationAlterMutationResolver, TruncateMutationResolver } from './mutation'\nimport { DateTimeType, JSONType, createJsonLikeType } from '@contember/graphql-utils'\nimport { EventOldValuesResolver } from './types'\nimport { GraphQLError, GraphQLScalarType, Kind } from 'graphql'\nimport { SchemaQueryResolver } from './query/SchemaQueryResolver'\n\nexport class ResolverFactory {\n\tpublic constructor(\n\t\tprivate readonly stagesQueryResolver: StagesQueryResolver,\n\t\tprivate readonly executedMigrationsQueryResolver: ExecutedMigrationsQueryResolver,\n\t\tprivate readonly migrateMutationResolver: MigrateMutationResolver,\n\t\tprivate readonly truncateMutationResolver: TruncateMutationResolver,\n\t\tprivate readonly migrationAlterMutationResolver: MigrationAlterMutationResolver,\n\t\tprivate readonly eventsQueryResolver: EventsQueryResolver,\n\t\tprivate readonly eventOldValuesResolver: EventOldValuesResolver,\n\t\tprivate readonly schemaQueryResolver: SchemaQueryResolver,\n\t) {}\n\n\tcreate(debugMode: boolean): Resolvers {\n\t\tconst resolvers: Resolvers & Required<Pick<Resolvers, 'Mutation'>> = {\n\t\t\tDateTime: DateTimeType,\n\t\t\tJson: JSONType,\n\t\t\tPrimaryKey: PrimaryKeyType,\n\t\t\tSchema: SchemaType,\n\t\t\tEvent: {\n\t\t\t\t__resolveType: (obj: Event) => {\n\t\t\t\t\tswitch (obj.type) {\n\t\t\t\t\t\tcase EventType.Create:\n\t\t\t\t\t\t\treturn 'CreateEvent'\n\t\t\t\t\t\tcase EventType.Update:\n\t\t\t\t\t\t\treturn 'UpdateEvent'\n\t\t\t\t\t\tcase EventType.Delete:\n\t\t\t\t\t\t\treturn 'DeleteEvent'\n\t\t\t\t\t\tcase null:\n\t\t\t\t\t\tcase undefined:\n\t\t\t\t\t\t\treturn null\n\t\t\t\t\t\tdefault:\n\t\t\t\t\t\t\treturn assertNever(obj.type)\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t},\n\t\t\tQuery: {\n\t\t\t\tstages: this.stagesQueryResolver.stages.bind(this.stagesQueryResolver),\n\t\t\t\texecutedMigrations: this.executedMigrationsQueryResolver.executedMigrations.bind(this.executedMigrationsQueryResolver),\n\t\t\t\tevents: this.eventsQueryResolver.events.bind(this.eventsQueryResolver),\n\t\t\t\tschema: this.schemaQueryResolver.schema.bind(this.schemaQueryResolver),\n\t\t\t},\n\t\t\tMutation: {\n\t\t\t\tmigrate: this.migrateMutationResolver.migrate.bind(this.migrateMutationResolver),\n\t\t\t},\n\t\t\tDeleteEvent: {\n\t\t\t\toldValues: this.eventOldValuesResolver.oldValues.bind(this.eventOldValuesResolver),\n\t\t\t},\n\t\t\tUpdateEvent: {\n\t\t\t\toldValues: this.eventOldValuesResolver.oldValues.bind(this.eventOldValuesResolver),\n\t\t\t},\n\t\t}\n\t\tif (debugMode) {\n\t\t\tresolvers.Mutation.truncate = this.truncateMutationResolver.truncate.bind(this.truncateMutationResolver)\n\t\t\tresolvers.Mutation.migrationDelete = this.migrationAlterMutationResolver.migrationDelete.bind(this.migrationAlterMutationResolver)\n\t\t\tresolvers.Mutation.migrationModify = this.migrationAlterMutationResolver.migrationModify.bind(this.migrationAlterMutationResolver)\n\t\t\tresolvers.Mutation.forceMigrate = this.migrateMutationResolver.migrateForce.bind(this.migrateMutationResolver)\n\t\t}\n\t\treturn resolvers\n\t}\n}\n\nconst parseValue = (value: any)  => {\n\tif ((typeof value === 'string' && value !== '') || typeof value === 'number' && isFinite(value) && Math.floor(value) === value) {\n\t\treturn value\n\t}\n\tthrow new GraphQLError('PrimaryKey cannot represent value: ' + JSON.stringify(value))\n}\n\nconst SchemaType = createJsonLikeType('Schema', 'Content schema custom scalar type')\n\n\nexport const PrimaryKeyType = new GraphQLScalarType({\n\tname: 'PrimaryKey',\n\tdescription: 'PrimaryKey custom scalar type. Can be Int or String',\n\tserialize: parseValue,\n\tparseValue: parseValue,\n\tparseLiteral(ast) {\n\t\tif (ast.kind === Kind.STRING) {\n\t\t\treturn ast.value\n\t\t}\n\t\tif (ast.kind === Kind.INT) {\n\t\t\treturn Number.parseInt(ast.value, 10)\n\t\t}\n\t\treturn null\n\t},\n})\n"],"names":[],"mappings":";;;;;;AASO,MAAM,gBAAgB;AAAA,EACrB,YACW,qBACA,iCACA,yBACA,0BACA,gCACA,qBACA,wBACA,qBAChB;AARgB,SAAA,sBAAA;AACA,SAAA,kCAAA;AACA,SAAA,0BAAA;AACA,SAAA,2BAAA;AACA,SAAA,iCAAA;AACA,SAAA,sBAAA;AACA,SAAA,yBAAA;AACA,SAAA,sBAAA;AAAA,EACf;AAAA,EAEH,OAAO,WAA+B;AACrC,UAAM,YAA+D;AAAA,MACpE,UAAU;AAAA,MACV,MAAM;AAAA,MACN,YAAY;AAAA,MACZ,QAAQ;AAAA,MACR,OAAO;AAAA,QACN,eAAe,CAAC,QAAe;AAC9B,kBAAQ,IAAI,MAAM;AAAA,YACjB,KAAK,UAAU;AACP,qBAAA;AAAA,YACR,KAAK,UAAU;AACP,qBAAA;AAAA,YACR,KAAK,UAAU;AACP,qBAAA;AAAA,YACR,KAAK;AAAA,YACL,KAAK;AACG,qBAAA;AAAA,YACR;AACQ,qBAAA,YAAY,IAAI,IAAI;AAAA,UAC7B;AAAA,QACD;AAAA,MACD;AAAA,MACA,OAAO;AAAA,QACN,QAAQ,KAAK,oBAAoB,OAAO,KAAK,KAAK,mBAAmB;AAAA,QACrE,oBAAoB,KAAK,gCAAgC,mBAAmB,KAAK,KAAK,+BAA+B;AAAA,QACrH,QAAQ,KAAK,oBAAoB,OAAO,KAAK,KAAK,mBAAmB;AAAA,QACrE,QAAQ,KAAK,oBAAoB,OAAO,KAAK,KAAK,mBAAmB;AAAA,MACtE;AAAA,MACA,UAAU;AAAA,QACT,SAAS,KAAK,wBAAwB,QAAQ,KAAK,KAAK,uBAAuB;AAAA,MAChF;AAAA,MACA,aAAa;AAAA,QACZ,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAClF;AAAA,MACA,aAAa;AAAA,QACZ,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAClF;AAAA,IAAA;AAED,QAAI,WAAW;AACd,gBAAU,SAAS,WAAW,KAAK,yBAAyB,SAAS,KAAK,KAAK,wBAAwB;AACvG,gBAAU,SAAS,kBAAkB,KAAK,+BAA+B,gBAAgB,KAAK,KAAK,8BAA8B;AACjI,gBAAU,SAAS,kBAAkB,KAAK,+BAA+B,gBAAgB,KAAK,KAAK,8BAA8B;AACjI,gBAAU,SAAS,eAAe,KAAK,wBAAwB,aAAa,KAAK,KAAK,uBAAuB;AAAA,IAC9G;AACO,WAAA;AAAA,EACR;AACD;AAEA,MAAM,aAAa,CAAC,UAAgB;AACnC,MAAK,OAAO,UAAU,YAAY,UAAU,MAAO,OAAO,UAAU,YAAY,SAAS,KAAK,KAAK,KAAK,MAAM,KAAK,MAAM,OAAO;AACxH,WAAA;AAAA,EACR;AACA,QAAM,IAAI,aAAa,wCAAwC,KAAK,UAAU,KAAK,CAAC;AACrF;AAEA,MAAM,aAAa,mBAAmB,UAAU,mCAAmC;AAGtE,MAAA,iBAAiB,IAAI,kBAAkB;AAAA,EACnD,MAAM;AAAA,EACN,aAAa;AAAA,EACb,WAAW;AAAA,EACX;AAAA,EACA,aAAa,KAAK;AACb,QAAA,IAAI,SAAS,KAAK,QAAQ;AAC7B,aAAO,IAAI;AAAA,IACZ;AACI,QAAA,IAAI,SAAS,KAAK,KAAK;AAC1B,aAAO,OAAO,SAAS,IAAI,OAAO,EAAE;AAAA,IACrC;AACO,WAAA;AAAA,EACR;AACD,CAAC;"}

package/dist/production/src/resolvers/SystemResolverContext.cjs

@@ -7,15 +7,15 @@ class SystemResolverContextFactory {
   constructor(authorizator) {
     this.authorizator = authorizator;
   }
-  async create(schema, systemDbContext, project, identity) {
-    const stagePermissionsFactory = new StagePermissionsFactory.StagePermissionsFactory(schema);
+  async create({ getSchema, identity, project, db }) {
+    const stagePermissionsFactory = new StagePermissionsFactory.StagePermissionsFactory(getSchema);
     const loaders = /* @__PURE__ */ new Map();
     return {
       project,
       identity,
-      schema,
+      getSchema,
       authorizator: this.authorizator,
-      db: systemDbContext,
+      db,
       requireAccess: async (action, stage, message) => {
         if (!await this.authorizator.isAllowed(identity, new StageScope.StageScope(stage, stagePermissionsFactory), action)) {
           throw new graphqlUtils.ForbiddenError(message || "Forbidden");
@@ -26,7 +26,7 @@ class SystemResolverContextFactory {
         if (loader) {
           return loader;
         }
-        const newLoader = loaderFactory(systemDbContext);
+        const newLoader = loaderFactory(db);
         loaders.set(loaderFactory, newLoader);
         return newLoader;
       }

package/dist/production/src/resolvers/SystemResolverContext.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"SystemResolverContext.cjs","sources":["../../../../../packages/engine-system-api/src/resolvers/SystemResolverContext.ts"],"sourcesContent":["import { Authorizator } from '@contember/authorization'\nimport { Schema } from '@contember/schema'\nimport { ForbiddenError } from '@contember/graphql-utils'\nimport { DatabaseContext, Identity, VersionedSchema } from '../model'\nimport { ProjectConfig } from '../types'\nimport { StagePermissionsFactory } from '../model/authorization/StagePermissionsFactory'\nimport { StageScope } from '../model/authorization/StageScope'\nimport { ItemLoader } from '../utils/batchQuery'\n\nexport class SystemResolverContextFactory {\n\tconstructor(\n\t\tprivate readonly authorizator: Authorizator<Identity>,\n\t) {}\n\n\tpublic async create(\n\t\tschema: VersionedSchema,\n\t\tsystemDbContext: DatabaseContext,\n\t\tproject: ProjectConfig,\n\t\tidentity: Identity,\n\t): Promise<SystemResolverContext> {\n\t\tconst stagePermissionsFactory = new StagePermissionsFactory(schema)\n\t\tconst loaders = new Map<LoaderFactory<any, any>, ItemLoader<any, any>>()\n\t\treturn {\n\t\t\tproject,\n\t\t\tidentity,\n\t\t\tschema,\n\t\t\tauthorizator: this.authorizator,\n\t\t\tdb: systemDbContext,\n\t\t\trequireAccess: async (action, stage, message?) => {\n\t\t\t\tif (!(await this.authorizator.isAllowed(identity, new StageScope(stage, stagePermissionsFactory), action))) {\n\t\t\t\t\tthrow new ForbiddenError(message || 'Forbidden')\n\t\t\t\t}\n\t\t\t},\n\t\t\tgetLoader: loaderFactory => {\n\t\t\t\tconst loader = loaders.get(loaderFactory)\n\t\t\t\tif (loader) {\n\t\t\t\t\treturn loader\n\t\t\t\t}\n\t\t\t\tconst newLoader = loaderFactory(systemDbContext)\n\t\t\t\tloaders.set(loaderFactory, newLoader)\n\t\t\t\treturn newLoader\n\t\t\t},\n\t\t}\n\t}\n}\n\nexport type LoaderFactory<Args, Item> = (db: DatabaseContext) => ItemLoader<Args, Item>\n\nexport interface SystemResolverContext {\n\treadonly project: ProjectConfig\n\treadonly schema: Schema\n\treadonly identity: Identity\n\treadonly db: DatabaseContext\n\treadonly authorizator: Authorizator<Identity>\n\treadonly requireAccess: (action: Authorizator.Action, stage: string, message?: string) => Promise<void>\n\treadonly getLoader: <Args, Item>(loaderFactory: LoaderFactory<Args, Item>) => ItemLoader<Args, Item>\n}\n"],"names":["StagePermissionsFactory","StageScope","ForbiddenError"],"mappings":";;;;;AASO,MAAM,6BAA6B;AAAA,EACzC,YACkB,cAChB;AADgB,SAAA,eAAA;AAAA,EACf;AAAA,EAEH,MAAa,OACZ,QACA,iBACA,SACA,UACiC;AAC3B,UAAA,0BAA0B,IAAIA,gDAAwB,MAAM;AAC5D,UAAA,8BAAc;AACb,WAAA;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACA,cAAc,KAAK;AAAA,MACnB,IAAI;AAAA,MACJ,eAAe,OAAO,QAAQ,OAAO,YAAa;AACjD,YAAI,CAAE,MAAM,KAAK,aAAa,UAAU,UAAU,IAAIC,WAAAA,WAAW,OAAO,uBAAuB,GAAG,MAAM,GAAI;AACrG,gBAAA,IAAIC,aAAe,eAAA,WAAW,WAAW;AAAA,QAChD;AAAA,MACD;AAAA,MACA,WAAW,CAAiB,kBAAA;AACrB,cAAA,SAAS,QAAQ,IAAI,aAAa;AACxC,YAAI,QAAQ;AACJ,iBAAA;AAAA,QACR;AACM,cAAA,YAAY,cAAc,eAAe;AACvC,gBAAA,IAAI,eAAe,SAAS;AAC7B,eAAA;AAAA,MACR;AAAA,IAAA;AAAA,EAEF;AACD;;"}
+{"version":3,"file":"SystemResolverContext.cjs","sources":["../../../../../packages/engine-system-api/src/resolvers/SystemResolverContext.ts"],"sourcesContent":["import { Authorizator } from '@contember/authorization'\nimport { ForbiddenError } from '@contember/graphql-utils'\nimport { DatabaseContext, Identity } from '../model'\nimport { ProjectConfig } from '../types'\nimport { StagePermissionsFactory } from '../model/authorization/StagePermissionsFactory'\nimport { StageScope } from '../model/authorization/StageScope'\nimport { ItemLoader } from '../utils/batchQuery'\nimport { SchemaGetter } from '../model/SchemaGetter'\n\nexport class SystemResolverContextFactory {\n\tconstructor(\n\t\tprivate readonly authorizator: Authorizator<Identity>,\n\t) {}\n\n\tpublic async create({ getSchema, identity, project, db }: Pick<SystemResolverContext, 'getSchema' | 'db' | 'identity' | 'project'>): Promise<SystemResolverContext> {\n\t\tconst stagePermissionsFactory = new StagePermissionsFactory(getSchema)\n\t\tconst loaders = new Map<LoaderFactory<any, any>, ItemLoader<any, any>>()\n\t\treturn {\n\t\t\tproject,\n\t\t\tidentity,\n\t\t\tgetSchema,\n\t\t\tauthorizator: this.authorizator,\n\t\t\tdb,\n\t\t\trequireAccess: async (action, stage, message?) => {\n\t\t\t\tif (!(await this.authorizator.isAllowed(identity, new StageScope(stage, stagePermissionsFactory), action))) {\n\t\t\t\t\tthrow new ForbiddenError(message || 'Forbidden')\n\t\t\t\t}\n\t\t\t},\n\t\t\tgetLoader: loaderFactory => {\n\t\t\t\tconst loader = loaders.get(loaderFactory)\n\t\t\t\tif (loader) {\n\t\t\t\t\treturn loader\n\t\t\t\t}\n\t\t\t\tconst newLoader = loaderFactory(db)\n\t\t\t\tloaders.set(loaderFactory, newLoader)\n\t\t\t\treturn newLoader\n\t\t\t},\n\t\t}\n\t}\n}\n\nexport type LoaderFactory<Args, Item> = (db: DatabaseContext) => ItemLoader<Args, Item>\n\nexport interface SystemResolverContext {\n\treadonly project: ProjectConfig\n\treadonly getSchema: SchemaGetter\n\treadonly identity: Identity\n\treadonly db: DatabaseContext\n\treadonly authorizator: Authorizator<Identity>\n\treadonly requireAccess: (action: Authorizator.Action, stage: string, message?: string) => Promise<void>\n\treadonly getLoader: <Args, Item>(loaderFactory: LoaderFactory<Args, Item>) => ItemLoader<Args, Item>\n}\n"],"names":["StagePermissionsFactory","StageScope","ForbiddenError"],"mappings":";;;;;AASO,MAAM,6BAA6B;AAAA,EACzC,YACkB,cAChB;AADgB,SAAA,eAAA;AAAA,EACf;AAAA,EAEH,MAAa,OAAO,EAAE,WAAW,UAAU,SAAS,MAAgH;AAC7J,UAAA,0BAA0B,IAAIA,gDAAwB,SAAS;AAC/D,UAAA,8BAAc;AACb,WAAA;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACA,cAAc,KAAK;AAAA,MACnB;AAAA,MACA,eAAe,OAAO,QAAQ,OAAO,YAAa;AACjD,YAAI,CAAE,MAAM,KAAK,aAAa,UAAU,UAAU,IAAIC,WAAAA,WAAW,OAAO,uBAAuB,GAAG,MAAM,GAAI;AACrG,gBAAA,IAAIC,aAAe,eAAA,WAAW,WAAW;AAAA,QAChD;AAAA,MACD;AAAA,MACA,WAAW,CAAiB,kBAAA;AACrB,cAAA,SAAS,QAAQ,IAAI,aAAa;AACxC,YAAI,QAAQ;AACJ,iBAAA;AAAA,QACR;AACM,cAAA,YAAY,cAAc,EAAE;AAC1B,gBAAA,IAAI,eAAe,SAAS;AAC7B,eAAA;AAAA,MACR;AAAA,IAAA;AAAA,EAEF;AACD;;"}

package/dist/production/src/resolvers/SystemResolverContext.js

@@ -5,15 +5,15 @@ class SystemResolverContextFactory {
   constructor(authorizator) {
     this.authorizator = authorizator;
   }
-  async create(schema, systemDbContext, project, identity) {
-    const stagePermissionsFactory = new StagePermissionsFactory(schema);
+  async create({ getSchema, identity, project, db }) {
+    const stagePermissionsFactory = new StagePermissionsFactory(getSchema);
     const loaders = /* @__PURE__ */ new Map();
     return {
       project,
       identity,
-      schema,
+      getSchema,
       authorizator: this.authorizator,
-      db: systemDbContext,
+      db,
       requireAccess: async (action, stage, message) => {
         if (!await this.authorizator.isAllowed(identity, new StageScope(stage, stagePermissionsFactory), action)) {
           throw new ForbiddenError(message || "Forbidden");
@@ -24,7 +24,7 @@ class SystemResolverContextFactory {
         if (loader) {
           return loader;
         }
-        const newLoader = loaderFactory(systemDbContext);
+        const newLoader = loaderFactory(db);
         loaders.set(loaderFactory, newLoader);
         return newLoader;
       }

package/dist/production/src/resolvers/SystemResolverContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"SystemResolverContext.js","sources":["../../../../../packages/engine-system-api/src/resolvers/SystemResolverContext.ts"],"sourcesContent":["import { Authorizator } from '@contember/authorization'\nimport { Schema } from '@contember/schema'\nimport { ForbiddenError } from '@contember/graphql-utils'\nimport { DatabaseContext, Identity, VersionedSchema } from '../model'\nimport { ProjectConfig } from '../types'\nimport { StagePermissionsFactory } from '../model/authorization/StagePermissionsFactory'\nimport { StageScope } from '../model/authorization/StageScope'\nimport { ItemLoader } from '../utils/batchQuery'\n\nexport class SystemResolverContextFactory {\n\tconstructor(\n\t\tprivate readonly authorizator: Authorizator<Identity>,\n\t) {}\n\n\tpublic async create(\n\t\tschema: VersionedSchema,\n\t\tsystemDbContext: DatabaseContext,\n\t\tproject: ProjectConfig,\n\t\tidentity: Identity,\n\t): Promise<SystemResolverContext> {\n\t\tconst stagePermissionsFactory = new StagePermissionsFactory(schema)\n\t\tconst loaders = new Map<LoaderFactory<any, any>, ItemLoader<any, any>>()\n\t\treturn {\n\t\t\tproject,\n\t\t\tidentity,\n\t\t\tschema,\n\t\t\tauthorizator: this.authorizator,\n\t\t\tdb: systemDbContext,\n\t\t\trequireAccess: async (action, stage, message?) => {\n\t\t\t\tif (!(await this.authorizator.isAllowed(identity, new StageScope(stage, stagePermissionsFactory), action))) {\n\t\t\t\t\tthrow new ForbiddenError(message || 'Forbidden')\n\t\t\t\t}\n\t\t\t},\n\t\t\tgetLoader: loaderFactory => {\n\t\t\t\tconst loader = loaders.get(loaderFactory)\n\t\t\t\tif (loader) {\n\t\t\t\t\treturn loader\n\t\t\t\t}\n\t\t\t\tconst newLoader = loaderFactory(systemDbContext)\n\t\t\t\tloaders.set(loaderFactory, newLoader)\n\t\t\t\treturn newLoader\n\t\t\t},\n\t\t}\n\t}\n}\n\nexport type LoaderFactory<Args, Item> = (db: DatabaseContext) => ItemLoader<Args, Item>\n\nexport interface SystemResolverContext {\n\treadonly project: ProjectConfig\n\treadonly schema: Schema\n\treadonly identity: Identity\n\treadonly db: DatabaseContext\n\treadonly authorizator: Authorizator<Identity>\n\treadonly requireAccess: (action: Authorizator.Action, stage: string, message?: string) => Promise<void>\n\treadonly getLoader: <Args, Item>(loaderFactory: LoaderFactory<Args, Item>) => ItemLoader<Args, Item>\n}\n"],"names":[],"mappings":";;;AASO,MAAM,6BAA6B;AAAA,EACzC,YACkB,cAChB;AADgB,SAAA,eAAA;AAAA,EACf;AAAA,EAEH,MAAa,OACZ,QACA,iBACA,SACA,UACiC;AAC3B,UAAA,0BAA0B,IAAI,wBAAwB,MAAM;AAC5D,UAAA,8BAAc;AACb,WAAA;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACA,cAAc,KAAK;AAAA,MACnB,IAAI;AAAA,MACJ,eAAe,OAAO,QAAQ,OAAO,YAAa;AACjD,YAAI,CAAE,MAAM,KAAK,aAAa,UAAU,UAAU,IAAI,WAAW,OAAO,uBAAuB,GAAG,MAAM,GAAI;AACrG,gBAAA,IAAI,eAAe,WAAW,WAAW;AAAA,QAChD;AAAA,MACD;AAAA,MACA,WAAW,CAAiB,kBAAA;AACrB,cAAA,SAAS,QAAQ,IAAI,aAAa;AACxC,YAAI,QAAQ;AACJ,iBAAA;AAAA,QACR;AACM,cAAA,YAAY,cAAc,eAAe;AACvC,gBAAA,IAAI,eAAe,SAAS;AAC7B,eAAA;AAAA,MACR;AAAA,IAAA;AAAA,EAEF;AACD;"}
+{"version":3,"file":"SystemResolverContext.js","sources":["../../../../../packages/engine-system-api/src/resolvers/SystemResolverContext.ts"],"sourcesContent":["import { Authorizator } from '@contember/authorization'\nimport { ForbiddenError } from '@contember/graphql-utils'\nimport { DatabaseContext, Identity } from '../model'\nimport { ProjectConfig } from '../types'\nimport { StagePermissionsFactory } from '../model/authorization/StagePermissionsFactory'\nimport { StageScope } from '../model/authorization/StageScope'\nimport { ItemLoader } from '../utils/batchQuery'\nimport { SchemaGetter } from '../model/SchemaGetter'\n\nexport class SystemResolverContextFactory {\n\tconstructor(\n\t\tprivate readonly authorizator: Authorizator<Identity>,\n\t) {}\n\n\tpublic async create({ getSchema, identity, project, db }: Pick<SystemResolverContext, 'getSchema' | 'db' | 'identity' | 'project'>): Promise<SystemResolverContext> {\n\t\tconst stagePermissionsFactory = new StagePermissionsFactory(getSchema)\n\t\tconst loaders = new Map<LoaderFactory<any, any>, ItemLoader<any, any>>()\n\t\treturn {\n\t\t\tproject,\n\t\t\tidentity,\n\t\t\tgetSchema,\n\t\t\tauthorizator: this.authorizator,\n\t\t\tdb,\n\t\t\trequireAccess: async (action, stage, message?) => {\n\t\t\t\tif (!(await this.authorizator.isAllowed(identity, new StageScope(stage, stagePermissionsFactory), action))) {\n\t\t\t\t\tthrow new ForbiddenError(message || 'Forbidden')\n\t\t\t\t}\n\t\t\t},\n\t\t\tgetLoader: loaderFactory => {\n\t\t\t\tconst loader = loaders.get(loaderFactory)\n\t\t\t\tif (loader) {\n\t\t\t\t\treturn loader\n\t\t\t\t}\n\t\t\t\tconst newLoader = loaderFactory(db)\n\t\t\t\tloaders.set(loaderFactory, newLoader)\n\t\t\t\treturn newLoader\n\t\t\t},\n\t\t}\n\t}\n}\n\nexport type LoaderFactory<Args, Item> = (db: DatabaseContext) => ItemLoader<Args, Item>\n\nexport interface SystemResolverContext {\n\treadonly project: ProjectConfig\n\treadonly getSchema: SchemaGetter\n\treadonly identity: Identity\n\treadonly db: DatabaseContext\n\treadonly authorizator: Authorizator<Identity>\n\treadonly requireAccess: (action: Authorizator.Action, stage: string, message?: string) => Promise<void>\n\treadonly getLoader: <Args, Item>(loaderFactory: LoaderFactory<Args, Item>) => ItemLoader<Args, Item>\n}\n"],"names":[],"mappings":";;;AASO,MAAM,6BAA6B;AAAA,EACzC,YACkB,cAChB;AADgB,SAAA,eAAA;AAAA,EACf;AAAA,EAEH,MAAa,OAAO,EAAE,WAAW,UAAU,SAAS,MAAgH;AAC7J,UAAA,0BAA0B,IAAI,wBAAwB,SAAS;AAC/D,UAAA,8BAAc;AACb,WAAA;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACA,cAAc,KAAK;AAAA,MACnB;AAAA,MACA,eAAe,OAAO,QAAQ,OAAO,YAAa;AACjD,YAAI,CAAE,MAAM,KAAK,aAAa,UAAU,UAAU,IAAI,WAAW,OAAO,uBAAuB,GAAG,MAAM,GAAI;AACrG,gBAAA,IAAI,eAAe,WAAW,WAAW;AAAA,QAChD;AAAA,MACD;AAAA,MACA,WAAW,CAAiB,kBAAA;AACrB,cAAA,SAAS,QAAQ,IAAI,aAAa;AACxC,YAAI,QAAQ;AACJ,iBAAA;AAAA,QACR;AACM,cAAA,YAAY,cAAc,EAAE;AAC1B,gBAAA,IAAI,eAAe,SAAS;AAC7B,eAAA;AAAA,MACR;AAAA,IAAA;AAAA,EAEF;AACD;"}

package/dist/production/src/resolvers/mutation/MigrateMutationResolver.cjs

@@ -12,7 +12,6 @@ require("@contember/schema-utils");
 const assertNever = require("../../utils/assertNever.cjs");
 const StagesQuery = require("../../model/queries/stages/StagesQuery.cjs");
 const ProjectMigrator = require("../../model/migrations/ProjectMigrator.cjs");
-require("../../model/migrations/SchemaVersionBuilder.cjs");
 require("@contember/logger");
 const graphqlUtils = require("@contember/graphql-utils");
 const pg_lock_id = 1597474138739147;

package/dist/production/src/resolvers/mutation/MigrateMutationResolver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MigrateMutationResolver.cjs","sources":["../../../../../../packages/engine-system-api/src/resolvers/mutation/MigrateMutationResolver.ts"],"sourcesContent":["import { GraphQLResolveInfo } from 'graphql'\nimport { SystemResolverContext } from '../SystemResolverContext'\nimport { MutationResolver } from '../Resolver'\nimport { MigrateResponse, MigrationType, MutationMigrateArgs } from '../../schema'\nimport { Migration } from '@contember/schema-migrations'\nimport { AuthorizationActions, MigrationError, ProjectMigrator, StagesQuery } from '../../model'\nimport { MigrationInput } from '../../model/migrations/MigrationInput'\nimport { UserInputError } from '@contember/graphql-utils'\nimport { SchemaValidatorSkippedErrors } from '@contember/schema-utils'\nimport { assertNever } from '../../utils'\n\nconst pg_lock_id = 1597474138739147\n\nexport class MigrateMutationResolver implements MutationResolver<'migrate'> {\n\tconstructor(private readonly projectMigrator: ProjectMigrator) {}\n\n\tasync migrateForce(\n\t\tparent: any,\n\t\targs: MutationMigrateArgs,\n\t\tcontext: SystemResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t): Promise<MigrateResponse> {\n\t\treturn this.migrate(parent, args, context, info, true)\n\t}\n\n\tasync migrate(\n\t\tparent: any,\n\t\targs: MutationMigrateArgs,\n\t\tcontext: SystemResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t\tforce = false,\n\t): Promise<MigrateResponse> {\n\t\tconst migrations = this.parseMigrationInput(args)\n\n\t\treturn context.db.locked(pg_lock_id, db => db.transaction(async trx => {\n\t\t\tconst stages = await trx.queryHandler.fetch(new StagesQuery())\n\t\t\tfor (const stage of stages) {\n\t\t\t\tawait context.requireAccess(AuthorizationActions.PROJECT_MIGRATE, stage.slug)\n\t\t\t}\n\t\t\ttry {\n\t\t\t\tawait this.projectMigrator.migrate({\n\t\t\t\t\tdb: trx,\n\t\t\t\t\tproject: context.project,\n\t\t\t\t\tidentity: context.identity,\n\t\t\t\t\tstages,\n\t\t\t\t\tmigrationsToExecute: migrations,\n\t\t\t\t\toptions: {\n\t\t\t\t\t\tignoreOrder: force,\n\t\t\t\t\t\tskipExecuted: true,\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t} catch (e) {\n\t\t\t\tif (e instanceof MigrationError) {\n\t\t\t\t\tawait trx.client.connection.rollback()\n\t\t\t\t\tconst error = {\n\t\t\t\t\t\tcode: e.code,\n\t\t\t\t\t\tmigration: e.version,\n\t\t\t\t\t\tdeveloperMessage: e.message,\n\t\t\t\t\t}\n\t\t\t\t\treturn {\n\t\t\t\t\t\tok: false,\n\t\t\t\t\t\terrors: [error],\n\t\t\t\t\t\terror,\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tthrow e\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn {\n\t\t\t\tok: true,\n\t\t\t\terrors: [],\n\t\t\t}\n\t\t}))\n\t}\n\n\tprivate parseMigrationInput(args: MutationMigrateArgs): MigrationInput[] {\n\t\treturn args.migrations.map((it): MigrationInput => {\n\t\t\tif (!it.type) {\n\t\t\t\tif (!it.modifications || !it.formatVersion) {\n\t\t\t\t\tthrow new UserInputError('invalid migration format')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'schema',\n\t\t\t\t\tformatVersion: it.formatVersion,\n\t\t\t\t\tmodifications: it.modifications as Migration.Modification[],\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tskippedErrors: (it.skippedErrors as SchemaValidatorSkippedErrors[]) ?? undefined,\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (it.type === MigrationType.Schema) {\n\t\t\t\tif (!it.schemaMigration) {\n\t\t\t\t\tthrow new UserInputError('schemaMigration must be defined for SCHEMA type')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'schema',\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\t...(it.schemaMigration as Omit<Migration, 'name' | 'version'>),\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (it.type === MigrationType.Content) {\n\t\t\t\tif (!it.contentMigration) {\n\t\t\t\t\tthrow new UserInputError('contentMigration must be defined for CONTENT type')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'content',\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\tqueries: it.contentMigration.map(it => ({\n\t\t\t\t\t\tquery: it.query,\n\t\t\t\t\t\tstage: it.stage ?? undefined,\n\t\t\t\t\t\tvariables: it.variables ?? undefined,\n\t\t\t\t\t})),\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn assertNever(it.type)\n\t\t})\n\t}\n}\n"],"names":["StagesQuery","AuthorizationActions","MigrationError","UserInputError","MigrationType","it","assertNever"],"mappings":";;;;;;;;;;;;;;;;;AAWA,MAAM,aAAa;AAEZ,MAAM,wBAA+D;AAAA,EAC3E,YAA6B,iBAAkC;AAAlC,SAAA,kBAAA;AAAA,EAAmC;AAAA,EAEhE,MAAM,aACL,QACA,MACA,SACA,MAC2B;AAC3B,WAAO,KAAK,QAAQ,QAAQ,MAAM,SAAS,MAAM,IAAI;AAAA,EACtD;AAAA,EAEA,MAAM,QACL,QACA,MACA,SACA,MACA,QAAQ,OACmB;AACrB,UAAA,aAAa,KAAK,oBAAoB,IAAI;AAEzC,WAAA,QAAQ,GAAG,OAAO,YAAY,QAAM,GAAG,YAAY,OAAM,QAAO;AACtE,YAAM,SAAS,MAAM,IAAI,aAAa,MAAM,IAAIA,yBAAa;AAC7D,iBAAW,SAAS,QAAQ;AAC3B,cAAM,QAAQ,cAAcC,qBAAAA,qBAAqB,iBAAiB,MAAM,IAAI;AAAA,MAC7E;AACI,UAAA;AACG,cAAA,KAAK,gBAAgB,QAAQ;AAAA,UAClC,IAAI;AAAA,UACJ,SAAS,QAAQ;AAAA,UACjB,UAAU,QAAQ;AAAA,UAClB;AAAA,UACA,qBAAqB;AAAA,UACrB,SAAS;AAAA,YACR,aAAa;AAAA,YACb,cAAc;AAAA,UACf;AAAA,QAAA,CACA;AAAA,eACO,GAAG;AACX,YAAI,aAAaC,gBAAAA,gBAAgB;AAC1B,gBAAA,IAAI,OAAO,WAAW,SAAS;AACrC,gBAAM,QAAQ;AAAA,YACb,MAAM,EAAE;AAAA,YACR,WAAW,EAAE;AAAA,YACb,kBAAkB,EAAE;AAAA,UAAA;AAEd,iBAAA;AAAA,YACN,IAAI;AAAA,YACJ,QAAQ,CAAC,KAAK;AAAA,YACd;AAAA,UAAA;AAAA,QACD,OACM;AACA,gBAAA;AAAA,QACP;AAAA,MACD;AACO,aAAA;AAAA,QACN,IAAI;AAAA,QACJ,QAAQ,CAAC;AAAA,MAAA;AAAA,IAEV,CAAA,CAAC;AAAA,EACH;AAAA,EAEQ,oBAAoB,MAA6C;AACxE,WAAO,KAAK,WAAW,IAAI,CAAC,OAAuB;AAC9C,UAAA,CAAC,GAAG,MAAM;AACb,YAAI,CAAC,GAAG,iBAAiB,CAAC,GAAG,eAAe;AACrC,gBAAA,IAAIC,aAAAA,eAAe,0BAA0B;AAAA,QACpD;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,eAAe,GAAG;AAAA,UAClB,eAAe,GAAG;AAAA,UAClB,SAAS,GAAG;AAAA,UACZ,MAAM,GAAG;AAAA,UACT,eAAgB,GAAG,iBAAoD;AAAA,QAAA;AAAA,MAEzE;AACI,UAAA,GAAG,SAASC,MAAA,cAAc,QAAQ;AACjC,YAAA,CAAC,GAAG,iBAAiB;AAClB,gBAAA,IAAID,aAAAA,eAAe,iDAAiD;AAAA,QAC3E;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,MAAM,GAAG;AAAA,UACT,SAAS,GAAG;AAAA,UACZ,GAAI,GAAG;AAAA,QAAA;AAAA,MAET;AACI,UAAA,GAAG,SAASC,MAAA,cAAc,SAAS;AAClC,YAAA,CAAC,GAAG,kBAAkB;AACnB,gBAAA,IAAID,aAAAA,eAAe,mDAAmD;AAAA,QAC7E;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,MAAM,GAAG;AAAA,UACT,SAAS,GAAG;AAAA,UACZ,SAAS,GAAG,iBAAiB,IAAI,CAAAE,SAAO;AAAA,YACvC,OAAOA,IAAG;AAAA,YACV,OAAOA,IAAG,SAAS;AAAA,YACnB,WAAWA,IAAG,aAAa;AAAA,UAAA,EAC1B;AAAA,QAAA;AAAA,MAEJ;AACO,aAAAC,YAAA,YAAY,GAAG,IAAI;AAAA,IAAA,CAC1B;AAAA,EACF;AACD;;"}
+{"version":3,"file":"MigrateMutationResolver.cjs","sources":["../../../../../../packages/engine-system-api/src/resolvers/mutation/MigrateMutationResolver.ts"],"sourcesContent":["import { GraphQLResolveInfo } from 'graphql'\nimport { SystemResolverContext } from '../SystemResolverContext'\nimport { MutationResolver } from '../Resolver'\nimport { MigrateResponse, MigrationType, MutationMigrateArgs } from '../../schema'\nimport { Migration } from '@contember/schema-migrations'\nimport { AuthorizationActions, MigrationError, ProjectMigrator, StagesQuery } from '../../model'\nimport { MigrationInput } from '../../model/migrations/MigrationInput'\nimport { UserInputError } from '@contember/graphql-utils'\nimport { SchemaValidatorSkippedErrors } from '@contember/schema-utils'\nimport { assertNever } from '../../utils'\n\nconst pg_lock_id = 1597474138739147\n\nexport class MigrateMutationResolver implements MutationResolver<'migrate'> {\n\tconstructor(private readonly projectMigrator: ProjectMigrator) {}\n\n\tasync migrateForce(\n\t\tparent: any,\n\t\targs: MutationMigrateArgs,\n\t\tcontext: SystemResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t): Promise<MigrateResponse> {\n\t\treturn this.migrate(parent, args, context, info, true)\n\t}\n\n\tasync migrate(\n\t\tparent: any,\n\t\targs: MutationMigrateArgs,\n\t\tcontext: SystemResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t\tforce = false,\n\t): Promise<MigrateResponse> {\n\t\tconst migrations = this.parseMigrationInput(args)\n\n\t\treturn context.db.locked(pg_lock_id, db => db.transaction(async trx => {\n\t\t\tconst stages = await trx.queryHandler.fetch(new StagesQuery())\n\t\t\tfor (const stage of stages) {\n\t\t\t\tawait context.requireAccess(AuthorizationActions.PROJECT_MIGRATE, stage.slug)\n\t\t\t}\n\t\t\ttry {\n\t\t\t\tawait this.projectMigrator.migrate({\n\t\t\t\t\tdb: trx,\n\t\t\t\t\tproject: context.project,\n\t\t\t\t\tidentity: context.identity,\n\t\t\t\t\tstages,\n\t\t\t\t\tmigrationsToExecute: migrations,\n\t\t\t\t\toptions: {\n\t\t\t\t\t\tignoreOrder: force,\n\t\t\t\t\t\tskipExecuted: true,\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t} catch (e) {\n\t\t\t\tif (e instanceof MigrationError) {\n\t\t\t\t\tawait trx.client.connection.rollback()\n\t\t\t\t\tconst error = {\n\t\t\t\t\t\tcode: e.code,\n\t\t\t\t\t\tmigration: e.version,\n\t\t\t\t\t\tdeveloperMessage: e.message,\n\t\t\t\t\t}\n\t\t\t\t\treturn {\n\t\t\t\t\t\tok: false,\n\t\t\t\t\t\terrors: [error],\n\t\t\t\t\t\terror,\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tthrow e\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn {\n\t\t\t\tok: true,\n\t\t\t\terrors: [],\n\t\t\t}\n\t\t}))\n\t}\n\n\tprivate parseMigrationInput(args: MutationMigrateArgs): MigrationInput[] {\n\t\treturn args.migrations.map((it): MigrationInput => {\n\t\t\tif (!it.type) {\n\t\t\t\tif (!it.modifications || !it.formatVersion) {\n\t\t\t\t\tthrow new UserInputError('invalid migration format')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'schema',\n\t\t\t\t\tformatVersion: it.formatVersion,\n\t\t\t\t\tmodifications: it.modifications as Migration.Modification[],\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tskippedErrors: (it.skippedErrors as SchemaValidatorSkippedErrors[]) ?? undefined,\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (it.type === MigrationType.Schema) {\n\t\t\t\tif (!it.schemaMigration) {\n\t\t\t\t\tthrow new UserInputError('schemaMigration must be defined for SCHEMA type')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'schema',\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\t...(it.schemaMigration as Omit<Migration, 'name' | 'version'>),\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (it.type === MigrationType.Content) {\n\t\t\t\tif (!it.contentMigration) {\n\t\t\t\t\tthrow new UserInputError('contentMigration must be defined for CONTENT type')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'content',\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\tqueries: it.contentMigration.map(it => ({\n\t\t\t\t\t\tquery: it.query,\n\t\t\t\t\t\tstage: it.stage ?? undefined,\n\t\t\t\t\t\tvariables: it.variables ?? undefined,\n\t\t\t\t\t})),\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn assertNever(it.type)\n\t\t})\n\t}\n}\n"],"names":["StagesQuery","AuthorizationActions","MigrationError","UserInputError","MigrationType","it","assertNever"],"mappings":";;;;;;;;;;;;;;;;AAWA,MAAM,aAAa;AAEZ,MAAM,wBAA+D;AAAA,EAC3E,YAA6B,iBAAkC;AAAlC,SAAA,kBAAA;AAAA,EAAmC;AAAA,EAEhE,MAAM,aACL,QACA,MACA,SACA,MAC2B;AAC3B,WAAO,KAAK,QAAQ,QAAQ,MAAM,SAAS,MAAM,IAAI;AAAA,EACtD;AAAA,EAEA,MAAM,QACL,QACA,MACA,SACA,MACA,QAAQ,OACmB;AACrB,UAAA,aAAa,KAAK,oBAAoB,IAAI;AAEzC,WAAA,QAAQ,GAAG,OAAO,YAAY,QAAM,GAAG,YAAY,OAAM,QAAO;AACtE,YAAM,SAAS,MAAM,IAAI,aAAa,MAAM,IAAIA,yBAAa;AAC7D,iBAAW,SAAS,QAAQ;AAC3B,cAAM,QAAQ,cAAcC,qBAAAA,qBAAqB,iBAAiB,MAAM,IAAI;AAAA,MAC7E;AACI,UAAA;AACG,cAAA,KAAK,gBAAgB,QAAQ;AAAA,UAClC,IAAI;AAAA,UACJ,SAAS,QAAQ;AAAA,UACjB,UAAU,QAAQ;AAAA,UAClB;AAAA,UACA,qBAAqB;AAAA,UACrB,SAAS;AAAA,YACR,aAAa;AAAA,YACb,cAAc;AAAA,UACf;AAAA,QAAA,CACA;AAAA,eACO,GAAG;AACX,YAAI,aAAaC,gBAAAA,gBAAgB;AAC1B,gBAAA,IAAI,OAAO,WAAW,SAAS;AACrC,gBAAM,QAAQ;AAAA,YACb,MAAM,EAAE;AAAA,YACR,WAAW,EAAE;AAAA,YACb,kBAAkB,EAAE;AAAA,UAAA;AAEd,iBAAA;AAAA,YACN,IAAI;AAAA,YACJ,QAAQ,CAAC,KAAK;AAAA,YACd;AAAA,UAAA;AAAA,QACD,OACM;AACA,gBAAA;AAAA,QACP;AAAA,MACD;AACO,aAAA;AAAA,QACN,IAAI;AAAA,QACJ,QAAQ,CAAC;AAAA,MAAA;AAAA,IAEV,CAAA,CAAC;AAAA,EACH;AAAA,EAEQ,oBAAoB,MAA6C;AACxE,WAAO,KAAK,WAAW,IAAI,CAAC,OAAuB;AAC9C,UAAA,CAAC,GAAG,MAAM;AACb,YAAI,CAAC,GAAG,iBAAiB,CAAC,GAAG,eAAe;AACrC,gBAAA,IAAIC,aAAAA,eAAe,0BAA0B;AAAA,QACpD;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,eAAe,GAAG;AAAA,UAClB,eAAe,GAAG;AAAA,UAClB,SAAS,GAAG;AAAA,UACZ,MAAM,GAAG;AAAA,UACT,eAAgB,GAAG,iBAAoD;AAAA,QAAA;AAAA,MAEzE;AACI,UAAA,GAAG,SAASC,MAAA,cAAc,QAAQ;AACjC,YAAA,CAAC,GAAG,iBAAiB;AAClB,gBAAA,IAAID,aAAAA,eAAe,iDAAiD;AAAA,QAC3E;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,MAAM,GAAG;AAAA,UACT,SAAS,GAAG;AAAA,UACZ,GAAI,GAAG;AAAA,QAAA;AAAA,MAET;AACI,UAAA,GAAG,SAASC,MAAA,cAAc,SAAS;AAClC,YAAA,CAAC,GAAG,kBAAkB;AACnB,gBAAA,IAAID,aAAAA,eAAe,mDAAmD;AAAA,QAC7E;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,MAAM,GAAG;AAAA,UACT,SAAS,GAAG;AAAA,UACZ,SAAS,GAAG,iBAAiB,IAAI,CAAAE,SAAO;AAAA,YACvC,OAAOA,IAAG;AAAA,YACV,OAAOA,IAAG,SAAS;AAAA,YACnB,WAAWA,IAAG,aAAa;AAAA,UAAA,EAC1B;AAAA,QAAA;AAAA,MAEJ;AACO,aAAAC,YAAA,YAAY,GAAG,IAAI;AAAA,IAAA,CAC1B;AAAA,EACF;AACD;;"}

package/dist/production/src/resolvers/mutation/MigrateMutationResolver.js

@@ -10,7 +10,6 @@ import "@contember/schema-utils";
 import { assertNever } from "../../utils/assertNever.js";
 import { StagesQuery } from "../../model/queries/stages/StagesQuery.js";
 import { MigrationError } from "../../model/migrations/ProjectMigrator.js";
-import "../../model/migrations/SchemaVersionBuilder.js";
 import "@contember/logger";
 import { UserInputError } from "@contember/graphql-utils";
 const pg_lock_id = 1597474138739147;

package/dist/production/src/resolvers/mutation/MigrateMutationResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"MigrateMutationResolver.js","sources":["../../../../../../packages/engine-system-api/src/resolvers/mutation/MigrateMutationResolver.ts"],"sourcesContent":["import { GraphQLResolveInfo } from 'graphql'\nimport { SystemResolverContext } from '../SystemResolverContext'\nimport { MutationResolver } from '../Resolver'\nimport { MigrateResponse, MigrationType, MutationMigrateArgs } from '../../schema'\nimport { Migration } from '@contember/schema-migrations'\nimport { AuthorizationActions, MigrationError, ProjectMigrator, StagesQuery } from '../../model'\nimport { MigrationInput } from '../../model/migrations/MigrationInput'\nimport { UserInputError } from '@contember/graphql-utils'\nimport { SchemaValidatorSkippedErrors } from '@contember/schema-utils'\nimport { assertNever } from '../../utils'\n\nconst pg_lock_id = 1597474138739147\n\nexport class MigrateMutationResolver implements MutationResolver<'migrate'> {\n\tconstructor(private readonly projectMigrator: ProjectMigrator) {}\n\n\tasync migrateForce(\n\t\tparent: any,\n\t\targs: MutationMigrateArgs,\n\t\tcontext: SystemResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t): Promise<MigrateResponse> {\n\t\treturn this.migrate(parent, args, context, info, true)\n\t}\n\n\tasync migrate(\n\t\tparent: any,\n\t\targs: MutationMigrateArgs,\n\t\tcontext: SystemResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t\tforce = false,\n\t): Promise<MigrateResponse> {\n\t\tconst migrations = this.parseMigrationInput(args)\n\n\t\treturn context.db.locked(pg_lock_id, db => db.transaction(async trx => {\n\t\t\tconst stages = await trx.queryHandler.fetch(new StagesQuery())\n\t\t\tfor (const stage of stages) {\n\t\t\t\tawait context.requireAccess(AuthorizationActions.PROJECT_MIGRATE, stage.slug)\n\t\t\t}\n\t\t\ttry {\n\t\t\t\tawait this.projectMigrator.migrate({\n\t\t\t\t\tdb: trx,\n\t\t\t\t\tproject: context.project,\n\t\t\t\t\tidentity: context.identity,\n\t\t\t\t\tstages,\n\t\t\t\t\tmigrationsToExecute: migrations,\n\t\t\t\t\toptions: {\n\t\t\t\t\t\tignoreOrder: force,\n\t\t\t\t\t\tskipExecuted: true,\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t} catch (e) {\n\t\t\t\tif (e instanceof MigrationError) {\n\t\t\t\t\tawait trx.client.connection.rollback()\n\t\t\t\t\tconst error = {\n\t\t\t\t\t\tcode: e.code,\n\t\t\t\t\t\tmigration: e.version,\n\t\t\t\t\t\tdeveloperMessage: e.message,\n\t\t\t\t\t}\n\t\t\t\t\treturn {\n\t\t\t\t\t\tok: false,\n\t\t\t\t\t\terrors: [error],\n\t\t\t\t\t\terror,\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tthrow e\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn {\n\t\t\t\tok: true,\n\t\t\t\terrors: [],\n\t\t\t}\n\t\t}))\n\t}\n\n\tprivate parseMigrationInput(args: MutationMigrateArgs): MigrationInput[] {\n\t\treturn args.migrations.map((it): MigrationInput => {\n\t\t\tif (!it.type) {\n\t\t\t\tif (!it.modifications || !it.formatVersion) {\n\t\t\t\t\tthrow new UserInputError('invalid migration format')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'schema',\n\t\t\t\t\tformatVersion: it.formatVersion,\n\t\t\t\t\tmodifications: it.modifications as Migration.Modification[],\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tskippedErrors: (it.skippedErrors as SchemaValidatorSkippedErrors[]) ?? undefined,\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (it.type === MigrationType.Schema) {\n\t\t\t\tif (!it.schemaMigration) {\n\t\t\t\t\tthrow new UserInputError('schemaMigration must be defined for SCHEMA type')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'schema',\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\t...(it.schemaMigration as Omit<Migration, 'name' | 'version'>),\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (it.type === MigrationType.Content) {\n\t\t\t\tif (!it.contentMigration) {\n\t\t\t\t\tthrow new UserInputError('contentMigration must be defined for CONTENT type')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'content',\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\tqueries: it.contentMigration.map(it => ({\n\t\t\t\t\t\tquery: it.query,\n\t\t\t\t\t\tstage: it.stage ?? undefined,\n\t\t\t\t\t\tvariables: it.variables ?? undefined,\n\t\t\t\t\t})),\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn assertNever(it.type)\n\t\t})\n\t}\n}\n"],"names":["it"],"mappings":";;;;;;;;;;;;;;;AAWA,MAAM,aAAa;AAEZ,MAAM,wBAA+D;AAAA,EAC3E,YAA6B,iBAAkC;AAAlC,SAAA,kBAAA;AAAA,EAAmC;AAAA,EAEhE,MAAM,aACL,QACA,MACA,SACA,MAC2B;AAC3B,WAAO,KAAK,QAAQ,QAAQ,MAAM,SAAS,MAAM,IAAI;AAAA,EACtD;AAAA,EAEA,MAAM,QACL,QACA,MACA,SACA,MACA,QAAQ,OACmB;AACrB,UAAA,aAAa,KAAK,oBAAoB,IAAI;AAEzC,WAAA,QAAQ,GAAG,OAAO,YAAY,QAAM,GAAG,YAAY,OAAM,QAAO;AACtE,YAAM,SAAS,MAAM,IAAI,aAAa,MAAM,IAAI,aAAa;AAC7D,iBAAW,SAAS,QAAQ;AAC3B,cAAM,QAAQ,cAAc,qBAAqB,iBAAiB,MAAM,IAAI;AAAA,MAC7E;AACI,UAAA;AACG,cAAA,KAAK,gBAAgB,QAAQ;AAAA,UAClC,IAAI;AAAA,UACJ,SAAS,QAAQ;AAAA,UACjB,UAAU,QAAQ;AAAA,UAClB;AAAA,UACA,qBAAqB;AAAA,UACrB,SAAS;AAAA,YACR,aAAa;AAAA,YACb,cAAc;AAAA,UACf;AAAA,QAAA,CACA;AAAA,eACO,GAAG;AACX,YAAI,aAAa,gBAAgB;AAC1B,gBAAA,IAAI,OAAO,WAAW,SAAS;AACrC,gBAAM,QAAQ;AAAA,YACb,MAAM,EAAE;AAAA,YACR,WAAW,EAAE;AAAA,YACb,kBAAkB,EAAE;AAAA,UAAA;AAEd,iBAAA;AAAA,YACN,IAAI;AAAA,YACJ,QAAQ,CAAC,KAAK;AAAA,YACd;AAAA,UAAA;AAAA,QACD,OACM;AACA,gBAAA;AAAA,QACP;AAAA,MACD;AACO,aAAA;AAAA,QACN,IAAI;AAAA,QACJ,QAAQ,CAAC;AAAA,MAAA;AAAA,IAEV,CAAA,CAAC;AAAA,EACH;AAAA,EAEQ,oBAAoB,MAA6C;AACxE,WAAO,KAAK,WAAW,IAAI,CAAC,OAAuB;AAC9C,UAAA,CAAC,GAAG,MAAM;AACb,YAAI,CAAC,GAAG,iBAAiB,CAAC,GAAG,eAAe;AACrC,gBAAA,IAAI,eAAe,0BAA0B;AAAA,QACpD;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,eAAe,GAAG;AAAA,UAClB,eAAe,GAAG;AAAA,UAClB,SAAS,GAAG;AAAA,UACZ,MAAM,GAAG;AAAA,UACT,eAAgB,GAAG,iBAAoD;AAAA,QAAA;AAAA,MAEzE;AACI,UAAA,GAAG,SAAS,cAAc,QAAQ;AACjC,YAAA,CAAC,GAAG,iBAAiB;AAClB,gBAAA,IAAI,eAAe,iDAAiD;AAAA,QAC3E;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,MAAM,GAAG;AAAA,UACT,SAAS,GAAG;AAAA,UACZ,GAAI,GAAG;AAAA,QAAA;AAAA,MAET;AACI,UAAA,GAAG,SAAS,cAAc,SAAS;AAClC,YAAA,CAAC,GAAG,kBAAkB;AACnB,gBAAA,IAAI,eAAe,mDAAmD;AAAA,QAC7E;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,MAAM,GAAG;AAAA,UACT,SAAS,GAAG;AAAA,UACZ,SAAS,GAAG,iBAAiB,IAAI,CAAAA,SAAO;AAAA,YACvC,OAAOA,IAAG;AAAA,YACV,OAAOA,IAAG,SAAS;AAAA,YACnB,WAAWA,IAAG,aAAa;AAAA,UAAA,EAC1B;AAAA,QAAA;AAAA,MAEJ;AACO,aAAA,YAAY,GAAG,IAAI;AAAA,IAAA,CAC1B;AAAA,EACF;AACD;"}
+{"version":3,"file":"MigrateMutationResolver.js","sources":["../../../../../../packages/engine-system-api/src/resolvers/mutation/MigrateMutationResolver.ts"],"sourcesContent":["import { GraphQLResolveInfo } from 'graphql'\nimport { SystemResolverContext } from '../SystemResolverContext'\nimport { MutationResolver } from '../Resolver'\nimport { MigrateResponse, MigrationType, MutationMigrateArgs } from '../../schema'\nimport { Migration } from '@contember/schema-migrations'\nimport { AuthorizationActions, MigrationError, ProjectMigrator, StagesQuery } from '../../model'\nimport { MigrationInput } from '../../model/migrations/MigrationInput'\nimport { UserInputError } from '@contember/graphql-utils'\nimport { SchemaValidatorSkippedErrors } from '@contember/schema-utils'\nimport { assertNever } from '../../utils'\n\nconst pg_lock_id = 1597474138739147\n\nexport class MigrateMutationResolver implements MutationResolver<'migrate'> {\n\tconstructor(private readonly projectMigrator: ProjectMigrator) {}\n\n\tasync migrateForce(\n\t\tparent: any,\n\t\targs: MutationMigrateArgs,\n\t\tcontext: SystemResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t): Promise<MigrateResponse> {\n\t\treturn this.migrate(parent, args, context, info, true)\n\t}\n\n\tasync migrate(\n\t\tparent: any,\n\t\targs: MutationMigrateArgs,\n\t\tcontext: SystemResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t\tforce = false,\n\t): Promise<MigrateResponse> {\n\t\tconst migrations = this.parseMigrationInput(args)\n\n\t\treturn context.db.locked(pg_lock_id, db => db.transaction(async trx => {\n\t\t\tconst stages = await trx.queryHandler.fetch(new StagesQuery())\n\t\t\tfor (const stage of stages) {\n\t\t\t\tawait context.requireAccess(AuthorizationActions.PROJECT_MIGRATE, stage.slug)\n\t\t\t}\n\t\t\ttry {\n\t\t\t\tawait this.projectMigrator.migrate({\n\t\t\t\t\tdb: trx,\n\t\t\t\t\tproject: context.project,\n\t\t\t\t\tidentity: context.identity,\n\t\t\t\t\tstages,\n\t\t\t\t\tmigrationsToExecute: migrations,\n\t\t\t\t\toptions: {\n\t\t\t\t\t\tignoreOrder: force,\n\t\t\t\t\t\tskipExecuted: true,\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t} catch (e) {\n\t\t\t\tif (e instanceof MigrationError) {\n\t\t\t\t\tawait trx.client.connection.rollback()\n\t\t\t\t\tconst error = {\n\t\t\t\t\t\tcode: e.code,\n\t\t\t\t\t\tmigration: e.version,\n\t\t\t\t\t\tdeveloperMessage: e.message,\n\t\t\t\t\t}\n\t\t\t\t\treturn {\n\t\t\t\t\t\tok: false,\n\t\t\t\t\t\terrors: [error],\n\t\t\t\t\t\terror,\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tthrow e\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn {\n\t\t\t\tok: true,\n\t\t\t\terrors: [],\n\t\t\t}\n\t\t}))\n\t}\n\n\tprivate parseMigrationInput(args: MutationMigrateArgs): MigrationInput[] {\n\t\treturn args.migrations.map((it): MigrationInput => {\n\t\t\tif (!it.type) {\n\t\t\t\tif (!it.modifications || !it.formatVersion) {\n\t\t\t\t\tthrow new UserInputError('invalid migration format')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'schema',\n\t\t\t\t\tformatVersion: it.formatVersion,\n\t\t\t\t\tmodifications: it.modifications as Migration.Modification[],\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tskippedErrors: (it.skippedErrors as SchemaValidatorSkippedErrors[]) ?? undefined,\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (it.type === MigrationType.Schema) {\n\t\t\t\tif (!it.schemaMigration) {\n\t\t\t\t\tthrow new UserInputError('schemaMigration must be defined for SCHEMA type')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'schema',\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\t...(it.schemaMigration as Omit<Migration, 'name' | 'version'>),\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (it.type === MigrationType.Content) {\n\t\t\t\tif (!it.contentMigration) {\n\t\t\t\t\tthrow new UserInputError('contentMigration must be defined for CONTENT type')\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\ttype: 'content',\n\t\t\t\t\tname: it.name,\n\t\t\t\t\tversion: it.version,\n\t\t\t\t\tqueries: it.contentMigration.map(it => ({\n\t\t\t\t\t\tquery: it.query,\n\t\t\t\t\t\tstage: it.stage ?? undefined,\n\t\t\t\t\t\tvariables: it.variables ?? undefined,\n\t\t\t\t\t})),\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn assertNever(it.type)\n\t\t})\n\t}\n}\n"],"names":["it"],"mappings":";;;;;;;;;;;;;;AAWA,MAAM,aAAa;AAEZ,MAAM,wBAA+D;AAAA,EAC3E,YAA6B,iBAAkC;AAAlC,SAAA,kBAAA;AAAA,EAAmC;AAAA,EAEhE,MAAM,aACL,QACA,MACA,SACA,MAC2B;AAC3B,WAAO,KAAK,QAAQ,QAAQ,MAAM,SAAS,MAAM,IAAI;AAAA,EACtD;AAAA,EAEA,MAAM,QACL,QACA,MACA,SACA,MACA,QAAQ,OACmB;AACrB,UAAA,aAAa,KAAK,oBAAoB,IAAI;AAEzC,WAAA,QAAQ,GAAG,OAAO,YAAY,QAAM,GAAG,YAAY,OAAM,QAAO;AACtE,YAAM,SAAS,MAAM,IAAI,aAAa,MAAM,IAAI,aAAa;AAC7D,iBAAW,SAAS,QAAQ;AAC3B,cAAM,QAAQ,cAAc,qBAAqB,iBAAiB,MAAM,IAAI;AAAA,MAC7E;AACI,UAAA;AACG,cAAA,KAAK,gBAAgB,QAAQ;AAAA,UAClC,IAAI;AAAA,UACJ,SAAS,QAAQ;AAAA,UACjB,UAAU,QAAQ;AAAA,UAClB;AAAA,UACA,qBAAqB;AAAA,UACrB,SAAS;AAAA,YACR,aAAa;AAAA,YACb,cAAc;AAAA,UACf;AAAA,QAAA,CACA;AAAA,eACO,GAAG;AACX,YAAI,aAAa,gBAAgB;AAC1B,gBAAA,IAAI,OAAO,WAAW,SAAS;AACrC,gBAAM,QAAQ;AAAA,YACb,MAAM,EAAE;AAAA,YACR,WAAW,EAAE;AAAA,YACb,kBAAkB,EAAE;AAAA,UAAA;AAEd,iBAAA;AAAA,YACN,IAAI;AAAA,YACJ,QAAQ,CAAC,KAAK;AAAA,YACd;AAAA,UAAA;AAAA,QACD,OACM;AACA,gBAAA;AAAA,QACP;AAAA,MACD;AACO,aAAA;AAAA,QACN,IAAI;AAAA,QACJ,QAAQ,CAAC;AAAA,MAAA;AAAA,IAEV,CAAA,CAAC;AAAA,EACH;AAAA,EAEQ,oBAAoB,MAA6C;AACxE,WAAO,KAAK,WAAW,IAAI,CAAC,OAAuB;AAC9C,UAAA,CAAC,GAAG,MAAM;AACb,YAAI,CAAC,GAAG,iBAAiB,CAAC,GAAG,eAAe;AACrC,gBAAA,IAAI,eAAe,0BAA0B;AAAA,QACpD;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,eAAe,GAAG;AAAA,UAClB,eAAe,GAAG;AAAA,UAClB,SAAS,GAAG;AAAA,UACZ,MAAM,GAAG;AAAA,UACT,eAAgB,GAAG,iBAAoD;AAAA,QAAA;AAAA,MAEzE;AACI,UAAA,GAAG,SAAS,cAAc,QAAQ;AACjC,YAAA,CAAC,GAAG,iBAAiB;AAClB,gBAAA,IAAI,eAAe,iDAAiD;AAAA,QAC3E;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,MAAM,GAAG;AAAA,UACT,SAAS,GAAG;AAAA,UACZ,GAAI,GAAG;AAAA,QAAA;AAAA,MAET;AACI,UAAA,GAAG,SAAS,cAAc,SAAS;AAClC,YAAA,CAAC,GAAG,kBAAkB;AACnB,gBAAA,IAAI,eAAe,mDAAmD;AAAA,QAC7E;AACO,eAAA;AAAA,UACN,MAAM;AAAA,UACN,MAAM,GAAG;AAAA,UACT,SAAS,GAAG;AAAA,UACZ,SAAS,GAAG,iBAAiB,IAAI,CAAAA,SAAO;AAAA,YACvC,OAAOA,IAAG;AAAA,YACV,OAAOA,IAAG,SAAS;AAAA,YACnB,WAAWA,IAAG,aAAa;AAAA,UAAA,EAC1B;AAAA,QAAA;AAAA,MAEJ;AACO,aAAA,YAAY,GAAG,IAAI;AAAA,IAAA,CAC1B;AAAA,EACF;AACD;"}

package/dist/production/src/resolvers/mutation/MigrationAlterMutationResolver.cjs

@@ -11,7 +11,6 @@ require("@contember/schema-migrations");
 require("@contember/schema-utils");
 const MigrationAlterer = require("../../model/migrations/MigrationAlterer.cjs");
 require("@contember/logger");
-require("../../model/migrations/SchemaVersionBuilder.cjs");
 class MigrationAlterMutationResolver {
   constructor(migrationAlterer) {
     this.migrationAlterer = migrationAlterer;