@contember/cli 2.0.0-alpha.38 → 2.0.0-alpha.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "2.0.0-alpha.38",
+  "version": "2.0.0-alpha.40",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/production/run.js"
@@ -20,18 +20,18 @@
     "tailwindcss": "^3.4.14"
   },
   "dependencies": {
-    "@contember/cli-common": "2.0.0-alpha.38",
-    "@contember/config-loader": "2.0.0-alpha.38",
-    "@contember/database": "2.0.0-alpha.38",
-    "@contember/dic": "2.0.0-alpha.38",
-    "@contember/engine-common": "2.0.0-alpha.38",
-    "@contember/engine-content-api": "2.0.0-alpha.38",
-    "@contember/graphql-client": "2.0.0-alpha.38",
-    "@contember/migrations-client": "2.0.0-alpha.38",
-    "@contember/schema": "2.0.0-alpha.38",
-    "@contember/schema-migrations": "2.0.0-alpha.38",
-    "@contember/schema-utils": "2.0.0-alpha.38",
-    "@contember/typesafe": "2.0.0-alpha.38",
+    "@contember/cli-common": "2.0.0-alpha.40",
+    "@contember/config-loader": "2.0.0-alpha.40",
+    "@contember/database": "2.0.0-alpha.40",
+    "@contember/dic": "2.0.0-alpha.40",
+    "@contember/engine-common": "2.0.0-alpha.40",
+    "@contember/engine-content-api": "2.0.0-alpha.40",
+    "@contember/graphql-client": "2.0.0-alpha.40",
+    "@contember/migrations-client": "2.0.0-alpha.40",
+    "@contember/schema": "2.0.0-alpha.40",
+    "@contember/schema-migrations": "2.0.0-alpha.40",
+    "@contember/schema-utils": "2.0.0-alpha.40",
+    "@contember/typesafe": "2.0.0-alpha.40",
     "@graphql-tools/schema": "^10.0.7",
     "chalk": "^5.3.0",
     "chalk-table": "^1.0.2",

package/src/commands/migrations/MigrationAmendCommand.ts

@@ -106,7 +106,7 @@ export class MigrationAmendCommand extends Command<Args, Options> {
 			await systemClient.migrate([intermediateResult.migration], force)
 			await systemClient.migrationDelete(intermediateResult.migration.version)
 
-			if (!newMigrationResult) {
+			if (!newMigrationResult && await this.shouldRemove()) {
 				await this.migrationCreator.removeMigration(amendMigration.name)
 				await systemClient.migrationDelete(amendMigration.version)
 				console.log('Latest migration was removed')
@@ -115,8 +115,8 @@ export class MigrationAmendCommand extends Command<Args, Options> {
 			const newMigration = {
 				name: amendMigration.name,
 				version: amendMigration.version,
-				formatVersion: newMigrationResult.migration.formatVersion,
-				modifications: newMigrationResult.migration.modifications,
+				formatVersion: newMigrationResult?.migration.formatVersion ?? amendMigration.formatVersion,
+				modifications: newMigrationResult?.migration.modifications ?? [],
 			}
 			await this.migrationCreator.saveMigration(newMigration)
 			await systemClient.migrationModify(amendMigration.version, newMigration)
@@ -147,4 +147,17 @@ export class MigrationAmendCommand extends Command<Args, Options> {
 		})
 		return action === 'yes'
 	}
+
+	private async shouldRemove(): Promise<boolean> {
+		const { action } = await prompts({
+			type: 'select',
+			name: 'action',
+			message: 'The amendment results in a no-op migration because the changes introduced by the latest migration were reverted.\nYou can choose to remove the latest migration or to modify it so it is empty.',
+			choices: [
+				{ value: 'remove', title: 'Remove latest migration' },
+				{ value: 'keep', title: 'Keep latest migration and make it empty' },
+			],
+		})
+		return action === 'remove'
+	}
 }

package/src/commands/migrations/MigrationDiffCommand.ts

@@ -95,7 +95,7 @@ export class MigrationDiffCommand extends Command<Args, Options> {
 		if (shouldExecute) {
 			await this.migrationExecutorFacade.execute({
 				force: false,
-				requireConfirmation: !yes,
+				requireConfirmation: migrations => migrations.length !== 1 && !yes,
 			})
 		}
 	}

package/src/consts.ts

@@ -1,5 +1,7 @@
-import { join } from 'node:path'
+import { findPackageRoot } from '@contember/cli-common'
 import { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
-export const packageRoot = process.env.CONTEMBER_CLI_PACKAGE_ROOT || join(dirname(fileURLToPath(import.meta.url)), '../')
+
+const currentFilePath = dirname(fileURLToPath(import.meta.url))
+export const packageRoot = process.env.CONTEMBER_CLI_PACKAGE_ROOT || findPackageRoot(currentFilePath)
 export const contemberDockerImages = ['contember/engine', 'contember/engine-ee', 'contember/cli']

package/src/dic.ts

@@ -150,7 +150,9 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 		.addService('schemaVersionBuilder', ({ migrationsResolver, schemaMigrator }) =>
 			new SchemaVersionBuilder(migrationsResolver, schemaMigrator))
 		.addService('schemaDiffer', ({ schemaMigrator }) =>
-			new SchemaDiffer(schemaMigrator))
+			new SchemaDiffer(schemaMigrator, {
+				maxPatchSize: env.migrationsOptions?.maxPatchSize,
+			}))
 		.addService('migrationCreator', ({ migrationFilesManager, schemaDiffer }) =>
 			new MigrationCreator(migrationFilesManager, schemaDiffer, {
 				json: JSON.stringify({ formatVersion: VERSION_LATEST, modifications: [] }, undefined, '\t') + '\n',

package/src/lib/env.ts

@@ -6,6 +6,9 @@ export interface CliEnv {
 	dockerComposeFile?: string
 	dsn?: string
 	dir?: string
+	migrationsOptions?: {
+		maxPatchSize?: number
+	}
 }
 
 export const readCliEnv = (): CliEnv => {
@@ -17,5 +20,8 @@ export const readCliEnv = (): CliEnv => {
 		projectName: process.env.CONTEMBER_PROJECT_NAME,
 		dockerComposeFile: process.env.COMPOSE_FILE,
 		dsn: process.env.CONTEMBER_DSN,
+		migrationsOptions: {
+			maxPatchSize: process.env.CONTEMBER_MIGRATIONS_MAX_PATCH_SIZE ? parseInt(process.env.CONTEMBER_MIGRATIONS_MAX_PATCH_SIZE) : undefined,
+		},
 	}
 }

package/src/lib/migrations/MigrationExecutionFacade.ts

@@ -1,6 +1,6 @@
 import prompts from 'prompts'
 import { MigrationPrinter } from './MigrationPrinter'
-import { isSchemaMigration, MigrationExecutor, SchemaVersionBuilder } from '@contember/migrations-client'
+import { isSchemaMigration, MigrationExecutor, MigrationToExecuteOkStatus, SchemaVersionBuilder } from '@contember/migrations-client'
 import { MigrationsStatusFacade } from './MigrationsStatusFacade'
 import { MigrationVersionHelper } from '@contember/engine-common'
 import { RemoteProject } from '../project/RemoteProject'
@@ -26,7 +26,7 @@ export class MigrationExecutionFacade {
 		until,
 		additionalMessage,
 	}: {
-		requireConfirmation: boolean
+		requireConfirmation: boolean | ((migrations: MigrationToExecuteOkStatus[]) => boolean)
 		force?: boolean
 		until?: string
 		additionalMessage?: string
@@ -46,7 +46,7 @@ export class MigrationExecutionFacade {
 		migrations.forEach(it => console.log(it.name))
 		additionalMessage && console.log(additionalMessage)
 
-		if (requireConfirmation) {
+		if (typeof requireConfirmation === 'function' ? requireConfirmation(migrations) : requireConfirmation) {
 			if (!process.stdin.isTTY) {
 				throw 'TTY not available. Pass --yes option to confirm execution.'
 			}