@contember/schema-migrations 1.3.0-rc.2 → 1.3.0

package/tests/cases/integration/updateRelationOrderBy.test.ts

@@ -4,25 +4,29 @@ import { Model } from '@contember/schema'
 import { SQL } from '../../src/tags'
 
 testMigrations('update relation order by', {
-	originalSchema: new SchemaBuilder()
-		.entity('Menu', e =>
-			e.oneHasMany('items', r =>
-				r
-					.ownedBy('menu')
-					.target('MenuItem', e => e.column('heading').column('order', c => c.type(Model.ColumnType.Int))),
-			),
-		)
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Menu', e =>
-			e.oneHasMany('items', r =>
-				r
-					.ownedBy('menu')
-					.orderBy('order')
-					.target('MenuItem', e => e.column('heading').column('order', c => c.type(Model.ColumnType.Int))),
-			),
-		)
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Menu', e =>
+				e.oneHasMany('items', r =>
+					r
+						.ownedBy('menu')
+						.target('MenuItem', e => e.column('heading').column('order', c => c.type(Model.ColumnType.Int))),
+				),
+			)
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Menu', e =>
+				e.oneHasMany('items', r =>
+					r
+						.ownedBy('menu')
+						.orderBy('order')
+						.target('MenuItem', e => e.column('heading').column('order', c => c.type(Model.ColumnType.Int))),
+				),
+			)
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'updateRelationOrderBy',

package/tests/cases/integration/updateView.test.ts

@@ -1,6 +1,6 @@
 import { testMigrations } from '../../src/tests'
 import { SQL } from '../../src/tags'
