@contember/engine-system-api 2.0.0-alpha.9 → 2.0.0-beta.1

package/tests/cases/migrations/2023-09-11-174000-fix-on-delete.test.ts

@@ -1,6 +1,6 @@
 import migration from '../../../src/migrations/2023-09-11-174000-fix-on-delete'
 import { createMigrationBuilder } from '@contember/database-migrations'
-import { assert, test } from 'vitest'
+import { expect, test } from 'bun:test'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { emptySchema } from '@contember/schema-utils'
 import { Model } from '@contember/schema'
@@ -30,12 +30,23 @@ test('table-on-delete test', async () => {
 				deferred: false,
 			}],
 		})),
-		schemaResolver: () => Promise.resolve(({ ...emptySchema, model: new SchemaBuilder()
-			.entity('Post', entity =>
-				entity.manyHasOne('author', relation => relation.target('Author').onDelete(Model.OnDelete.setNull)),
-			)
-			.entity('Author', entity => entity)
-			.buildSchema() })),
+		schemaResolver: () => Promise.resolve(({
+			schema: {
+				...emptySchema,
+				model: new SchemaBuilder()
+					.entity('Post', entity =>
+						entity.manyHasOne('author', relation => relation.target('Author').onDelete(Model.OnDelete.setNull)),
+					)
+					.entity('Author', entity => entity)
+					.buildSchema(),
+			},
+			meta: {
+				id: 1,
+				version: '2024-06-28-153001',
+				checksum: '_checksum_',
+				updatedAt: new Date(),
+			},
+		})),
 		project: {
 			slug: 'test',
 			systemSchema: 'system',
@@ -47,8 +58,8 @@ test('table-on-delete test', async () => {
 			],
 		},
 	})
