@contember/cli 0.12.0-alpha.9 → 1.0.0-alpha.0

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

@@ -0,0 +1,8 @@
+import { JSONObject } from '@contember/cli-common/dist/src/utils/json';
+export declare type JsonUpdateCallback<Value = JSONObject> = (data: Partial<Value>, utils: {
+    merge: (a: JSONObject, b: JSONObject) => JSONObject;
+}) => Value;
+export declare const updateYaml: <Value = JSONObject>(path: string, updater: JsonUpdateCallback<Value>, options?: {
+    createMissing?: boolean;
+}) => Promise<void>;
+//# sourceMappingURL=yaml.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"yaml.d.ts","sourceRoot":"","sources":["../../../src/utils/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAiB,MAAM,2CAA2C,CAAA;AAOrF,oBAAY,kBAAkB,CAAC,KAAK,GAAG,UAAU,IAAI,CACpD,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,EACpB,KAAK,EAAE;IAAE,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,KAAK,UAAU,CAAA;CAAE,KAC1D,KAAK,CAAA;AAEV,eAAO,MAAM,UAAU,6BAChB,MAAM,gDAEH;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,kBAoBpC,CAAA"}

package/dist/src/utils/yaml.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateYaml = void 0;
+const fs_extra_1 = require("fs-extra");
+const cjs_1 = __importDefault(require("yawn-yaml/cjs"));
+const config_loader_1 = require("@contember/config-loader");
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const promises_1 = require("fs/promises");
+const updateYaml = async (path, updater, options = {}) => {
+    let config = '';
+    if (await (0, fs_extra_1.pathExists)(path)) {
+        config = await (0, promises_1.readFile)(path, { encoding: 'utf8' });
+    }
+    else if (options.createMissing !== true) {
+        throw new Error(`File ${path} does not exist.`);
+    }
+    let newConfig = '';
+    const mergeUtils = { merge: (a, b) => config_loader_1.Merger.merge(a, b) };
+    if (config) {
+        const yawn = new cjs_1.default(config);
+        yawn.json = updater(yawn.json, mergeUtils);
+        newConfig = yawn.yaml;
+    }
+    else {
+        newConfig = js_yaml_1.default.dump(updater({}, mergeUtils));
+    }
+    await (0, promises_1.writeFile)(path, newConfig, { encoding: 'utf8' });
+};
+exports.updateYaml = updateYaml;
+//# sourceMappingURL=yaml.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../../src/utils/yaml.ts"],"names":[],"mappings":";;;;;;AACA,uCAAqC;AACrC,wDAAgC;AAChC,4DAAiD;AACjD,sDAA4B;AAC5B,0CAAiD;AAO1C,MAAM,UAAU,GAAG,KAAK,EAC9B,IAAY,EACZ,OAAkC,EAClC,UAAuC,EAAE,EACxC,EAAE;IACH,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,EAAE;QAC3B,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;KACnD;SAAM,IAAI,OAAO,CAAC,aAAa,KAAK,IAAI,EAAE;QAC1C,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,kBAAkB,CAAC,CAAA;KAC/C;IAED,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,CAAC,CAAa,EAAE,CAAa,EAAE,EAAE,CAAC,sBAAM,CAAC,KAAK,CAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;IACjG,IAAI,MAAM,EAAE;QACX,MAAM,IAAI,GAAG,IAAI,aAAI,CAAC,MAAM,CAAC,CAAA;QAC7B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAC1C,SAAS,GAAG,IAAI,CAAC,IAAI,CAAA;KACrB;SAAM;QACN,SAAS,GAAG,iBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;KAChD;IAED,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;AACvD,CAAC,CAAA;AAvBY,QAAA,UAAU,cAuBtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "0.12.0-alpha.9",
+  "version": "1.0.0-alpha.0",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/src/run.js"
@@ -9,28 +9,32 @@
     "test": "echo 'No tests'"
   },
   "devDependencies": {
-    "@types/prompts": "^2.0.1"
+    "@types/prompts": "^2.0.1",
+    "@types/js-yaml": "^4.0.1",
+    "@types/fs-extra": "^9.0.3"
   },
   "dependencies": {
-    "@contember/cli-common": "^0.12.0-alpha.9",
-    "@contember/config-loader": "^0.12.0-alpha.9",
-    "@contember/database-migrations": "^0.12.0-alpha.9",
-    "@contember/dic": "^0.12.0-alpha.9",
-    "@contember/engine-content-api": "^0.12.0-alpha.9",
-    "@contember/schema": "^0.12.0-alpha.9",
-    "@contember/schema-definition": "^0.12.0-alpha.9",
-    "@contember/schema-migrations": "^0.12.0-alpha.9",
-    "@contember/schema-utils": "^0.12.0-alpha.9",
+    "@contember/cli-common": "^1.0.0-alpha.0",
+    "@contember/config-loader": "^1.0.0-alpha.0",
+    "@contember/database-migrations": "^1.0.0-alpha.0",
+    "@contember/dic": "^1.0.0-alpha.0",
+    "@contember/engine-content-api": "^1.0.0-alpha.0",
+    "@contember/schema": "^1.0.0-alpha.0",
+    "@contember/schema-definition": "^1.0.0-alpha.0",
+    "@contember/schema-migrations": "^1.0.0-alpha.0",
+    "@contember/schema-utils": "^1.0.0-alpha.0",
     "@graphql-tools/merge": "^6.2.14",
     "chalk": "^4.1.0",
     "chalk-table": "^1.0.2",
     "get-port": "^5.0.0",
     "graphql": "^15.4.0",
     "graphql-request": "^3.3.0",
+    "js-yaml": "^4.1.0",
     "node-fetch": "^2.6.1",
     "pg": "^8.5.0",
     "prompts": "^2.2.1",
     "ts-node": "^10.2.0",
-    "typescript": "^4.3.5"
+    "typescript": "^4.3.5",
+    "yawn-yaml": "^1.5.0"
   }
 }

