@contember/cli 1.4.0-alpha.4 → 1.4.0-beta.1

package/dist/src/utils/migrations/MigrationCreateHelper.d.ts

@@ -1,9 +1,5 @@
 import { Input, Project, Workspace } from '@contember/cli-common';
-import { MigrationDescriber, SchemaMigrator } from '@contember/schema-migrations';
-import { MigrationCreator } from './MigrationCreator';
-import { MigrationsResolver } from './MigrationsResolver';
-import { SchemaVersionBuilder } from './SchemaVersionBuilder';
-import { MigrationFilesManager } from './MigrationFilesManager';
+import { MigrationCreator, MigrationDescriber, MigrationFilesManager, MigrationsResolver, SchemaMigrator, SchemaVersionBuilder } from '@contember/migrations-client';
 type Args = {
     project?: string;
     migrationName: string;

package/dist/src/utils/migrations/MigrationCreateHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationCreateHelper.d.ts","sourceRoot":"","sources":["../../../../src/utils/migrations/MigrationCreateHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjE,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAE/D,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,KAAK,OAAO,GAAG,EAAE,CAAA;AAEjB,eAAO,MAAM,6BAA6B,UAClC,MAAM,KAAK,IAAI,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC;eACjB,SAAS;;eAExB,SAAS;aACX,OAAO;sBACE,gBAAgB;wBACd,kBAAkB;wBAClB,kBAAkB;0BAChB,oBAAoB;oBAC1B,cAAc;2BACP,qBAAqB;MACvC,QAAQ,MAAM,CAAC,oBA4BrB,CAAA"}
+{"version":3,"file":"MigrationCreateHelper.d.ts","sourceRoot":"","sources":["../../../../src/utils/migrations/MigrationCreateHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjE,OAAO,EACN,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,oBAAoB,EACpB,MAAM,8BAA8B,CAAA;AAErC,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,KAAK,OAAO,GAAG,EAAE,CAAA;AAEjB,eAAO,MAAM,6BAA6B,UAClC,MAAM,KAAK,IAAI,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC;eACjB,SAAS;;eAExB,SAAS;aACX,OAAO;sBACE,gBAAgB;wBACd,kBAAkB;wBAClB,kBAAkB;0BAChB,oBAAoB;oBAC1B,cAAc;2BACP,qBAAqB;MACvC,QAAQ,MAAM,CAAC,oBA4BrB,CAAA"}

package/dist/src/utils/migrations/MigrationCreateHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationCreateHelper.js","sourceRoot":"","sources":["../../../../src/utils/migrations/MigrationCreateHelper.ts"],"names":[],"mappings":";;;AACA,+DAAkE;AAc3D,MAAM,6BAA6B,GAAG,KAAK,EACjD,KAA4C,EAC5C,EAAE,SAAS,EAA0B,EACrC,uBASqB,EACpB,EAAE;IACH,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;IAChD,MAAM,WAAW,GAAG,WAAW,KAAK,GAAG,CAAA;IACvC,MAAM,QAAQ,GAAG,WAAW;QAC3B,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE;QACzC,CAAC,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAEtE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC/B,OAAO,CAAC,KAAK,CAAC,WAAW,OAAO,CAAC,IAAI,GAAG,CAAC,CAAA;QACzC,MAAM,SAAS,GAAG,IAAI,gDAA0B,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAA;QAEhF,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;YAC5C,OAAO;YACP,gBAAgB,EAAE,SAAS,CAAC,gBAAgB;YAC5C,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;YAChD,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;YAChD,oBAAoB,EAAE,SAAS,CAAC,oBAAoB;YACpD,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB;YACtD,SAAS;SACT,CAAC,CAAA;QACF,OAAO,CAAC,QAAQ,EAAE,CAAA;QAClB,IAAI,MAAM,GAAG,CAAC,EAAE;YACf,OAAO,MAAM,CAAA;SACb;KACD;IACD,OAAO,CAAC,CAAA;AACT,CAAC,CAAA;AAxCY,QAAA,6BAA6B,iCAwCzC"}
+{"version":3,"file":"MigrationCreateHelper.js","sourceRoot":"","sources":["../../../../src/utils/migrations/MigrationCreateHelper.ts"],"names":[],"mappings":";;;AACA,+DAAkE;AAiB3D,MAAM,6BAA6B,GAAG,KAAK,EACjD,KAA4C,EAC5C,EAAE,SAAS,EAA0B,EACrC,uBASqB,EACpB,EAAE;IACH,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;IAChD,MAAM,WAAW,GAAG,WAAW,KAAK,GAAG,CAAA;IACvC,MAAM,QAAQ,GAAG,WAAW;QAC3B,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE;QACzC,CAAC,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAEtE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC/B,OAAO,CAAC,KAAK,CAAC,WAAW,OAAO,CAAC,IAAI,GAAG,CAAC,CAAA;QACzC,MAAM,SAAS,GAAG,IAAI,gDAA0B,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAA;QAEhF,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;YAC5C,OAAO;YACP,gBAAgB,EAAE,SAAS,CAAC,gBAAgB;YAC5C,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;YAChD,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;YAChD,oBAAoB,EAAE,SAAS,CAAC,oBAAoB;YACpD,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB;YACtD,SAAS;SACT,CAAC,CAAA;QACF,OAAO,CAAC,QAAQ,EAAE,CAAA;QAClB,IAAI,MAAM,GAAG,CAAC,EAAE;YACf,OAAO,MAAM,CAAA;SACb;KACD;IACD,OAAO,CAAC,CAAA;AACT,CAAC,CAAA;AAxCY,QAAA,6BAA6B,iCAwCzC"}

package/dist/src/utils/migrations/MigrationExecuteHelper.d.ts

@@ -1,17 +1,16 @@
 import { CommandConfiguration } from '@contember/cli-common';
-import { SystemClient } from '../system';
-import { getMigrationsStatus, MigrationToExecuteOkStatus } from './migrations';
-import { MigrationDescriber } from '@contember/schema-migrations';
-import { MigrationsResolver } from './MigrationsResolver';
-import { SchemaVersionBuilder } from './SchemaVersionBuilder';
-import { ContentMigrationFactoryArgs } from './MigrationFile';
+import { ContentMigrationFactoryArgs, MigrationDescriber, MigrationsResolver, MigrationToExecuteOkStatus, SchemaVersionBuilder, SystemClient } from '@contember/migrations-client';
 export type ExecuteMigrationOptions = {
     instance?: string;
     ['remote-project']?: string;
     yes?: true;
 };
 export declare const configureExecuteMigrationCommand: (configuration: CommandConfiguration<{}, ExecuteMigrationOptions>) => void;
-export declare const resolveMigrationStatus: (client: SystemClient, migrationsResolver: MigrationsResolver, force?: boolean) => Promise<ReturnType<typeof getMigrationsStatus>>;
+export declare const resolveMigrationStatus: (client: SystemClient, migrationsResolver: MigrationsResolver, force?: boolean) => Promise<{
+    allMigrations: import("@contember/migrations-client").AnyMigrationStatus[];
+    errorMigrations: import("@contember/migrations-client").ErrorMigrationStatus[];
+    migrationsToExecute: MigrationToExecuteOkStatus[];
+}>;
 export declare const executeMigrations: ({ client, migrations, requireConfirmation, schemaVersionBuilder, migrationDescriber, contentMigrationFactoryArgs, force, }: {
     client: SystemClient;
     migrations: MigrationToExecuteOkStatus[];

package/dist/src/utils/migrations/MigrationExecuteHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationExecuteHelper.d.ts","sourceRoot":"","sources":["../../../../src/utils/migrations/MigrationExecuteHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAA6B,MAAM,cAAc,CAAA;AACzG,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,2BAA2B,EAA+C,MAAM,iBAAiB,CAAA;AAG1G,MAAM,MAAM,uBAAuB,GAAG;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,CAAC,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAA;IAC3B,GAAG,CAAC,EAAE,IAAI,CAAA;CACV,CAAA;AAED,eAAO,MAAM,gCAAgC,kBAAmB,qBAAqB,EAAE,EAAE,uBAAuB,CAAC,SAahH,CAAA;AAED,eAAO,MAAM,sBAAsB,WAC1B,YAAY,sBACA,kBAAkB,UAC/B,OAAO,KACZ,QAAQ,WAAW,0BAA0B,CAAC,CAIhD,CAAA;AAED,eAAO,MAAM,iBAAiB;YASrB,YAAY;gBACR,0BAA0B,EAAE;yBACnB,OAAO;0BACN,oBAAoB;wBACtB,kBAAkB;iCACT,2BAA2B;;MAErD,QAAQ,MAAM,CA+FjB,CAAA"}
+{"version":3,"file":"MigrationExecuteHelper.d.ts","sourceRoot":"","sources":["../../../../src/utils/migrations/MigrationExecuteHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EACN,2BAA2B,EAE3B,kBAAkB,EAClB,kBAAkB,EAClB,0BAA0B,EAC1B,oBAAoB,EACpB,YAAY,EAGZ,MAAM,8BAA8B,CAAA;AAIrC,MAAM,MAAM,uBAAuB,GAAG;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,CAAC,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAA;IAC3B,GAAG,CAAC,EAAE,IAAI,CAAA;CACV,CAAA;AAED,eAAO,MAAM,gCAAgC,kBAAmB,qBAAqB,EAAE,EAAE,uBAAuB,CAAC,SAahH,CAAA;AAED,eAAO,MAAM,sBAAsB,WAC1B,YAAY,sBACA,kBAAkB,UAC/B,OAAO;;;;EAMd,CAAA;AAED,eAAO,MAAM,iBAAiB;YASrB,YAAY;gBACR,0BAA0B,EAAE;yBACnB,OAAO;0BACN,oBAAoB;wBACtB,kBAAkB;iCACT,2BAA2B;;MAErD,QAAQ,MAAM,CAmDjB,CAAA"}

package/dist/src/utils/migrations/MigrationExecuteHelper.js

@@ -4,10 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeMigrations = exports.resolveMigrationStatus = exports.configureExecuteMigrationCommand = void 0;
+const migrations_client_1 = require("@contember/migrations-client");
 const migrations_1 = require("./migrations");
 const prompts_1 = __importDefault(require("prompts"));
-const MigrationFile_1 = require("./MigrationFile");
-const assertNever_1 = require("../assertNever");
 const configureExecuteMigrationCommand = (configuration) => {
     configuration //
         .option('instance')
@@ -24,9 +23,10 @@ const configureExecuteMigrationCommand = (configuration) => {
 };
 exports.configureExecuteMigrationCommand = configureExecuteMigrationCommand;
 const resolveMigrationStatus = async (client, migrationsResolver, force = false) => {
+    const migrationStatusResolver = new migrations_client_1.MigrationsStatusResolver();
     const executedMigrations = await client.listExecutedMigrations();
     const localMigrations = await migrationsResolver.getMigrationFiles();
-    return (0, migrations_1.getMigrationsStatus)(executedMigrations, localMigrations, force);
+    return migrationStatusResolver.getMigrationsStatus(executedMigrations, localMigrations, force);
 };
 exports.resolveMigrationStatus = resolveMigrationStatus;
 const executeMigrations = async ({ client, migrations, requireConfirmation, schemaVersionBuilder, migrationDescriber, contentMigrationFactoryArgs, force, }) => {
@@ -54,7 +54,7 @@ const executeMigrations = async ({ client, migrations, requireConfirmation, sche
                 const schema = await schemaVersionBuilder.buildSchemaUntil(migrations[0].version);
                 for (const migration of migrations) {
                     const migrationContent = await migration.localMigration.getContent();
-                    if (!(0, MigrationFile_1.isSchemaMigration)(migrationContent)) {
+                    if (!(0, migrations_client_1.isSchemaMigration)(migrationContent)) {
                         continue;
                     }
                     await (0, migrations_1.printMigrationDescription)(migrationDescriber, schema, migrationContent, {
@@ -70,54 +70,14 @@ const executeMigrations = async ({ client, migrations, requireConfirmation, sche
             }
         } while (true);
     }
-    let migrationsToRun = [];
-    const executeMigrations = async () => {
-        if (migrationsToRun.length === 0) {
-            return;
-        }
-        await client.migrate(migrationsToRun.map(it => {
-            if (it.type === 'schema') {
-                return {
-                    version: it.version,
-                    name: it.name,
-                    type: 'SCHEMA',
-                    schemaMigration: {
-                        formatVersion: it.formatVersion,
-                        modifications: it.modifications,
-                        skippedErrors: it.skippedErrors,
-                    },
-                };
-            }
-            if (it.type === 'content') {
-                return {
-                    version: it.version,
-                    name: it.name,
-                    type: 'CONTENT',
-                    contentMigration: it.queries,
-                };
-            }
-            return (0, assertNever_1.assertNever)(it);
-        }), force);
-        migrationsToRun.forEach(it => {
-            console.log(it.name);
-        });
-        migrationsToRun = [];
-    };
-    console.log('Executing...');
-    for (const migration of migrations) {
-        const migrationContent = await migration.localMigration.getContent();
-        if (migrationContent.type === 'factory') {
-            await executeMigrations();
-            const result = await migrationContent.factory(contentMigrationFactoryArgs);
-            migrationsToRun.push(result);
-            await executeMigrations();
-        }
-        else {
-            migrationsToRun.push(migrationContent);
-        }
-    }
-    await executeMigrations();
-    console.log('Migration executed');
+    const executor = new migrations_client_1.MigrationExecutor();
+    await executor.executeMigrations({
+        client,
+        migrations,
+        contentMigrationFactoryArgs,
+        log: message => console.log(message),
+        force,
+    });
     return 0;
 };
 exports.executeMigrations = executeMigrations;

package/dist/src/utils/migrations/MigrationExecuteHelper.js.map

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

package/dist/src/utils/migrations/MigrationsContainer.d.ts

@@ -1,8 +1,8 @@
 import { MigrationDescriber, SchemaDiffer, SchemaMigrator } from '@contember/schema-migrations';
-import { MigrationCreator } from './MigrationCreator';
-import { SchemaVersionBuilder } from './SchemaVersionBuilder';
-import { MigrationsResolver } from './MigrationsResolver';
-import { MigrationFilesManager } from './MigrationFilesManager';
+import { MigrationCreator } from '@contember/migrations-client';
+import { SchemaVersionBuilder } from '@contember/migrations-client';
+import { MigrationsResolver } from '@contember/migrations-client';
+import { MigrationFilesManager } from '@contember/migrations-client';
 export interface MigrationsContainer {
     migrationCreator: MigrationCreator;
     migrationDescriber: MigrationDescriber;

package/dist/src/utils/migrations/MigrationsContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationsContainer.d.ts","sourceRoot":"","sources":["../../../../src/utils/migrations/MigrationsContainer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAA8B,YAAY,EAAE,cAAc,EAAkB,MAAM,8BAA8B,CAAA;AAC3I,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAK/D,MAAM,WAAW,mBAAmB;IACnC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,oBAAoB,EAAE,oBAAoB,CAAA;IAC1C,YAAY,EAAE,YAAY,CAAA;IAC1B,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,qBAAqB,EAAE,qBAAqB,CAAA;IAC5C,cAAc,EAAE,cAAc,CAAA;CAC9B;AAaD,qBAAa,0BAA0B;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,MAAM;IAEvC,MAAM,IAAI,mBAAmB;CAqCpC"}
+{"version":3,"file":"MigrationsContainer.d.ts","sourceRoot":"","sources":["../../../../src/utils/migrations/MigrationsContainer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAA8B,YAAY,EAAE,cAAc,EAAkB,MAAM,8BAA8B,CAAA;AAC3I,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAMpE,MAAM,WAAW,mBAAmB;IACnC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,oBAAoB,EAAE,oBAAoB,CAAA;IAC1C,YAAY,EAAE,YAAY,CAAA;IAC1B,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,qBAAqB,EAAE,qBAAqB,CAAA;IAC5C,cAAc,EAAE,cAAc,CAAA;CAC9B;AAaD,qBAAa,0BAA0B;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,MAAM;IAEvC,MAAM,IAAI,mBAAmB;CA4CpC"}

package/dist/src/utils/migrations/MigrationsContainer.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrationsContainerFactory = void 0;
 const dic_1 = require("@contember/dic");
 const schema_migrations_1 = require("@contember/schema-migrations");
-const MigrationCreator_1 = require("./MigrationCreator");
-const SchemaVersionBuilder_1 = require("./SchemaVersionBuilder");
-const MigrationsResolver_1 = require("./MigrationsResolver");
-const MigrationFilesManager_1 = require("./MigrationFilesManager");
-const JsonLoader_1 = require("./JsonLoader");
-const MigrationParser_1 = require("./MigrationParser");
-const JsLoader_1 = require("./JsLoader");
+const migrations_client_1 = require("@contember/migrations-client");
+const migrations_client_2 = require("@contember/migrations-client");
+const migrations_client_3 = require("@contember/migrations-client");
+const migrations_client_4 = require("@contember/migrations-client");
+const migrations_client_5 = require("@contember/migrations-client");
+const migrations_client_6 = require("@contember/migrations-client");
+const migrations_client_7 = require("@contember/migrations-client");
+const esbuild_1 = require("../esbuild");
 const jsSample = `
 export const query = \`\`
 export const variables = {}
@@ -26,17 +27,24 @@ class MigrationsContainerFactory {
     }
     create() {
         return new dic_1.Builder({})
-            .addService('migrationFilesManager', () => new MigrationFilesManager_1.MigrationFilesManager(this.directory, {
-            json: new JsonLoader_1.JsonLoader(new MigrationParser_1.MigrationParser()),
-            ts: new JsLoader_1.JsLoader(new MigrationParser_1.MigrationParser()),
-            js: new JsLoader_1.JsLoader(new MigrationParser_1.MigrationParser()),
-        }))
+            .addService('migrationFilesManager', () => {
+            const jsExecutor = async (file) => {
+                const code = await (0, esbuild_1.buildJs)(file);
+                const fn = new Function(`var module = {}; ((module) => { ${code} })(module); return module`);
+                return fn().exports;
+            };
+            return new migrations_client_4.MigrationFilesManager(this.directory, {
+                json: new migrations_client_5.JsonLoader(new migrations_client_6.MigrationParser()),
+                ts: new migrations_client_7.JsLoader(new migrations_client_6.MigrationParser(), jsExecutor),
+                js: new migrations_client_7.JsLoader(new migrations_client_6.MigrationParser(), jsExecutor),
+            });
+        })
             .addService('modificationHandlerFactory', () => new schema_migrations_1.ModificationHandlerFactory(schema_migrations_1.ModificationHandlerFactory.defaultFactoryMap))
             .addService('schemaMigrator', ({ modificationHandlerFactory }) => new schema_migrations_1.SchemaMigrator(modificationHandlerFactory))
-            .addService('migrationsResolver', ({ migrationFilesManager }) => new MigrationsResolver_1.MigrationsResolver(migrationFilesManager))
-            .addService('schemaVersionBuilder', ({ migrationsResolver, schemaMigrator }) => new SchemaVersionBuilder_1.SchemaVersionBuilder(migrationsResolver, schemaMigrator))
+            .addService('migrationsResolver', ({ migrationFilesManager }) => new migrations_client_3.MigrationsResolver(migrationFilesManager))
+            .addService('schemaVersionBuilder', ({ migrationsResolver, schemaMigrator }) => new migrations_client_2.SchemaVersionBuilder(migrationsResolver, schemaMigrator))
             .addService('schemaDiffer', ({ schemaMigrator }) => new schema_migrations_1.SchemaDiffer(schemaMigrator))
-            .addService('migrationCreator', ({ migrationFilesManager, schemaDiffer }) => new MigrationCreator_1.MigrationCreator(migrationFilesManager, schemaDiffer, {
+            .addService('migrationCreator', ({ migrationFilesManager, schemaDiffer }) => new migrations_client_1.MigrationCreator(migrationFilesManager, schemaDiffer, {
             json: JSON.stringify({ formatVersion: schema_migrations_1.VERSION_LATEST, modifications: [] }, undefined, '\t') + '\n',
             ts: jsSample,
             js: jsSample,

package/dist/src/utils/migrations/MigrationsContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationsContainer.js","sourceRoot":"","sources":["../../../../src/utils/migrations/MigrationsContainer.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AACxC,oEAA2I;AAC3I,yDAAqD;AACrD,iEAA6D;AAC7D,6DAAyD;AACzD,mEAA+D;AAC/D,6CAAyC;AACzC,uDAAmD;AACnD,yCAAqC;AAYrC,MAAM,QAAQ,GAAG;;;;;;;;;CAShB,CAAA;AAED,MAAa,0BAA0B;IACtC,YAA6B,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;IAAG,CAAC;IAE3C,MAAM;QACZ,OAAO,IAAI,aAAO,CAAC,EAAE,CAAC;aACpB,UAAU,CAAC,uBAAuB,EAAE,GAAG,EAAE,CACzC,IAAI,6CAAqB,CAAC,IAAI,CAAC,SAAS,EAAE;YACzC,IAAI,EAAE,IAAI,uBAAU,CAAC,IAAI,iCAAe,EAAE,CAAC;YAC3C,EAAE,EAAE,IAAI,mBAAQ,CAAC,IAAI,iCAAe,EAAE,CAAC;YACvC,EAAE,EAAE,IAAI,mBAAQ,CAAC,IAAI,iCAAe,EAAE,CAAC;SACvC,CAAC,CAAC;aACH,UAAU,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAC9C,IAAI,8CAA0B,CAAC,8CAA0B,CAAC,iBAAiB,CAAC,CAAC;aAC7E,UAAU,CAAC,gBAAgB,EAAE,CAAC,EAAE,0BAA0B,EAAE,EAAE,EAAE,CAChE,IAAI,kCAAc,CAAC,0BAA0B,CAAC,CAAC;aAC/C,UAAU,CAAC,oBAAoB,EAAE,CAAC,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAC/D,IAAI,uCAAkB,CAAC,qBAAqB,CAAC,CAAC;aAC9C,UAAU,CAAC,sBAAsB,EAAE,CAAC,EAAE,kBAAkB,EAAE,cAAc,EAAE,EAAE,EAAE,CAC9E,IAAI,2CAAoB,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;aAC7D,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAClD,IAAI,gCAAY,CAAC,cAAc,CAAC,CAAC;aACjC,UAAU,CAAC,kBAAkB,EAAE,CAAC,EAAE,qBAAqB,EAAE,YAAY,EAAE,EAAE,EAAE,CAC3E,IAAI,mCAAgB,CAAC,qBAAqB,EAAE,YAAY,EAAE;YACzD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,kCAAc,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,IAAI;YAClG,EAAE,EAAE,QAAQ;YACZ,EAAE,EAAE,QAAQ;SACZ,CAAC,CAAC;aACH,UAAU,CAAC,oBAAoB,EAAE,CAAC,EAAE,0BAA0B,EAAE,EAAE,EAAE,CACpE,IAAI,sCAAkB,CAAC,0BAA0B,CAAC,CAAC;aACnD,KAAK,EAAE;aACP,IAAI,CACJ,kBAAkB,EAClB,oBAAoB,EACpB,sBAAsB,EACtB,cAAc,EACd,oBAAoB,EACpB,uBAAuB,EACvB,gBAAgB,CAChB,CAAA;IACH,CAAC;CACD;AAxCD,gEAwCC"}
+{"version":3,"file":"MigrationsContainer.js","sourceRoot":"","sources":["../../../../src/utils/migrations/MigrationsContainer.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AACxC,oEAA2I;AAC3I,oEAA+D;AAC/D,oEAAmE;AACnE,oEAAiE;AACjE,oEAAoE;AACpE,oEAAyD;AACzD,oEAA8D;AAC9D,oEAAuD;AACvD,wCAAoC;AAYpC,MAAM,QAAQ,GAAG;;;;;;;;;CAShB,CAAA;AAED,MAAa,0BAA0B;IACtC,YAA6B,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;IAAG,CAAC;IAE3C,MAAM;QACZ,OAAO,IAAI,aAAO,CAAC,EAAE,CAAC;aACpB,UAAU,CAAC,uBAAuB,EAAE,GAAG,EAAE;YACzC,MAAM,UAAU,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;gBACzC,MAAM,IAAI,GAAG,MAAM,IAAA,iBAAO,EAAC,IAAI,CAAC,CAAA;gBAChC,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,mCAAmC,IAAI,4BAA4B,CAAC,CAAA;gBAC5F,OAAO,EAAE,EAAE,CAAC,OAAO,CAAA;YACpB,CAAC,CAAA;YAED,OAAO,IAAI,yCAAqB,CAAC,IAAI,CAAC,SAAS,EAAE;gBAChD,IAAI,EAAE,IAAI,8BAAU,CAAC,IAAI,mCAAe,EAAE,CAAC;gBAC3C,EAAE,EAAE,IAAI,4BAAQ,CAAC,IAAI,mCAAe,EAAE,EAAE,UAAU,CAAC;gBACnD,EAAE,EAAE,IAAI,4BAAQ,CAAC,IAAI,mCAAe,EAAE,EAAE,UAAU,CAAC;aACnD,CAAC,CAAA;QACH,CAAC,CAAC;aACD,UAAU,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAC9C,IAAI,8CAA0B,CAAC,8CAA0B,CAAC,iBAAiB,CAAC,CAAC;aAC7E,UAAU,CAAC,gBAAgB,EAAE,CAAC,EAAE,0BAA0B,EAAE,EAAE,EAAE,CAChE,IAAI,kCAAc,CAAC,0BAA0B,CAAC,CAAC;aAC/C,UAAU,CAAC,oBAAoB,EAAE,CAAC,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAC/D,IAAI,sCAAkB,CAAC,qBAAqB,CAAC,CAAC;aAC9C,UAAU,CAAC,sBAAsB,EAAE,CAAC,EAAE,kBAAkB,EAAE,cAAc,EAAE,EAAE,EAAE,CAC9E,IAAI,wCAAoB,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;aAC7D,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAClD,IAAI,gCAAY,CAAC,cAAc,CAAC,CAAC;aACjC,UAAU,CAAC,kBAAkB,EAAE,CAAC,EAAE,qBAAqB,EAAE,YAAY,EAAE,EAAE,EAAE,CAC3E,IAAI,oCAAgB,CAAC,qBAAqB,EAAE,YAAY,EAAE;YACzD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,kCAAc,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,IAAI;YAClG,EAAE,EAAE,QAAQ;YACZ,EAAE,EAAE,QAAQ;SACZ,CAAC,CAAC;aACH,UAAU,CAAC,oBAAoB,EAAE,CAAC,EAAE,0BAA0B,EAAE,EAAE,EAAE,CACpE,IAAI,sCAAkB,CAAC,0BAA0B,CAAC,CAAC;aACnD,KAAK,EAAE;aACP,IAAI,CACJ,kBAAkB,EAClB,oBAAoB,EACpB,sBAAsB,EACtB,cAAc,EACd,oBAAoB,EACpB,uBAAuB,EACvB,gBAAgB,CAChB,CAAA;IACH,CAAC;CACD;AA/CD,gEA+CC"}

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

@@ -1,61 +1,9 @@
-import { Migration, MigrationDescriber, MigrationInfo } from '@contember/schema-migrations';
+import { Migration, MigrationDescriber } from '@contember/schema-migrations';
 import { Schema } from '@contember/schema';
-import { MigrationFile } from './MigrationFile';
+import { AnyMigrationStatus } from '@contember/migrations-client';
 export declare const printMigrationDescription: (migrationsDescriber: MigrationDescriber, schema: Schema, migration: Migration, options: {
     sqlOnly?: boolean;
     noSql?: boolean;
 }) => void;
-export interface ExecutedMigrationInfo extends MigrationInfo {
-    readonly executedAt: Date;
-    readonly checksum: string;
-}
-export interface ExecutedMigration extends Migration {
-    readonly executedAt: Date;
-    readonly checksum: string;
-}
-export declare enum MigrationState {
-    TO_EXECUTE_OK = "to_execute_ok",
-    TO_EXECUTE_ERROR = "to_execute_error",
-    EXECUTED_OK = "executed_ok",
-    EXECUTED_ERROR = "executed_error",
-    EXECUTED_MISSING = "executed_missing"
-}
-export interface MigrationStatusBase<S extends MigrationState> {
-    state: S;
-    version: string;
-    name: string;
-}
-export interface MigrationToExecuteOkStatus extends MigrationStatusBase<MigrationState.TO_EXECUTE_OK> {
-    localMigration: MigrationFile;
-}
-interface MigrationToExecuteInvalidStatus extends MigrationStatusBase<MigrationState.TO_EXECUTE_ERROR> {
-    localMigration: MigrationFile;
-    errorMessage: string;
-}
-interface MigrationExecutedOkStatus extends MigrationStatusBase<MigrationState.EXECUTED_OK> {
-    executedMigration: ExecutedMigrationInfo;
-    localMigration: MigrationFile;
-}
-interface MigrationExecutedMissingStatus extends MigrationStatusBase<MigrationState.EXECUTED_MISSING> {
-    executedMigration: ExecutedMigrationInfo;
-    errorMessage: string;
-}
-interface MigrationExecutedErrorStatus extends MigrationStatusBase<MigrationState.EXECUTED_ERROR> {
-    executedMigration: ExecutedMigrationInfo;
-    localMigration: MigrationFile;
-    errorMessage: string;
-}
-export type ErrorMigrationStatus = MigrationToExecuteInvalidStatus | MigrationExecutedMissingStatus | MigrationExecutedErrorStatus;
-export type AnyMigrationStatus = ErrorMigrationStatus | MigrationToExecuteOkStatus | MigrationExecutedOkStatus;
-export declare const isErrorMigrationStatus: (migration: AnyMigrationStatus) => migration is ErrorMigrationStatus;
-export declare const sortMigrations: <M extends {
-    version: string;
-}>(migrations: M[]) => M[];
-export declare const getMigrationsStatus: (executedMigrations: ExecutedMigrationInfo[], localMigrations: MigrationFile[], force?: boolean) => Promise<{
-    allMigrations: AnyMigrationStatus[];
-    errorMigrations: ErrorMigrationStatus[];
-    migrationsToExecute: MigrationToExecuteOkStatus[];
-}>;
 export declare const createMigrationStatusTable: (migrations: AnyMigrationStatus[]) => string;
-export {};
 //# sourceMappingURL=migrations.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../../src/utils/migrations/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,SAAS,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEvH,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI1C,OAAO,EAAqB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAElE,eAAO,MAAM,yBAAyB,wBAChB,kBAAkB,UAC/B,MAAM,aACH,SAAS,WACX;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,SA8B/C,CAAA;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC3D,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CACzB;AAED,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IACnD,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CACzB;AAED,oBAAY,cAAc;IACzB,aAAa,kBAAkB;IAC/B,gBAAgB,qBAAqB;IACrC,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,gBAAgB,qBAAqB;CACrC;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,cAAc;IAC5D,KAAK,EAAE,CAAC,CAAA;IACR,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,0BAA2B,SAAQ,mBAAmB,CAAC,cAAc,CAAC,aAAa,CAAC;IACpG,cAAc,EAAE,aAAa,CAAA;CAC7B;AAED,UAAU,+BAAgC,SAAQ,mBAAmB,CAAC,cAAc,CAAC,gBAAgB,CAAC;IACrG,cAAc,EAAE,aAAa,CAAA;IAC7B,YAAY,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,yBAA0B,SAAQ,mBAAmB,CAAC,cAAc,CAAC,WAAW,CAAC;IAC1F,iBAAiB,EAAE,qBAAqB,CAAA;IACxC,cAAc,EAAE,aAAa,CAAA;CAC7B;AAED,UAAU,8BAA+B,SAAQ,mBAAmB,CAAC,cAAc,CAAC,gBAAgB,CAAC;IACpG,iBAAiB,EAAE,qBAAqB,CAAA;IACxC,YAAY,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,4BAA6B,SAAQ,mBAAmB,CAAC,cAAc,CAAC,cAAc,CAAC;IAChG,iBAAiB,EAAE,qBAAqB,CAAA;IACxC,cAAc,EAAE,aAAa,CAAA;IAC7B,YAAY,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,oBAAoB,GAC7B,+BAA+B,GAC/B,8BAA8B,GAC9B,4BAA4B,CAAA;AAE/B,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,GAAG,0BAA0B,GAAG,yBAAyB,CAAA;AAC9G,eAAO,MAAM,sBAAsB,cAAe,kBAAkB,sCAGlE,CAAA;AAEF,eAAO,MAAM,cAAc;aAAyB,MAAM;0BAEzD,CAAA;AAED,eAAO,MAAM,mBAAmB,uBACX,qBAAqB,EAAE,mBAC1B,aAAa,EAAE,UACzB,OAAO;mBAEC,kBAAkB,EAAE;qBAClB,oBAAoB,EAAE;yBAClB,0BAA0B,EAAE;EA0EjD,CAAA;AACD,eAAO,MAAM,0BAA0B,eAAgB,kBAAkB,EAAE,KAAG,MAkC7E,CAAA"}
+{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../../src/utils/migrations/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAE5E,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAK1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjE,eAAO,MAAM,yBAAyB,wBAChB,kBAAkB,UAC/B,MAAM,aACH,SAAS,WACX;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,SA8B/C,CAAA;AAED,eAAO,MAAM,0BAA0B,eAAgB,kBAAkB,EAAE,KAAG,MAkC7E,CAAA"}

package/dist/src/utils/migrations/migrations.js

@@ -3,13 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMigrationStatusTable = exports.getMigrationsStatus = exports.sortMigrations = exports.isErrorMigrationStatus = exports.MigrationState = exports.printMigrationDescription = void 0;
-const schema_migrations_1 = require("@contember/schema-migrations");
+exports.createMigrationStatusTable = exports.printMigrationDescription = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const chalk_table_1 = __importDefault(require("chalk-table"));
 const assertNever_1 = require("../assertNever");
 const database_1 = require("@contember/database");
-const MigrationFile_1 = require("./MigrationFile");
+const migrations_client_1 = require("@contember/migrations-client");
 const printMigrationDescription = function (migrationsDescriber, schema, migration, options) {
     const description = migrationsDescriber.describeModifications(schema, migration);
     description.forEach(({ modification, getSql, description }) => {
@@ -42,112 +41,32 @@ const printMigrationDescription = function (migrationsDescriber, schema, migrati
     });
 };
 exports.printMigrationDescription = printMigrationDescription;
-var MigrationState;
-(function (MigrationState) {
-    MigrationState["TO_EXECUTE_OK"] = "to_execute_ok";
-    MigrationState["TO_EXECUTE_ERROR"] = "to_execute_error";
-    MigrationState["EXECUTED_OK"] = "executed_ok";
-    MigrationState["EXECUTED_ERROR"] = "executed_error";
-    MigrationState["EXECUTED_MISSING"] = "executed_missing";
-})(MigrationState || (exports.MigrationState = MigrationState = {}));
-const isErrorMigrationStatus = (migration) => [MigrationState.EXECUTED_ERROR, MigrationState.EXECUTED_MISSING, MigrationState.TO_EXECUTE_ERROR].includes(migration.state);
-exports.isErrorMigrationStatus = isErrorMigrationStatus;
-const sortMigrations = (migrations) => {
-    return [...migrations].sort((a, b) => a.version.localeCompare(b.version));
-};
-exports.sortMigrations = sortMigrations;
-const getMigrationsStatus = async (executedMigrations, localMigrations, force = false) => {
-    const sortedExecuted = (0, exports.sortMigrations)(executedMigrations);
-    const allMigrations = [];
-    for (const executed of sortedExecuted) {
-        const localMigration = localMigrations.find(it => it.version === executed.version);
-        if (!localMigration) {
-            allMigrations.push({
-                state: MigrationState.EXECUTED_MISSING,
-                executedMigration: executed,
-                version: executed.version,
-                name: executed.name,
-                errorMessage: `Migration ${executed.name} is missing locally`,
-            });
-            continue;
-        }
-        const migrationContent = await localMigration.getContent();
-        const localChecksum = !(0, MigrationFile_1.isSchemaMigration)(migrationContent) ? null : (0, schema_migrations_1.calculateMigrationChecksum)(migrationContent);
-        if (localChecksum !== executed.checksum) {
-            allMigrations.push({
-                state: MigrationState.EXECUTED_ERROR,
-                executedMigration: executed,
-                version: executed.version,
-                name: executed.name,
-                localMigration,
-                errorMessage: `Checksum of executed migration "${executed.checksum}" does not match "${localChecksum}"`,
-            });
-            continue;
-        }
-        allMigrations.push({
-            state: MigrationState.EXECUTED_OK,
-            executedMigration: executed,
-            version: executed.version,
-            name: executed.name,
-            localMigration,
-        });
-    }
-    const latestExecuted = sortedExecuted.length > 0 ? sortedExecuted[sortedExecuted.length - 1] : null;
-    for (const localMigration of localMigrations) {
-        if (allMigrations.find(it => it.version === localMigration.version)) {
-            continue;
-        }
-        if (latestExecuted && latestExecuted.version > localMigration.version) {
-            allMigrations.push({
-                state: MigrationState.TO_EXECUTE_ERROR,
-                localMigration,
-                version: localMigration.version,
-                name: localMigration.name,
-                errorMessage: `Must follow latest executed migration ${latestExecuted.name}`,
-            });
-            continue;
-        }
-        allMigrations.push({
-            state: MigrationState.TO_EXECUTE_OK,
-            localMigration,
-            version: localMigration.version,
-            name: localMigration.name,
-        });
-    }
-    const allMigrationsSorted = (0, exports.sortMigrations)(allMigrations);
-    return {
-        allMigrations: allMigrationsSorted,
-        errorMigrations: allMigrationsSorted.filter(exports.isErrorMigrationStatus),
-        migrationsToExecute: allMigrationsSorted.filter((it) => it.state === MigrationState.TO_EXECUTE_OK || (force && it.state === MigrationState.TO_EXECUTE_ERROR)),
-    };
-};
-exports.getMigrationsStatus = getMigrationsStatus;
 const createMigrationStatusTable = (migrations) => {
     return (0, chalk_table_1.default)({
         columns: ['status', 'migration', 'info'],
     }, migrations.map(it => {
         switch (it.state) {
-            case MigrationState.EXECUTED_ERROR:
+            case migrations_client_1.MigrationState.EXECUTED_ERROR:
                 return { status: chalk_1.default.bgRedBright.white('ERROR'), migration: it.name, info: it.errorMessage };
-            case MigrationState.EXECUTED_OK:
+            case migrations_client_1.MigrationState.EXECUTED_OK:
                 return {
                     status: chalk_1.default.bgGreen.blackBright('Executed'),
                     migration: it.name,
                     info: `Executed at ${it.executedMigration.executedAt.toISOString()}`,
                 };
-            case MigrationState.EXECUTED_MISSING:
+            case migrations_client_1.MigrationState.EXECUTED_MISSING:
                 return {
                     status: chalk_1.default.bgRedBright.white('ERROR'),
                     migration: it.name,
                     info: it.errorMessage,
                 };
-            case MigrationState.TO_EXECUTE_OK:
+            case migrations_client_1.MigrationState.TO_EXECUTE_OK:
                 return {
                     status: chalk_1.default.bgBlueBright.white('Not executed'),
                     migration: it.name,
                     info: 'Will be executed during next deploy',
                 };
-            case MigrationState.TO_EXECUTE_ERROR:
+            case migrations_client_1.MigrationState.TO_EXECUTE_ERROR:
                 return { status: chalk_1.default.bgRedBright.white('ERROR'), migration: it.name, info: it.errorMessage };
             default:
                 (0, assertNever_1.assertNever)(it);

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "1.4.0-alpha.4",
+  "version": "1.4.0-beta.1",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/src/run.js"
@@ -20,15 +20,15 @@
     "tailwindcss": "^3.3.5"
   },
   "dependencies": {
-    "@contember/cli-common": "1.4.0-alpha.4",
-    "@contember/config-loader": "1.4.0-alpha.4",
-    "@contember/database": "1.4.0-alpha.4",
-    "@contember/dic": "1.4.0-alpha.4",
-    "@contember/engine-common": "1.4.0-alpha.4",
-    "@contember/engine-content-api": "1.4.0-alpha.4",
-    "@contember/schema": "1.4.0-alpha.4",
-    "@contember/schema-migrations": "1.4.0-alpha.4",
-    "@contember/schema-utils": "1.4.0-alpha.4",
+    "@contember/cli-common": "1.4.0-beta.1",
+    "@contember/config-loader": "1.4.0-beta.1",
+    "@contember/database": "1.4.0-beta.1",
+    "@contember/dic": "1.4.0-beta.1",
+    "@contember/engine-content-api": "1.4.0-beta.1",
+    "@contember/migrations-client": "1.4.0-beta.1",
+    "@contember/schema": "1.4.0-beta.1",
+    "@contember/schema-migrations": "1.4.0-beta.1",
+    "@contember/schema-utils": "1.4.0-beta.1",
     "@graphql-tools/schema": "^10.0.0",
     "chalk": "^4.1.2",
     "chalk-table": "^1.0.2",

package/src/commands/deploy/DeployCommand.ts

@@ -7,7 +7,7 @@ import {
 } from '../../utils/migrations/MigrationExecuteHelper'
 import { interactiveResolveApiToken, TenantClient } from '../../utils/tenant'
 import { interactiveResolveInstanceEnvironmentFromInput } from '../../utils/instance'
-import { createSystemUrl, SystemClient } from '../../utils/system'
+import { SystemClient } from '@contember/migrations-client'
 import { MigrationsContainerFactory } from '../../utils/migrations/MigrationsContainer'
 import { AdminClient, readAdminFiles } from '../../utils/admin'
 import prompts from 'prompts'

package/src/commands/migrations/MigrationDiffCommand.ts

@@ -7,7 +7,7 @@ import { executeMigrations, resolveMigrationStatus } from '../../utils/migration
 import prompts from 'prompts'
 import { interactiveResolveApiToken, TenantClient } from '../../utils/tenant'
 import { interactiveResolveInstanceEnvironmentFromInput } from '../../utils/instance'
-import { SystemClient } from '../../utils/system'
+import { SystemClient } from '@contember/migrations-client'
 import { loadSchema } from '../../utils/project/loadSchema'
 
 type Args = {

package/src/commands/migrations/MigrationExecuteCommand.ts

@@ -9,7 +9,7 @@ import {
 import { createMigrationStatusTable } from '../../utils/migrations/migrations'
 import { interactiveResolveInstanceEnvironmentFromInput } from '../../utils/instance'
 import { interactiveResolveApiToken, TenantClient } from '../../utils/tenant'
-import { SystemClient } from '../../utils/system'
+import { SystemClient } from '@contember/migrations-client'
 import { MigrationVersionHelper } from '@contember/schema-migrations'
 
 type Args = {

package/src/commands/migrations/MigrationStatusCommand.ts

@@ -2,8 +2,9 @@ import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-
 import { MigrationsContainerFactory } from '../../utils/migrations/MigrationsContainer'
 import { interactiveResolveInstanceEnvironmentFromInput } from '../../utils/instance'
 import { interactiveResolveApiToken } from '../../utils/tenant'
-import { SystemClient } from '../../utils/system'
-import { createMigrationStatusTable, MigrationState, sortMigrations } from '../../utils/migrations/migrations'
+import { SystemClient } from '@contember/migrations-client'
+import { MigrationState, sortMigrations } from '@contember/migrations-client'
+import { createMigrationStatusTable } from '../../utils/migrations/migrations'
 import chalk from 'chalk'
 import { resolveMigrationStatus } from '../../utils/migrations/MigrationExecuteHelper'
 

package/src/commands/migrations/SystemApiClientResolver.ts

@@ -1,6 +1,6 @@
 import { interactiveResolveInstanceEnvironmentFromInput } from '../../utils/instance'
 import { interactiveResolveApiToken } from '../../utils/tenant'
-import { SystemClient } from '../../utils/system'
+import { SystemClient } from '@contember/migrations-client'
 import { Workspace, Project } from '@contember/cli-common'
 import { Input } from '@contember/cli-common'
 

package/src/commands/project/ProjectPrintSchemaCommand.ts

@@ -13,6 +13,7 @@ import { DocumentNode, GraphQLSchema, printSchema } from 'graphql'
 import { mergeSchemas } from '@graphql-tools/schema'
 import { loadSchema } from '../../utils/project/loadSchema'
 import { normalizeSchema } from '@contember/schema-utils'
+import { MigrationsContainerFactory } from '../../utils/migrations/MigrationsContainer'
 
 type Args = {
 	project?: string
@@ -22,6 +23,7 @@ type Options = {
 	role?: string[]
 	normalize?: boolean
 	format?: 'graphql' | 'introspection' | 'schema'
+	source?: 'migrations' | 'definition'
 }
 
 export class ProjectPrintSchemaCommand extends Command<Args, Options> {
@@ -37,6 +39,7 @@ export class ProjectPrintSchemaCommand extends Command<Args, Options> {
 			configuration.argument('project')
 		}
 		configuration.option('format').valueRequired().description('graphql|introspection|schema')
+		configuration.option('source').valueRequired().description('migrations|definition')
 		configuration.option('role').valueArray()
 		configuration.option('normalize').valueNone()
 	}
@@ -47,7 +50,12 @@ export class ProjectPrintSchemaCommand extends Command<Args, Options> {
 		const format = input.getOption('format') || 'graphql'
 
 		const project = await workspace.projects.getProject(projectName, { fuzzy: true })
-		const schema = await loadSchema(project)
+		const migrationsDir = await project.migrationsDir
+		const container = new MigrationsContainerFactory(migrationsDir).create()
+		const schema = input.getOption('source') === 'migrations'
+			? await container.schemaVersionBuilder.buildSchema()
+			: await loadSchema(project)
+
 		if (!validateSchemaAndPrintErrors(schema, 'Defined schema is invalid:')) {
 			return 1
 		}