-	assert.equal(
-		builder.getSql(),
+	expect(
+		builder.getSql()).toEqual(
 		`ALTER TABLE "stage_live"."post" DROP CONSTRAINT "fk_post_author_id_author_id";
 ALTER TABLE "stage_live"."post"
 					ADD FOREIGN KEY ("author_id") 
@@ -82,12 +93,21 @@ test('table-on-delete test valid', async () => {
 			}],
 		})),
 		schemaResolver: () => Promise.resolve(({
-			...emptySchema, model: new SchemaBuilder()
-				.entity('Post', entity =>
-					entity.manyHasOne('author', relation => relation.target('Author').onDelete(Model.OnDelete.setNull)),
-				)
-				.entity('Author', entity => entity)
-				.buildSchema(),
+			schema: {
+				...emptySchema,
+				model: new SchemaBuilder()
+					.entity('Post', entity =>
+						entity.manyHasOne('author', relation => relation.target('Author').onDelete(Model.OnDelete.setNull)),
+					)
+					.entity('Author', entity => entity)
+					.buildSchema(),
+			},
+			meta: {
+				id: 1,
+				version: '2024-06-28-153001',
+				checksum: '_checksum_',
+				updatedAt: new Date(),
+			},
 		})),
 		project: {
 			slug: 'test',
@@ -100,8 +120,9 @@ test('table-on-delete test valid', async () => {
 			],
 		},
 	})
-	assert.equal(
+	expect(
 		builder.getSql(),
+	).toEqual(
 		`\n`,
 	)
 })

package/tests/cases/migrations/2023-10-19-173000-fix-unique.test.ts

@@ -1,6 +1,6 @@
 import migration from '../../../src/migrations/2023-10-19-173000-fix-unique'
 import { createMigrationBuilder } from '@contember/database-migrations'
-import { assert, test } from 'vitest'
+import { expect, test } from 'bun:test'
 import { c, createSchema } from '@contember/schema-definition'
 import { createConnectionMock } from '@contember/database-tester'
 import { createDatabaseMetadata } from '@contember/database'
@@ -45,7 +45,15 @@ test('unique fix test', async () => {
 
 			],
 		})),
-		schemaResolver: () => Promise.resolve(createSchema(UniqueModel)),
+		schemaResolver: () => Promise.resolve({
+			schema: createSchema(UniqueModel),
+			meta: {
+				id: 1,
+				version: '2024-06-28-153001',
+				checksum: '_checksum_',
+				updatedAt: new Date(),
+			},
+		}),
 		project: {
 			slug: 'test',
 			stages: [
@@ -57,8 +65,9 @@ test('unique fix test', async () => {
 			systemSchema: 'system',
 		},
 	})
-	assert.equal(
+	expect(
 		builder.getSql(),
+	).toEqual(
 		`ALTER TABLE "stage_live"."foo" DROP CONSTRAINT "invalid1";
 ALTER TABLE "stage_live"."foo" DROP CONSTRAINT "invalid2";
 `,

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

@@ -0,0 +1,39 @@
+import { expect, test } from 'bun:test'
+import { EventsQuery } from '../../../src/model'
+import { testUuid } from '../../src/uuid'
+import { EventsOrder } from '../../../src/schema'
+
+test('events query', async () => {
+	const query = new EventsQuery({
+		rows: [
+			{ tableName: 'table1', primaryKey: [testUuid(1)] },
+			{ tableName: 'table2', primaryKey: [testUuid(2), testUuid(3)] },
+			{ tableName: 'table3', primaryKey: [null, testUuid(3)] },
+		],
+	}, EventsOrder.CreatedAtAsc, 0, 10)
+
+	let called = false
+	await query.fetch({
+		db: {
+			schema: 'public',
+			query: async (sql: string, params: any) => {
+				called = true
+				expect(sql).toEqual(`select "id", "type", "table_name", "row_ids", "values", "created_at", "applied_at", "identity_id", "event_data"."transaction_id"  from "public"."event_data" inner join  "public"."stage_transaction" on  "event_data"."transaction_id" = "stage_transaction"."transaction_id"  where ("table_name" = ? and "row_ids"->0 = ?::jsonb or "table_name" = ? and "row_ids"->0 = ?::jsonb and "row_ids"->1 = ?::jsonb or "table_name" = ? and "row_ids"->1 = ?::jsonb)  order by "created_at" asc  limit 10 offset 0`)
+				expect(params).toEqual(
+					[
+					  'table1',
+					  '"123e4567-e89b-12d3-a456-000000000001"',
+					  'table2',
+					  '"123e4567-e89b-12d3-a456-000000000002"',
+					  '"123e4567-e89b-12d3-a456-000000000003"',
+					  'table3',
+					  '"123e4567-e89b-12d3-a456-000000000003"',
+					],
+				)
+
+				return { rows: [] }
+			},
+		},
+	} as any)
+	expect(called).toBe(true)
+})

package/tests/src/uuid.ts

@@ -0,0 +1,4 @@
+export const testUuidPrefix = '123e4567-e89b-12d3-'
+export const testUuid = (number: number, prefix = 'a456') => {
+	return testUuidPrefix + prefix + '-' + number.toString().padStart(12, '0')
+}

package/dist/development/src/model/migrations/SchemaVersionBuilder.cjs

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const schemaUtils = require("@contember/schema-utils");
-const emptyVersionedSchema = { ...schemaUtils.normalizeSchema(schemaUtils.emptySchema), version: "", id: -1, notNormalized: { ...schemaUtils.emptySchema, version: "", id: -1 } };
-class SchemaVersionBuilder {
-  constructor(executedMigrationsResolver, schemaMigrator) {
-    this.executedMigrationsResolver = executedMigrationsResolver;
-    this.schemaMigrator = schemaMigrator;
-  }
-  async buildSchema(db, after) {
-    const newMigrations = await this.executedMigrationsResolver.getMigrations(db, after?.version);
-    if (newMigrations.length === 0) {
-      return after ?? emptyVersionedSchema;
-    }
-    const schema = newMigrations.reduce(
-      (schema2, migration) => {
-        if (migration.type !== "schema") {
-          return schema2;
-        }
-        return {
-          ...this.schemaMigrator.applyModifications(schema2, migration.modifications, migration.formatVersion),
-          version: migration.version,
-          id: migration.id
-        };
-      },
-      after?.notNormalized ?? emptyVersionedSchema.notNormalized
-    );
-    const normalized = schemaUtils.normalizeSchema(schema);
-    return {
-      ...normalized,
-      notNormalized: schema
-    };
-  }
-}
-exports.SchemaVersionBuilder = SchemaVersionBuilder;
-exports.emptyVersionedSchema = emptyVersionedSchema;
-//# sourceMappingURL=SchemaVersionBuilder.cjs.map

package/dist/development/src/model/migrations/SchemaVersionBuilder.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"SchemaVersionBuilder.cjs","sources":["../../../../../../packages/engine-system-api/src/model/migrations/SchemaVersionBuilder.ts"],"sourcesContent":["import { Schema } from '@contember/schema'\nimport { SchemaMigrator } from '@contember/schema-migrations'\nimport { emptySchema } from '@contember/schema-utils'\nimport { ExecutedMigrationsResolver } from './ExecutedMigrationsResolver'\nimport { DatabaseContext } from '../database'\nimport { normalizeSchema } from '@contember/schema-utils'\n\nexport type VersionedSchema = Schema & { version: string; id: number; notNormalized: Schema & { version: string; id: number } }\n\nexport const emptyVersionedSchema = { ...normalizeSchema(emptySchema), version: '', id: -1, notNormalized: { ...emptySchema, version: '', id: -1 } }\n\nexport class SchemaVersionBuilder {\n\tconstructor(\n\t\tprivate readonly executedMigrationsResolver: ExecutedMigrationsResolver,\n\t\tprivate readonly schemaMigrator: SchemaMigrator,\n\t) {}\n\n\tasync buildSchema(db: DatabaseContext, after?: VersionedSchema): Promise<VersionedSchema> {\n\t\tconst newMigrations = (await this.executedMigrationsResolver.getMigrations(db, after?.version))\n\t\tif (newMigrations.length === 0) {\n\t\t\treturn after ?? emptyVersionedSchema\n\t\t}\n\n\t\tconst schema = newMigrations.reduce(\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\t...this.schemaMigrator.applyModifications(schema, migration.modifications, migration.formatVersion),\n\t\t\t\t\tversion: migration.version,\n\t\t\t\t\tid: migration.id,\n\t\t\t\t})\n\t\t\t},\n\t\t\tafter?.notNormalized ?? emptyVersionedSchema.notNormalized,\n\t\t)\n\t\tconst normalized = normalizeSchema(schema)\n\t\treturn {\n\t\t\t...normalized,\n\t\t\tnotNormalized: schema,\n\t\t}\n\t}\n}\n"],"names":["normalizeSchema","emptySchema","schema"],"mappings":";;;AASO,MAAM,uBAAuB,EAAE,GAAGA,4BAAgBC,YAAAA,WAAW,GAAG,SAAS,IAAI,IAAI,IAAI,eAAe,EAAE,GAAGA,yBAAa,SAAS,IAAI,IAAI,KAAK;AAE5I,MAAM,qBAAqB;AAAA,EACjC,YACkB,4BACA,gBAChB;AAFgB,SAAA,6BAAA;AACA,SAAA,iBAAA;AAAA,EACf;AAAA,EAEH,MAAM,YAAY,IAAqB,OAAmD;AACzF,UAAM,gBAAiB,MAAM,KAAK,2BAA2B,cAAc,IAAI,OAAO,OAAO;AACzF,QAAA,cAAc,WAAW,GAAG;AAC/B,aAAO,SAAS;AAAA,IACjB;AAEA,UAAM,SAAS,cAAc;AAAA,MAC5B,CAACC,SAAQ,cAAc;AAClB,YAAA,UAAU,SAAS,UAAU;AACzBA,iBAAAA;AAAAA,QACR;AACQ,eAAA;AAAA,UACP,GAAG,KAAK,eAAe,mBAAmBA,SAAQ,UAAU,eAAe,UAAU,aAAa;AAAA,UAClG,SAAS,UAAU;AAAA,UACnB,IAAI,UAAU;AAAA,QAAA;AAAA,MAEhB;AAAA,MACA,OAAO,iBAAiB,qBAAqB;AAAA,IAAA;AAExC,UAAA,aAAaF,4BAAgB,MAAM;AAClC,WAAA;AAAA,MACN,GAAG;AAAA,MACH,eAAe;AAAA,IAAA;AAAA,EAEjB;AACD;;;"}

package/dist/development/src/model/migrations/SchemaVersionBuilder.js

@@ -1,37 +0,0 @@
-import { normalizeSchema, emptySchema } from "@contember/schema-utils";
-const emptyVersionedSchema = { ...normalizeSchema(emptySchema), version: "", id: -1, notNormalized: { ...emptySchema, version: "", id: -1 } };
-class SchemaVersionBuilder {
-  constructor(executedMigrationsResolver, schemaMigrator) {
-    this.executedMigrationsResolver = executedMigrationsResolver;
-    this.schemaMigrator = schemaMigrator;
-  }
-  async buildSchema(db, after) {
-    const newMigrations = await this.executedMigrationsResolver.getMigrations(db, after?.version);
-    if (newMigrations.length === 0) {
-      return after ?? emptyVersionedSchema;
-    }
-    const schema = newMigrations.reduce(
-      (schema2, migration) => {
-        if (migration.type !== "schema") {
-          return schema2;
-        }
-        return {
-          ...this.schemaMigrator.applyModifications(schema2, migration.modifications, migration.formatVersion),
-          version: migration.version,
-          id: migration.id
-        };
-      },
-      after?.notNormalized ?? emptyVersionedSchema.notNormalized
-    );
-    const normalized = normalizeSchema(schema);
-    return {
-      ...normalized,
-      notNormalized: schema
-    };
-  }
-}
-export {
-  SchemaVersionBuilder,
-  emptyVersionedSchema
-};
-//# sourceMappingURL=SchemaVersionBuilder.js.map

package/dist/development/src/model/migrations/SchemaVersionBuilder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SchemaVersionBuilder.js","sources":["../../../../../../packages/engine-system-api/src/model/migrations/SchemaVersionBuilder.ts"],"sourcesContent":["import { Schema } from '@contember/schema'\nimport { SchemaMigrator } from '@contember/schema-migrations'\nimport { emptySchema } from '@contember/schema-utils'\nimport { ExecutedMigrationsResolver } from './ExecutedMigrationsResolver'\nimport { DatabaseContext } from '../database'\nimport { normalizeSchema } from '@contember/schema-utils'\n\nexport type VersionedSchema = Schema & { version: string; id: number; notNormalized: Schema & { version: string; id: number } }\n\nexport const emptyVersionedSchema = { ...normalizeSchema(emptySchema), version: '', id: -1, notNormalized: { ...emptySchema, version: '', id: -1 } }\n\nexport class SchemaVersionBuilder {\n\tconstructor(\n\t\tprivate readonly executedMigrationsResolver: ExecutedMigrationsResolver,\n\t\tprivate readonly schemaMigrator: SchemaMigrator,\n\t) {}\n\n\tasync buildSchema(db: DatabaseContext, after?: VersionedSchema): Promise<VersionedSchema> {\n\t\tconst newMigrations = (await this.executedMigrationsResolver.getMigrations(db, after?.version))\n\t\tif (newMigrations.length === 0) {\n\t\t\treturn after ?? emptyVersionedSchema\n\t\t}\n\n\t\tconst schema = newMigrations.reduce(\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\t...this.schemaMigrator.applyModifications(schema, migration.modifications, migration.formatVersion),\n\t\t\t\t\tversion: migration.version,\n\t\t\t\t\tid: migration.id,\n\t\t\t\t})\n\t\t\t},\n\t\t\tafter?.notNormalized ?? emptyVersionedSchema.notNormalized,\n\t\t)\n\t\tconst normalized = normalizeSchema(schema)\n\t\treturn {\n\t\t\t...normalized,\n\t\t\tnotNormalized: schema,\n\t\t}\n\t}\n}\n"],"names":["schema"],"mappings":";AASO,MAAM,uBAAuB,EAAE,GAAG,gBAAgB,WAAW,GAAG,SAAS,IAAI,IAAI,IAAI,eAAe,EAAE,GAAG,aAAa,SAAS,IAAI,IAAI,KAAK;AAE5I,MAAM,qBAAqB;AAAA,EACjC,YACkB,4BACA,gBAChB;AAFgB,SAAA,6BAAA;AACA,SAAA,iBAAA;AAAA,EACf;AAAA,EAEH,MAAM,YAAY,IAAqB,OAAmD;AACzF,UAAM,gBAAiB,MAAM,KAAK,2BAA2B,cAAc,IAAI,OAAO,OAAO;AACzF,QAAA,cAAc,WAAW,GAAG;AAC/B,aAAO,SAAS;AAAA,IACjB;AAEA,UAAM,SAAS,cAAc;AAAA,MAC5B,CAACA,SAAQ,cAAc;AAClB,YAAA,UAAU,SAAS,UAAU;AACzBA,iBAAAA;AAAAA,QACR;AACQ,eAAA;AAAA,UACP,GAAG,KAAK,eAAe,mBAAmBA,SAAQ,UAAU,eAAe,UAAU,aAAa;AAAA,UAClG,SAAS,UAAU;AAAA,UACnB,IAAI,UAAU;AAAA,QAAA;AAAA,MAEhB;AAAA,MACA,OAAO,iBAAiB,qBAAqB;AAAA,IAAA;AAExC,UAAA,aAAa,gBAAgB,MAAM;AAClC,WAAA;AAAA,MACN,GAAG;AAAA,MACH,eAAe;AAAA,IAAA;AAAA,EAEjB;AACD;"}

package/dist/production/src/model/migrations/SchemaVersionBuilder.cjs

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const schemaUtils = require("@contember/schema-utils");
-const emptyVersionedSchema = { ...schemaUtils.normalizeSchema(schemaUtils.emptySchema), version: "", id: -1, notNormalized: { ...schemaUtils.emptySchema, version: "", id: -1 } };
-class SchemaVersionBuilder {
-  constructor(executedMigrationsResolver, schemaMigrator) {
-    this.executedMigrationsResolver = executedMigrationsResolver;
-    this.schemaMigrator = schemaMigrator;
-  }
-  async buildSchema(db, after) {
-    const newMigrations = await this.executedMigrationsResolver.getMigrations(db, after?.version);
-    if (newMigrations.length === 0) {
-      return after ?? emptyVersionedSchema;
-    }
-    const schema = newMigrations.reduce(
-      (schema2, migration) => {
-        if (migration.type !== "schema") {
-          return schema2;
-        }
-        return {
-          ...this.schemaMigrator.applyModifications(schema2, migration.modifications, migration.formatVersion),
-          version: migration.version,
-          id: migration.id
-        };
-      },
-      after?.notNormalized ?? emptyVersionedSchema.notNormalized
-    );
-    const normalized = schemaUtils.normalizeSchema(schema);
-    return {
-      ...normalized,
-      notNormalized: schema
-    };
-  }
-}
-exports.SchemaVersionBuilder = SchemaVersionBuilder;
-exports.emptyVersionedSchema = emptyVersionedSchema;
-//# sourceMappingURL=SchemaVersionBuilder.cjs.map

package/dist/production/src/model/migrations/SchemaVersionBuilder.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"SchemaVersionBuilder.cjs","sources":["../../../../../../packages/engine-system-api/src/model/migrations/SchemaVersionBuilder.ts"],"sourcesContent":["import { Schema } from '@contember/schema'\nimport { SchemaMigrator } from '@contember/schema-migrations'\nimport { emptySchema } from '@contember/schema-utils'\nimport { ExecutedMigrationsResolver } from './ExecutedMigrationsResolver'\nimport { DatabaseContext } from '../database'\nimport { normalizeSchema } from '@contember/schema-utils'\n\nexport type VersionedSchema = Schema & { version: string; id: number; notNormalized: Schema & { version: string; id: number } }\n\nexport const emptyVersionedSchema = { ...normalizeSchema(emptySchema), version: '', id: -1, notNormalized: { ...emptySchema, version: '', id: -1 } }\n\nexport class SchemaVersionBuilder {\n\tconstructor(\n\t\tprivate readonly executedMigrationsResolver: ExecutedMigrationsResolver,\n\t\tprivate readonly schemaMigrator: SchemaMigrator,\n\t) {}\n\n\tasync buildSchema(db: DatabaseContext, after?: VersionedSchema): Promise<VersionedSchema> {\n\t\tconst newMigrations = (await this.executedMigrationsResolver.getMigrations(db, after?.version))\n\t\tif (newMigrations.length === 0) {\n\t\t\treturn after ?? emptyVersionedSchema\n\t\t}\n\n\t\tconst schema = newMigrations.reduce(\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\t...this.schemaMigrator.applyModifications(schema, migration.modifications, migration.formatVersion),\n\t\t\t\t\tversion: migration.version,\n\t\t\t\t\tid: migration.id,\n\t\t\t\t})\n\t\t\t},\n\t\t\tafter?.notNormalized ?? emptyVersionedSchema.notNormalized,\n\t\t)\n\t\tconst normalized = normalizeSchema(schema)\n\t\treturn {\n\t\t\t...normalized,\n\t\t\tnotNormalized: schema,\n\t\t}\n\t}\n}\n"],"names":["normalizeSchema","emptySchema","schema"],"mappings":";;;AASO,MAAM,uBAAuB,EAAE,GAAGA,4BAAgBC,YAAAA,WAAW,GAAG,SAAS,IAAI,IAAI,IAAI,eAAe,EAAE,GAAGA,yBAAa,SAAS,IAAI,IAAI,KAAK;AAE5I,MAAM,qBAAqB;AAAA,EACjC,YACkB,4BACA,gBAChB;AAFgB,SAAA,6BAAA;AACA,SAAA,iBAAA;AAAA,EACf;AAAA,EAEH,MAAM,YAAY,IAAqB,OAAmD;AACzF,UAAM,gBAAiB,MAAM,KAAK,2BAA2B,cAAc,IAAI,OAAO,OAAO;AACzF,QAAA,cAAc,WAAW,GAAG;AAC/B,aAAO,SAAS;AAAA,IACjB;AAEA,UAAM,SAAS,cAAc;AAAA,MAC5B,CAACC,SAAQ,cAAc;AAClB,YAAA,UAAU,SAAS,UAAU;AACzBA,iBAAAA;AAAAA,QACR;AACQ,eAAA;AAAA,UACP,GAAG,KAAK,eAAe,mBAAmBA,SAAQ,UAAU,eAAe,UAAU,aAAa;AAAA,UAClG,SAAS,UAAU;AAAA,UACnB,IAAI,UAAU;AAAA,QAAA;AAAA,MAEhB;AAAA,MACA,OAAO,iBAAiB,qBAAqB;AAAA,IAAA;AAExC,UAAA,aAAaF,4BAAgB,MAAM;AAClC,WAAA;AAAA,MACN,GAAG;AAAA,MACH,eAAe;AAAA,IAAA;AAAA,EAEjB;AACD;;;"}

package/dist/production/src/model/migrations/SchemaVersionBuilder.js

@@ -1,37 +0,0 @@
-import { normalizeSchema, emptySchema } from "@contember/schema-utils";
-const emptyVersionedSchema = { ...normalizeSchema(emptySchema), version: "", id: -1, notNormalized: { ...emptySchema, version: "", id: -1 } };
-class SchemaVersionBuilder {
-  constructor(executedMigrationsResolver, schemaMigrator) {
-    this.executedMigrationsResolver = executedMigrationsResolver;
-    this.schemaMigrator = schemaMigrator;
-  }
-  async buildSchema(db, after) {
-    const newMigrations = await this.executedMigrationsResolver.getMigrations(db, after?.version);
-    if (newMigrations.length === 0) {
-      return after ?? emptyVersionedSchema;
-    }
-    const schema = newMigrations.reduce(
-      (schema2, migration) => {
-        if (migration.type !== "schema") {
-          return schema2;
-        }
-        return {
-          ...this.schemaMigrator.applyModifications(schema2, migration.modifications, migration.formatVersion),
-          version: migration.version,
-          id: migration.id
-        };
-      },
-      after?.notNormalized ?? emptyVersionedSchema.notNormalized
-    );
-    const normalized = normalizeSchema(schema);
-    return {
-      ...normalized,
-      notNormalized: schema
-    };
-  }
-}
-export {
-  SchemaVersionBuilder,
-  emptyVersionedSchema
-};
-//# sourceMappingURL=SchemaVersionBuilder.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"SchemaVersionBuilder.js","sources":["../../../../../../packages/engine-system-api/src/model/migrations/SchemaVersionBuilder.ts"],"sourcesContent":["import { Schema } from '@contember/schema'\nimport { SchemaMigrator } from '@contember/schema-migrations'\nimport { emptySchema } from '@contember/schema-utils'\nimport { ExecutedMigrationsResolver } from './ExecutedMigrationsResolver'\nimport { DatabaseContext } from '../database'\nimport { normalizeSchema } from '@contember/schema-utils'\n\nexport type VersionedSchema = Schema & { version: string; id: number; notNormalized: Schema & { version: string; id: number } }\n\nexport const emptyVersionedSchema = { ...normalizeSchema(emptySchema), version: '', id: -1, notNormalized: { ...emptySchema, version: '', id: -1 } }\n\nexport class SchemaVersionBuilder {\n\tconstructor(\n\t\tprivate readonly executedMigrationsResolver: ExecutedMigrationsResolver,\n\t\tprivate readonly schemaMigrator: SchemaMigrator,\n\t) {}\n\n\tasync buildSchema(db: DatabaseContext, after?: VersionedSchema): Promise<VersionedSchema> {\n\t\tconst newMigrations = (await this.executedMigrationsResolver.getMigrations(db, after?.version))\n\t\tif (newMigrations.length === 0) {\n\t\t\treturn after ?? emptyVersionedSchema\n\t\t}\n\n\t\tconst schema = newMigrations.reduce(\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\t...this.schemaMigrator.applyModifications(schema, migration.modifications, migration.formatVersion),\n\t\t\t\t\tversion: migration.version,\n\t\t\t\t\tid: migration.id,\n\t\t\t\t})\n\t\t\t},\n\t\t\tafter?.notNormalized ?? emptyVersionedSchema.notNormalized,\n\t\t)\n\t\tconst normalized = normalizeSchema(schema)\n\t\treturn {\n\t\t\t...normalized,\n\t\t\tnotNormalized: schema,\n\t\t}\n\t}\n}\n"],"names":["schema"],"mappings":";AASO,MAAM,uBAAuB,EAAE,GAAG,gBAAgB,WAAW,GAAG,SAAS,IAAI,IAAI,IAAI,eAAe,EAAE,GAAG,aAAa,SAAS,IAAI,IAAI,KAAK;AAE5I,MAAM,qBAAqB;AAAA,EACjC,YACkB,4BACA,gBAChB;AAFgB,SAAA,6BAAA;AACA,SAAA,iBAAA;AAAA,EACf;AAAA,EAEH,MAAM,YAAY,IAAqB,OAAmD;AACzF,UAAM,gBAAiB,MAAM,KAAK,2BAA2B,cAAc,IAAI,OAAO,OAAO;AACzF,QAAA,cAAc,WAAW,GAAG;AAC/B,aAAO,SAAS;AAAA,IACjB;AAEA,UAAM,SAAS,cAAc;AAAA,MAC5B,CAACA,SAAQ,cAAc;AAClB,YAAA,UAAU,SAAS,UAAU;AACzBA,iBAAAA;AAAAA,QACR;AACQ,eAAA;AAAA,UACP,GAAG,KAAK,eAAe,mBAAmBA,SAAQ,UAAU,eAAe,UAAU,aAAa;AAAA,UAClG,SAAS,UAAU;AAAA,UACnB,IAAI,UAAU;AAAA,QAAA;AAAA,MAEhB;AAAA,MACA,OAAO,iBAAiB,qBAAqB;AAAA,IAAA;AAExC,UAAA,aAAa,gBAAgB,MAAM;AAClC,WAAA;AAAA,MACN,GAAG;AAAA,MACH,eAAe;AAAA,IAAA;AAAA,EAEjB;AACD;"}

package/dist/types/model/migrations/SchemaVersionBuilder.d.ts

@@ -1,37 +0,0 @@
-import { Schema } from '@contember/schema';
-import { SchemaMigrator } from '@contember/schema-migrations';
-import { ExecutedMigrationsResolver } from './ExecutedMigrationsResolver';
-import { DatabaseContext } from '../database';
-export type VersionedSchema = Schema & {
-    version: string;
-    id: number;
-    notNormalized: Schema & {
-        version: string;
-        id: number;
-    };
-};
-export declare const emptyVersionedSchema: {
-    version: string;
-    id: number;
-    notNormalized: {
-        version: string;
-        id: number;
-        model: import("@contember/schema").Model.Schema;
-        acl: import("@contember/schema").Acl.Schema;
-        validation: import("@contember/schema").Validation.Schema;
-        actions: import("@contember/schema").Actions.Schema;
-        settings: import("@contember/schema").Settings.Schema;
-    };
-    model: import("@contember/schema").Model.Schema;
-    acl: import("@contember/schema").Acl.Schema;
-    validation: import("@contember/schema").Validation.Schema;
-    actions: import("@contember/schema").Actions.Schema;
-    settings: import("@contember/schema").Settings.Schema;
-};
-export declare class SchemaVersionBuilder {
-    private readonly executedMigrationsResolver;
-    private readonly schemaMigrator;
-    constructor(executedMigrationsResolver: ExecutedMigrationsResolver, schemaMigrator: SchemaMigrator);
-    buildSchema(db: DatabaseContext, after?: VersionedSchema): Promise<VersionedSchema>;
-}
-//# sourceMappingURL=SchemaVersionBuilder.d.ts.map

package/dist/types/model/migrations/SchemaVersionBuilder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SchemaVersionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/model/migrations/SchemaVersionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAG7C,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAA;AAE/H,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;CAAmH,CAAA;AAEpJ,qBAAa,oBAAoB;IAE/B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,cAAc;gBADd,0BAA0B,EAAE,0BAA0B,EACtD,cAAc,EAAE,cAAc;IAG1C,WAAW,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;CAyBzF"}

package/src/model/migrations/SchemaVersionBuilder.ts

@@ -1,43 +0,0 @@
-import { Schema } from '@contember/schema'
-import { SchemaMigrator } from '@contember/schema-migrations'
-import { emptySchema } from '@contember/schema-utils'
-import { ExecutedMigrationsResolver } from './ExecutedMigrationsResolver'
-import { DatabaseContext } from '../database'
-import { normalizeSchema } from '@contember/schema-utils'
-
-export type VersionedSchema = Schema & { version: string; id: number; notNormalized: Schema & { version: string; id: number } }
-
-export const emptyVersionedSchema = { ...normalizeSchema(emptySchema), version: '', id: -1, notNormalized: { ...emptySchema, version: '', id: -1 } }
-
-export class SchemaVersionBuilder {
-	constructor(
-		private readonly executedMigrationsResolver: ExecutedMigrationsResolver,
-		private readonly schemaMigrator: SchemaMigrator,
-	) {}
-
-	async buildSchema(db: DatabaseContext, after?: VersionedSchema): Promise<VersionedSchema> {
-		const newMigrations = (await this.executedMigrationsResolver.getMigrations(db, after?.version))
-		if (newMigrations.length === 0) {
-			return after ?? emptyVersionedSchema
-		}
-
-		const schema = newMigrations.reduce(
-			(schema, migration) => {
-				if (migration.type !== 'schema') {
-					return schema
-				}
-				return ({
-					...this.schemaMigrator.applyModifications(schema, migration.modifications, migration.formatVersion),
-					version: migration.version,
-					id: migration.id,
-				})
-			},
-			after?.notNormalized ?? emptyVersionedSchema.notNormalized,
-		)
-		const normalized = normalizeSchema(schema)
-		return {
-			...normalized,
-			notNormalized: schema,
-		}
-	}
-}