package/src/commands/migrations/MigrationExecuteCommand.ts

@@ -1,4 +1,4 @@
-import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common'
+import { Command, CommandConfiguration, Input, validateProjectName, Workspace } from '@contember/cli-common'
 import { MigrationsContainerFactory } from '../../MigrationsContainer'
 import {
 	configureExecuteMigrationCommand,
@@ -34,61 +34,78 @@ export class MigrationExecuteCommand extends Command<Args, Options> {
 		const projectName = input.getArgument('project')
 
 		const workspace = await Workspace.get(process.cwd())
-		const project = await workspace.projects.getProject(projectName, { fuzzy: true })
-		const migrationsDir = project.migrationsDir
-		const container = new MigrationsContainerFactory(migrationsDir).create()
-		const migrationArg = input.getArgument('migration')
 
-		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input?.getOption('instance'))
-		const apiToken = await interactiveResolveApiToken({ instance })
-		const remoteProject = input?.getOption('remote-project') || project.name
-		const tenantClient = TenantClient.create(instance.baseUrl, apiToken)
-		await tenantClient.createProject(remoteProject, true)
-		const systemClient = SystemClient.create(instance.baseUrl, remoteProject, apiToken)
-
-		const force = input.getOption('force')
-		const status = await resolveMigrationStatus(systemClient, container.migrationsResolver, force)
-		if (status.errorMigrations.length > 0) {
-			console.error(createMigrationStatusTable(status.errorMigrations))
-			if (!force) {
-				throw `Cannot execute migrations`
-			}
+		const allProjects = projectName === '.'
+		if (!allProjects) {
+			validateProjectName(projectName)
+		}
+		const remoteProjectOption = input?.getOption('remote-project')
+		if (remoteProjectOption && allProjects) {
+			throw 'Option remote-project can be used only for a single project'
 		}
+		const projects = allProjects
+			? await workspace.projects.listProjects()
+			: [await workspace.projects.getProject(projectName, { fuzzy: true })]
+
+		let code = 0
+		for (const project of projects) {
+			const migrationsDir = project.migrationsDir
+			const container = new MigrationsContainerFactory(migrationsDir).create()
+			const migrationArg = input.getArgument('migration')
+
+			const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input?.getOption('instance'))
+			const apiToken = await interactiveResolveApiToken({ instance })
+			const remoteProject = remoteProjectOption || project.name
+			const tenantClient = TenantClient.create(instance.baseUrl, apiToken)
+			await tenantClient.createProject(remoteProject, true)
+			const systemClient = SystemClient.create(instance.baseUrl, remoteProject, apiToken)
 
-		const migrations = (() => {
-			if (migrationArg) {
-				const migration = findMigration(status.allMigrations, migrationArg)
-				if (!migration) {
-					throw `Undefined migration ${migrationArg}`
+			const force = input.getOption('force')
+			const status = await resolveMigrationStatus(systemClient, container.migrationsResolver, force)
+			if (status.errorMigrations.length > 0) {
+				console.error(createMigrationStatusTable(status.errorMigrations))
+				if (!force) {
+					throw `Cannot execute migrations`
 				}
-				switch (migration.state) {
-					case MigrationState.EXECUTED_OK:
-						throw `Migration ${migrationArg} is already executed`
-					case MigrationState.TO_EXECUTE_ERROR:
-					case MigrationState.EXECUTED_ERROR:
-					case MigrationState.EXECUTED_MISSING:
-						throw `Cannot execute migration ${migrationArg}: ${migration.errorMessage} (${migration.state})`
-					case MigrationState.TO_EXECUTE_OK:
-						return [migration]
-					default:
-						assertNever(migration)
+			}
+
+			const migrations = (() => {
+				if (migrationArg) {
+					const migration = findMigration(status.allMigrations, migrationArg)
+					if (!migration) {
+						throw `Undefined migration ${migrationArg}`
+					}
+					switch (migration.state) {
+						case MigrationState.EXECUTED_OK:
+							throw `Migration ${migrationArg} is already executed`
+						case MigrationState.TO_EXECUTE_ERROR:
+						case MigrationState.EXECUTED_ERROR:
+						case MigrationState.EXECUTED_MISSING:
+							throw `Cannot execute migration ${migrationArg}: ${migration.errorMessage} (${migration.state})`
+						case MigrationState.TO_EXECUTE_OK:
+							return [migration]
+						default:
+							assertNever(migration)
+					}
+				} else {
+					return status.migrationsToExecute
 				}
-			} else {
-				return status.migrationsToExecute
+			})()
+			if (migrations.length === 0) {
+				console.log('No migrations to execute')
+				continue
 			}
-		})()
-		if (migrations.length === 0) {
-			console.log('No migrations to execute')
-			return 0
-		}
 
-		return await executeMigrations({
-			migrationDescriber: container.migrationDescriber,
-			schemaVersionBuilder: container.schemaVersionBuilder,
-			client: systemClient,
-			migrations,
-			requireConfirmation: !input.getOption('yes'),
-			force: force,
-		})
+			const singleCode = await executeMigrations({
+				migrationDescriber: container.migrationDescriber,
+				schemaVersionBuilder: container.schemaVersionBuilder,
+				client: systemClient,
+				migrations,
+				requireConfirmation: !input.getOption('yes'),
+				force: force,
+			})
+			code ||= singleCode
+		}
+		return code
 	}
 }

package/src/commands/migrations/MigrationExecuteHelper.ts

@@ -49,7 +49,7 @@ export const executeMigrations = async ({
 	schemaVersionBuilder: SchemaVersionBuilder
 	migrationDescriber: MigrationDescriber
 	force?: boolean
-}) => {
+}): Promise<number> => {
 	console.log('Will execute following migrations:')
 	migrations.forEach(it => console.log(it.name))
 	if (requireConfirmation) {
@@ -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/project/ProjectCreateCommand.ts

@@ -22,8 +22,7 @@ export class ProjectCreateCommand extends Command<Args, Options> {
 		const workspace = await Workspace.get(process.cwd())
 
 		const template = input.getOption('template')
-		const project = await workspace.projects.createProject(projectName, { template })
-		await project.register()
+		await workspace.projects.createProject(projectName, { template })
 
 		console.log(`Project ${projectName} created`)
 	}

package/src/commands/project/ProjectValidateCommand.ts

@@ -67,7 +67,7 @@ export class ProjectValidateCommand extends Command<Args, Options> {
 			console.groupEnd()
 			valid = valid && projectValid
 		}
-		if (invalidProjects) {
+		if (invalidProjects.length) {
 			console.log('Following projects failed the validation:')
 			invalidProjects.forEach(it => console.log(it))
 		}

package/src/commands/workspace/WorkspaceUpdateApiCommand.ts

@@ -1,7 +1,7 @@
-import { Command, CommandConfiguration, Input } from '@contember/cli-common'
-import { Workspace } from '@contember/cli-common'
-import { updateMainDockerComposeConfig } from '@contember/cli-common'
+import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common'
 import { updateNpmPackages } from '../../utils/npm'
+import { updateWorkspaceApiVersion } from '../../utils/workspace'
+import { updateMainDockerComposeConfig } from '../../utils/dockerCompose'
 
 type Args = {
 	version: string
@@ -11,7 +11,7 @@ type Options = {}
 
 export class WorkspaceUpdateApiCommand extends Command<Args, Options> {
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
-		configuration.description('Updates contember API version and all related packages')
+		configuration.description('Updates Contember API version and all related packages')
 		configuration.argument('version')
 	}
 
@@ -20,42 +20,44 @@ export class WorkspaceUpdateApiCommand extends Command<Args, Options> {
 		const workspace = await Workspace.get(process.cwd())
 		const upgradablePackages = ['@contember/schema', '@contember/schema-definition', '@contember/cli']
 
-		await updateNpmPackages(
-			upgradablePackages.map(it => ({ name: it, version })),
-			workspace.directory,
-		)
+		await updateNpmPackages(upgradablePackages.map(it => ({ name: it, version })), workspace.directory)
+
 		const prevVersion = workspace.apiVersion
-		if (await workspace.updateApiVersion(version)) {
-			console.log('contember.workspace.yaml updated')
+		const updatedYaml = await updateWorkspaceApiVersion(workspace, version)
+
+		if (updatedYaml) {
+			console.log(`${updatedYaml} updated`)
 		} else {
-			console.log('contember.workspace.yaml not found, skipping')
+			console.log('contember.yaml not found, skipping')
 		}
-		console.log('Updating docker-compose')
-		await updateMainDockerComposeConfig(workspace.directory, (data: any) => {
-			const apiServiceName = data.services?.['contember'] ? 'contember' : 'api'
-			if (!data.services?.[apiServiceName]) {
-				console.log(`docker-compose.yaml file not found, skipping`)
-				return
-			}
-			const expectedImage = `contember/contember:${prevVersion}`
-			if (data.services[apiServiceName].image !== expectedImage) {
-				console.log(
-					`API image in docker-compose.yaml file is ${data.services[apiServiceName].image}, but ${expectedImage} is expected. Skipping`,
-				)
-				return data
-			}
 
-			return {
-				...data,
-				services: {
-					...data.services,
-					[apiServiceName]: {
-						...data.services?.[apiServiceName],
-						image: `contember/contember:${version}`,
-					},
-				},
+		console.log('Updating docker-compose')
+		const getNewImage = (currentImage: string): string | null => {
+			for (const candidate of ['contember/engine', 'contember/contember', 'contember/cli']) {
+				if (prevVersion && currentImage === `${candidate}:${prevVersion}` || !prevVersion && currentImage.startsWith(`${candidate}:`)) {
+					return `${candidate}:${version}`
+				}
 			}
-		})
-		console.log('API update successful')
+			return null
+		}
+		await updateMainDockerComposeConfig(workspace.directory, data => ({
+			...data,
+			services: Object.fromEntries(Object.entries(data?.services ?? {}).map(([name, service]: [string, any]) => {
+				const newImage = getNewImage(service.image)
+				if (newImage) {
+					console.log(`docker-compose service ${service} updated`)
+					return [
+						name,
+						{
+							...service,
+							image: newImage,
+						},
+					]
+				}
+				return [name, service]
+			})),
+		}))
+		console.log('API versions updated')
+		console.log('Restart server to apply changes')
 	}
 }

package/src/run.ts

@@ -59,7 +59,7 @@ import {
 	}
 	const cliVersion = getPackageVersion()
 	const app = new Application(commandManager, `Contember CLI version ${cliVersion}`)
-	await app.run(process.argv)
+	await app.run(process.argv.slice(2))
 })().catch(e => {
 	console.log(e)
 	process.exit(1)

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/dockerCompose.ts

@@ -0,0 +1,38 @@
+import { join } from 'path'
+import { pathExists } from 'fs-extra'
+import { JsonUpdateCallback, updateYaml } from './yaml'
+
+const MAIN_CONFIGS = ['docker-compose.yaml', 'docker-compose.yml']
+
+export interface DockerComposeServiceConfig {
+	image?: string
+	command?: string
+	user?: string
+	environment?: Record<string, string>
+	ports?: (string | {})[] // todo long syntax
+}
+
+export interface DockerComposeConfig {
+	[key: string]: unknown
+
+	version?: string
+	services?: Record<string, DockerComposeServiceConfig>
+}
+
+const resolvePath = async (dir: string, possibleFileNames: string[], fallbackFileName: string): Promise<string> => {
+	for (const file of possibleFileNames) {
+		const path = join(dir, file)
+		if (await pathExists(path)) {
+			return path
+		}
+	}
+	return join(dir, fallbackFileName)
+}
+
+export const updateMainDockerComposeConfig = async (
+	dir: string,
+	updater: JsonUpdateCallback<DockerComposeConfig>,
+): Promise<void> => {
+	const path = process.env.COMPOSE_FILE || (await resolvePath(dir, MAIN_CONFIGS, MAIN_CONFIGS[0]))
+	return updateYaml(path, updater, { createMissing: true })
+}

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/src/utils/workspace.ts

@@ -0,0 +1,22 @@
+import { pathExists } from 'fs-extra'
+import { formatWorkspaceConfigPath, Workspace } from '@contember/cli-common'
+import { updateYaml } from './yaml'
+
+export const updateWorkspaceApiVersion = async (workspace: Workspace, newVersion: string): Promise<string | null> => {
+	const possiblePaths = formatWorkspaceConfigPath(workspace.directory)
+	for (const configPath of possiblePaths) {
+		if (await pathExists(configPath)) {
+			await updateYaml(configPath, data => {
+				return {
+					...data,
+					api: {
+						...(typeof data.api === 'object' ? data.api : {}),
+						version: newVersion,
+					},
+				}
+			})
+			return configPath.slice(workspace.directory.length)
+		}
+	}
+	return null
+}

package/src/utils/yaml.ts

@@ -0,0 +1,37 @@
+import { JSONObject, JSONPrimitive } from '@contember/cli-common/dist/src/utils/json'
+import { pathExists } from 'fs-extra'
+import YAWN from 'yawn-yaml/cjs'
+import { Merger } from '@contember/config-loader'
+import jsyaml from 'js-yaml'
+import { readFile, writeFile } from 'fs/promises'
+
+export type JsonUpdateCallback<Value = JSONObject> = (
+	data: Partial<Value>,
+	utils: { merge: (a: JSONObject, b: JSONObject) => JSONObject },
+) => Value
+
+export const updateYaml = async <Value = JSONObject>(
+	path: string,
+	updater: JsonUpdateCallback<Value>,
+	options: { createMissing?: boolean } = {},
+) => {
+	let config = ''
+	if (await pathExists(path)) {
+		config = await readFile(path, { encoding: 'utf8' })
+	} else if (options.createMissing !== true) {
+		throw new Error(`File ${path} does not exist.`)
+	}
+
+	let newConfig = ''
+	const mergeUtils = { merge: (a: JSONObject, b: JSONObject) => Merger.merge<JSONPrimitive>(a, b) }
+	if (config) {
+		const yawn = new YAWN(config)
+		yawn.json = updater(yawn.json, mergeUtils)
+		newConfig = yawn.yaml
+	} else {
+		newConfig = jsyaml.dump(updater({}, mergeUtils))
+	}
+
+	await writeFile(path, newConfig, { encoding: 'utf8' })
+}
+

package/types/yawn-yaml/index.d.ts

@@ -0,0 +1,7 @@
+declare module 'yawn-yaml/cjs' {
+	export default class YAWN {
+		json: any
+		readonly yaml: string
+		constructor(yaml: string)
+	}
+}