@contember/cli 0.12.0-beta.1 → 1.0.0-alpha.10

package/esbuild.js

@@ -0,0 +1,15 @@
+const esbuild = require('esbuild')
+const { resolvePlugin } = require('../../scripts/esbuild/esbuild')
+
+esbuild.build({
+	entryPoints: ['./packages/cli/src/run.ts'],
+	bundle: true,
+	platform: 'node',
+	sourcemap: 'external',
+	outfile: './dist/run.js',
+	plugins: [resolvePlugin],
+	external: ['pg-native', 'electron', 'typescript', 'ts-node'],
+}).catch(e => {
+	console.error(e)
+	process.exit(1)
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "0.12.0-beta.1",
+  "version": "1.0.0-alpha.10",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/src/run.js"
@@ -14,15 +14,15 @@
     "@types/fs-extra": "^9.0.3"
   },
   "dependencies": {
-    "@contember/cli-common": "^0.12.0-beta.1",
-    "@contember/config-loader": "^0.12.0-beta.1",
-    "@contember/database-migrations": "^0.12.0-beta.1",
-    "@contember/dic": "^0.12.0-beta.1",
-    "@contember/engine-content-api": "^0.12.0-beta.1",
-    "@contember/schema": "^0.12.0-beta.1",
-    "@contember/schema-definition": "^0.12.0-beta.1",
-    "@contember/schema-migrations": "^0.12.0-beta.1",
-    "@contember/schema-utils": "^0.12.0-beta.1",
+    "@contember/cli-common": "^1.0.0-alpha.10",
+    "@contember/config-loader": "^1.0.0-alpha.10",
+    "@contember/database-migrations": "^1.0.0-alpha.10",
+    "@contember/dic": "^1.0.0-alpha.10",
+    "@contember/engine-content-api": "^1.0.0-alpha.10",
+    "@contember/schema": "^1.0.0-alpha.10",
+    "@contember/schema-definition": "^1.0.0-alpha.10",
+    "@contember/schema-migrations": "^1.0.0-alpha.10",
+    "@contember/schema-utils": "^1.0.0-alpha.10",
     "@graphql-tools/merge": "^6.2.14",
     "chalk": "^4.1.0",
     "chalk-table": "^1.0.2",

package/src/commands/migrations/MigrationDiffCommand.ts

@@ -86,7 +86,7 @@ export class MigrationDiffCommand extends Command<Args, Options> {
 						await executeMigrations({
 							client,
 							migrations: status.migrationsToExecute,
-							requireConfirmation: !yes,
+							requireConfirmation: status.migrationsToExecute.length > 1 && !yes,
 							schemaVersionBuilder,
 							migrationDescriber,
 						})

package/src/commands/migrations/MigrationExecuteHelper.ts

@@ -82,14 +82,10 @@ export const executeMigrations = async ({
 		} while (true)
 	}
 
-	const result = await client.migrate(
+	await client.migrate(
 		migrations.map(it => it.localMigration),
 		force,
 	)
-	if (result.ok) {
-		console.log('Migration executed')
-		return 0
-	}
-	console.error(result.errors)
-	return 1
+	console.log('Migration executed')
+	return 0
 }

package/src/commands/migrations/index.ts

@@ -1,5 +1,4 @@
 export * from './MigrationAmendCommand'
-export * from './MigrationCreateCommand'
 export * from './MigrationDescribeCommand'
 export * from './MigrationDiffCommand'
 export * from './MigrationExecuteCommand'

package/src/run.ts

@@ -6,7 +6,6 @@ import {
 	DeployCommand,
 	InviteCommand,
 	MigrationAmendCommand,
-	MigrationCreateCommand,
 	MigrationDescribeCommand,
 	MigrationDiffCommand,
 	MigrationExecuteCommand,
@@ -35,7 +34,6 @@ import {
 		['migrations:diff']: diffCommandFactory,
 		['migrations:amend']: () => new MigrationAmendCommand(),
 		['migrations:describe']: migrationsDescribeFactory,
-		['migrations:create']: () => new MigrationCreateCommand(),
 		['migrations:execute']: () => new MigrationExecuteCommand(),
 		['migrations:rebase']: () => new MigrationRebaseCommand(),
 		['migrations:status']: () => new MigrationStatusCommand(),

package/src/utils/admin.ts

@@ -10,8 +10,9 @@ export class AdminClient {
 
 	public async deploy(project: string, files: AdminFiles): Promise<void> {
 		const response = await this.execute('_deploy', 'POST', { project, files })
+
 		if (!response.ok) {
-			throw 'Failed to deploy admin'
+			throw `Failed to deploy admin, POST request to ${this.url}/_deploy returned status ${response.status} ${response.statusText}`
 		}
 	}
 

package/src/utils/system/index.ts

@@ -40,7 +40,7 @@ export class SystemClient {
 		return new SystemClient(graphqlClient)
 	}
 
-	public async migrate(migrations: Migration[], force = false): Promise<MigrateResponse> {
+	public async migrate(migrations: Migration[], force = false): Promise<void> {
 		const query = `
 mutation($migrations: [Migration!]!) {
 	migrate: ${force ? 'forceMigrate' : 'migrate'}(migrations: $migrations) {
@@ -53,13 +53,16 @@ mutation($migrations: [Migration!]!) {
 	}
 }
 `
-		return (
+		const result = (
 			await this.apiClient.request<{
 				migrate: { ok: boolean; errors: { code: MigrateErrorCode; migration: string; message: string }[] }
 			}>(query, {
 				migrations,
 			})
 		).migrate
+		if (!result.ok) {
+			throw result.errors
+		}
 	}
 
 	public async migrationDelete(version: string): Promise<void> {

package/dist/src/commands/migrations/MigrationCreateCommand.d.ts

@@ -1,15 +0,0 @@
-import { Command, CommandConfiguration, Input } from '@contember/cli-common';
-declare type Args = {
-    project: string;
-    migrationName: string;
-};
-declare type Options = {
-    ['migrations-dir']?: string;
-    ['project-dir']?: string;
-};
-export declare class MigrationCreateCommand extends Command<Args, Options> {
-    protected configure(configuration: CommandConfiguration<Args, Options>): void;
-    protected execute(input: Input<Args, Options>): Promise<number>;
-}
-export {};
-//# sourceMappingURL=MigrationCreateCommand.d.ts.map

package/dist/src/commands/migrations/MigrationCreateCommand.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MigrationCreateCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationCreateCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAG5E,aAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,aAAK,OAAO,GAAG;IACd,CAAC,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAA;IAC3B,CAAC,aAAa,CAAC,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,qBAAa,sBAAuB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IACjE,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAK7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAQrE"}

package/dist/src/commands/migrations/MigrationCreateCommand.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MigrationCreateCommand = void 0;
-const cli_common_1 = require("@contember/cli-common");
-const MigrationCreateHelper_1 = require("./MigrationCreateHelper");
-class MigrationCreateCommand extends cli_common_1.Command {
-    configure(configuration) {
-        configuration.description('Creates empty schema migration for given project');
-        MigrationCreateHelper_1.configureCreateMigrationCommand(configuration);
-    }
-    async execute(input) {
-        return await MigrationCreateHelper_1.executeCreateMigrationCommand(input, async ({ migrationCreator }) => {
-            const migrationName = input.getArgument('migrationName');
-            const result = await migrationCreator.createEmpty(migrationName);
-            console.log(`${result} created`);
-            return 0;
-        });
-    }
-}
-exports.MigrationCreateCommand = MigrationCreateCommand;
-//# sourceMappingURL=MigrationCreateCommand.js.map

package/dist/src/commands/migrations/MigrationCreateCommand.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MigrationCreateCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationCreateCommand.ts"],"names":[],"mappings":";;;AAAA,sDAA4E;AAC5E,mEAAwG;AAYxG,MAAa,sBAAuB,SAAQ,oBAAsB;IACvD,SAAS,CAAC,aAAkD;QACrE,aAAa,CAAC,WAAW,CAAC,kDAAkD,CAAC,CAAA;QAC7E,uDAA+B,CAAC,aAAa,CAAC,CAAA;IAC/C,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAA2B;QAClD,OAAO,MAAM,qDAA6B,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE;YAChF,MAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;YACxD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;YAChE,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,UAAU,CAAC,CAAA;YAChC,OAAO,CAAC,CAAA;QACT,CAAC,CAAC,CAAA;IACH,CAAC;CACD;AAdD,wDAcC"}

package/src/commands/migrations/MigrationCreateCommand.ts

@@ -1,28 +0,0 @@
-import { Command, CommandConfiguration, Input } from '@contember/cli-common'
-import { configureCreateMigrationCommand, executeCreateMigrationCommand } from './MigrationCreateHelper'
-
-type Args = {
-	project: string
-	migrationName: string
-}
-
-type Options = {
-	['migrations-dir']?: string
-	['project-dir']?: string
-}
-
-export class MigrationCreateCommand extends Command<Args, Options> {
-	protected configure(configuration: CommandConfiguration<Args, Options>): void {
-		configuration.description('Creates empty schema migration for given project')
-		configureCreateMigrationCommand(configuration)
-	}
-
-	protected async execute(input: Input<Args, Options>): Promise<number> {
-		return await executeCreateMigrationCommand(input, async ({ migrationCreator }) => {
-			const migrationName = input.getArgument('migrationName')
-			const result = await migrationCreator.createEmpty(migrationName)
-			console.log(`${result} created`)
-			return 0
-		})
-	}
-}