-import { SchemaDefinition as def } from '@contember/schema-definition'
+import { createSchema, SchemaDefinition as def } from '@contember/schema-definition'
 
 namespace ViewEntityOriginalSchema {
 	@def.View("SELECT null as id, 'John' AS name")
@@ -38,8 +38,8 @@ namespace ViewEntityUpdatedSchema1 {
 
 
 testMigrations('update a view 1', {
-	originalSchema: def.createModel(ViewEntityOriginalSchema),
-	updatedSchema: def.createModel(ViewEntityUpdatedSchema1),
+	original: createSchema(ViewEntityOriginalSchema),
+	updated: createSchema(ViewEntityUpdatedSchema1),
 	diff: [
 		{
 			modification: 'removeEntity',
@@ -186,8 +186,8 @@ namespace ViewEntityUpdatedSchema2 {
 }
 
 testMigrations('update a view 2', {
-	originalSchema: def.createModel(ViewEntityOriginalSchema),
-	updatedSchema: def.createModel(ViewEntityUpdatedSchema2),
+	original: createSchema(ViewEntityOriginalSchema),
+	updated: createSchema(ViewEntityUpdatedSchema2),
 	diff: [
 		{
 			modification: 'removeEntity',
@@ -296,8 +296,8 @@ namespace ViewEntityUpdatedSchema3 {
 }
 
 testMigrations('update a view 3', {
-	originalSchema: def.createModel(ViewEntityOriginalSchema),
-	updatedSchema: def.createModel(ViewEntityUpdatedSchema3),
+	original: createSchema(ViewEntityOriginalSchema),
+	updated: createSchema(ViewEntityUpdatedSchema3),
 	diff: [
 		{
 			modification: 'removeEntity',
@@ -363,8 +363,8 @@ namespace ViewEntityUpdatedSchema4 {
 }
 
 testMigrations('update a view 4', {
-	originalSchema: def.createModel(ViewEntityOriginalSchema),
-	updatedSchema: def.createModel(ViewEntityUpdatedSchema4),
+	original: createSchema(ViewEntityOriginalSchema),
+	updated: createSchema(ViewEntityUpdatedSchema4),
 	diff: [
 		{
 			modification: 'removeEntity',

package/tests/src/tests.ts

@@ -1,5 +1,5 @@
 import { Migration, ModificationHandlerFactory, SchemaDiffer, SchemaMigrator, VERSION_LATEST } from '../../src'
-import { Acl, Model } from '@contember/schema'
+import { Schema } from '@contember/schema'
 import { createMigrationBuilder } from '@contember/database-migrations'
 import { assert, describe, it } from 'vitest'
 import { dummySchemaDatabaseMetadata, emptySchema } from '@contember/schema-utils'
@@ -8,28 +8,22 @@ const modificationFactory = new ModificationHandlerFactory(ModificationHandlerFa
 const schemaMigrator = new SchemaMigrator(modificationFactory)
 const schemaDiffer = new SchemaDiffer(schemaMigrator)
 
-const emptyAcl = { roles: {} }
-
 export interface TestContext {
 	diff: Migration.Modification[]
-	originalSchema: Model.Schema
-	updatedSchema: Model.Schema
-	originalAcl?: Acl.Schema
-	updatedAcl?: Acl.Schema
+	original: Partial<Schema>
+	updated: Partial<Schema>
 	sql: string
 	noDiff?: boolean
 }
 
 export function testDiffSchemas(
-	originalModel: Model.Schema,
-	updatedModel: Model.Schema,
+	original: Partial<Schema>,
+	updated: Partial<Schema>,
 	expectedDiff: Migration.Modification[],
-	originalAcl: Acl.Schema = emptyAcl,
-	updatedAcl: Acl.Schema = emptyAcl,
 ) {
 	const actualDiff = schemaDiffer.diffSchemas(
-		{ ...emptySchema, model: originalModel, acl: originalAcl },
-		{ ...emptySchema, model: updatedModel, acl: updatedAcl },
+		{ ...emptySchema, ...original },
+		{ ...emptySchema, ...updated },
 		{ skipRecreateValidation: true },
 	)
 	try {
@@ -40,39 +34,35 @@ export function testDiffSchemas(
 		throw e
 	}
 	const schema = schemaMigrator.applyModifications(
-		{ ...emptySchema, model: originalModel, acl: originalAcl },
+		{ ...emptySchema, ...original },
 		actualDiff,
 		VERSION_LATEST,
 	)
 	assert.deepStrictEqual(schema, {
 		...emptySchema,
-		model: updatedModel,
-		acl: updatedAcl,
+		...updated,
 	})
 }
 
 export function testApplyDiff(
-	originalModel: Model.Schema,
+	original: Partial<Schema>,
+	expected: Partial<Schema>,
 	diff: Migration.Modification[],
-	expectedModel: Model.Schema,
-	originalAcl: Acl.Schema = emptyAcl,
-	expectedAcl: Acl.Schema = emptyAcl,
 ) {
 	const actualSchema = schemaMigrator.applyModifications(
-		{ ...emptySchema, model: originalModel, acl: originalAcl },
+		{ ...emptySchema, ...original },
 		diff,
 		VERSION_LATEST,
 	)
 
 	assert.deepStrictEqual(actualSchema, {
 		...emptySchema,
-		model: expectedModel,
-		acl: expectedAcl,
+		...expected,
 	})
 }
 
-export function testGenerateSql(originalSchema: Model.Schema, diff: Migration.Modification[], expectedSql: string) {
-	let schema = { ...emptySchema, model: originalSchema, acl: emptyAcl }
+export function testGenerateSql(original: Partial<Schema>, diff: Migration.Modification[], expectedSql: string) {
+	let schema = { ...emptySchema, ...original }
 	const builder = createMigrationBuilder()
 	for (let { modification, ...data } of diff) {
 		const modificationHandler = modificationFactory.create(modification, data, schema, {
@@ -89,19 +79,19 @@ export function testGenerateSql(originalSchema: Model.Schema, diff: Migration.Mo
 	assert.equal(actual, expectedSql)
 }
 
-export function testMigrations(title: string, { originalSchema, updatedSchema, diff, noDiff, originalAcl, updatedAcl, sql }: TestContext) {
+export function testMigrations(title: string, { original, updated, diff, noDiff, sql }: TestContext) {
 	describe(title, () => {
 		it('diff schemas', () => {
 			if (noDiff) {
 				return
 			}
-			testDiffSchemas(originalSchema, updatedSchema, diff, originalAcl, updatedAcl)
+			testDiffSchemas(original, updated, diff)
 		})
 		it('apply diff', () => {
-			testApplyDiff(originalSchema, diff, updatedSchema, originalAcl, updatedAcl)
+			testApplyDiff(original, updated, diff)
 		})
 		it('generate sql', () => {
-			testGenerateSql(originalSchema, diff, sql)
+			testGenerateSql(original, diff, sql)
 		})
 	})
 }

package/dist/src/modifications/differs/ChangeViewNonViewDiffer.d.ts

@@ -1,6 +0,0 @@
-import { Differ } from '../ModificationHandler';
-import { Schema } from '@contember/schema';
-export declare class ChangeViewNonViewDiffer implements Differ {
-    createDiff(originalSchema: Schema, updatedSchema: Schema): import("../../Migration").Migration.Modification<import("../entities").RemoveEntityModificationData>[];
-}
-//# sourceMappingURL=ChangeViewNonViewDiffer.d.ts.map

package/dist/src/modifications/differs/ChangeViewNonViewDiffer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChangeViewNonViewDiffer.d.ts","sourceRoot":"","sources":["../../../../src/modifications/differs/ChangeViewNonViewDiffer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG1C,qBAAa,uBAAwB,YAAW,MAAM;IACrD,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;CAWxD"}

package/dist/src/modifications/differs/ChangeViewNonViewDiffer.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeViewNonViewDiffer = void 0;
-const entities_1 = require("../entities");
-class ChangeViewNonViewDiffer {
-    createDiff(originalSchema, updatedSchema) {
-        return Object.values(updatedSchema.model.entities)
-            .filter(it => {
-            const origEntity = originalSchema.model.entities[it.name];
-            if (!origEntity) {
-                return false;
-            }
-            return !!origEntity.view !== !!it.view;
-        })
-            .map(it => entities_1.removeEntityModification.createModification({ entityName: it.name }));
-    }
-}
-exports.ChangeViewNonViewDiffer = ChangeViewNonViewDiffer;
-//# sourceMappingURL=ChangeViewNonViewDiffer.js.map

package/dist/src/modifications/differs/ChangeViewNonViewDiffer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChangeViewNonViewDiffer.js","sourceRoot":"","sources":["../../../../src/modifications/differs/ChangeViewNonViewDiffer.ts"],"names":[],"mappings":";;;AAEA,0CAAsD;AAEtD,MAAa,uBAAuB;IACnC,UAAU,CAAC,cAAsB,EAAE,aAAqB;QACvD,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC;aAChD,MAAM,CAAC,EAAE,CAAC,EAAE;YACZ,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;YACzD,IAAI,CAAC,UAAU,EAAE;gBAChB,OAAO,KAAK,CAAA;aACZ;YACD,OAAO,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAA;QACvC,CAAC,CAAC;aACD,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,mCAAwB,CAAC,kBAAkB,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAClF,CAAC;CACD;AAZD,0DAYC"}

package/dist/src/modifications/differs/RemoveChangedViewDiffer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RemoveChangedViewDiffer.d.ts","sourceRoot":"","sources":["../../../../src/modifications/differs/RemoveChangedViewDiffer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAK1C,qBAAa,uBAAwB,YAAW,MAAM;;IAIrD,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;;;CAkBxD"}

package/dist/src/modifications/differs/RemoveChangedViewDiffer.js

@@ -1,33 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoveChangedViewDiffer = void 0;
-const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
-const viewDependencies_1 = require("../utils/viewDependencies");
-const columns_1 = require("../columns");
-class RemoveChangedViewDiffer {
-    constructor() {
-    }
-    createDiff(originalSchema, updatedSchema) {
-        const changedViews = Object.values(originalSchema.model.entities)
-            .filter(it => {
-            const updatedEntity = updatedSchema.model.entities[it.name];
-            if (!updatedEntity || !it.view || !updatedEntity.view) {
-                return false;
-            }
-            return !(0, fast_deep_equal_1.default)(updatedEntity.view, it.view);
-        });
-        const columnDiffer = new columns_1.UpdateColumnDefinitionDiffer();
-        const columnChanges = columnDiffer.createDiff(originalSchema, updatedSchema);
-        if (changedViews.length === 0 && columnChanges.length === 0) {
-            return [];
-        }
-        const changedColumnsEntities = Array.from(new Set(columnChanges.map(it => it.entityName)))
-            .map(it => originalSchema.model.entities[it]);
-        return (0, viewDependencies_1.cascadeRemoveDependantViews)(originalSchema.model, [...changedViews, ...changedColumnsEntities]);
-    }
-}
-exports.RemoveChangedViewDiffer = RemoveChangedViewDiffer;
-//# sourceMappingURL=RemoveChangedViewDiffer.js.map

package/dist/src/modifications/differs/RemoveChangedViewDiffer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RemoveChangedViewDiffer.js","sourceRoot":"","sources":["../../../../src/modifications/differs/RemoveChangedViewDiffer.ts"],"names":[],"mappings":";;;;;;AAEA,sEAAuC;AACvC,gEAAuE;AACvE,wCAAyD;AAEzD,MAAa,uBAAuB;IACnC;IACA,CAAC;IAED,UAAU,CAAC,cAAsB,EAAE,aAAqB;QACvD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC;aAC/D,MAAM,CAAC,EAAE,CAAC,EAAE;YACZ,MAAM,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;YAC3D,IAAI,CAAC,aAAa,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE;gBACtD,OAAO,KAAK,CAAA;aACZ;YACD,OAAO,CAAC,IAAA,yBAAS,EAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;QAC/C,CAAC,CAAC,CAAA;QACH,MAAM,YAAY,GAAG,IAAI,sCAA4B,EAAE,CAAA;QACvD,MAAM,aAAa,GAAG,YAAY,CAAC,UAAU,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;QAC5E,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5D,OAAO,EAAE,CAAA;SACT;QACD,MAAM,sBAAsB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;aACxF,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA;QAC9C,OAAO,IAAA,8CAA2B,EAAC,cAAc,CAAC,KAAK,EAAE,CAAC,GAAG,YAAY,EAAE,GAAG,sBAAsB,CAAC,CAAC,CAAA;IACvG,CAAC;CACD;AAtBD,0DAsBC"}

package/src/modifications/differs/ChangeViewNonViewDiffer.ts

@@ -1,17 +0,0 @@
-import { Differ } from '../ModificationHandler'
-import { Schema } from '@contember/schema'
-import { removeEntityModification } from '../entities'
-
-export class ChangeViewNonViewDiffer implements Differ {
-	createDiff(originalSchema: Schema, updatedSchema: Schema) {
-		return Object.values(updatedSchema.model.entities)
-			.filter(it => {
-				const origEntity = originalSchema.model.entities[it.name]
-				if (!origEntity) {
-					return false
-				}
-				return !!origEntity.view !== !!it.view
-			})
-			.map(it => removeEntityModification.createModification({ entityName: it.name }))
-	}
-}