@contember/cli 2.1.0-alpha.3 → 2.1.0-alpha.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "2.1.0-alpha.3",
+  "version": "2.1.0-alpha.35",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/production/run.js"
@@ -10,43 +10,47 @@
     "build": "tailwindcss -i src/lib/project/docs/resources/style.css -o ./dist/resources/out.css"
   },
   "devDependencies": {
-    "@types/fs-extra": "^11.0.4",
-    "@types/js-yaml": "^4.0.9",
-    "@types/node": "^20.17.22",
-    "@types/prompts": "^2.4.9",
-    "@types/semver": "^7.5.8",
-    "autoprefixer": "^10.4.20",
-    "postcss": "^8.4.47",
-    "tailwindcss": "^3.4.14"
+    "@tailwindcss/cli": "catalog:",
+    "@types/fs-extra": "catalog:",
+    "@types/js-yaml": "catalog:",
+    "@types/node": "catalog:",
+    "@types/prompts": "catalog:",
+    "@types/semver": "catalog:",
+    "tailwindcss": "catalog:"
   },
   "dependencies": {
-    "@contember/cli-common": "2.1.0-alpha.3",
-    "@contember/config-loader": "2.1.0-alpha.3",
-    "@contember/database": "2.1.0-alpha.3",
-    "@contember/dic": "2.1.0-alpha.3",
-    "@contember/engine-common": "2.1.0-alpha.3",
-    "@contember/engine-content-api": "2.1.0-alpha.3",
-    "@contember/graphql-client": "2.1.0-alpha.3",
-    "@contember/migrations-client": "2.1.0-alpha.3",
-    "@contember/schema": "2.1.0-alpha.3",
-    "@contember/schema-migrations": "2.1.0-alpha.3",
-    "@contember/schema-utils": "2.1.0-alpha.3",
-    "@contember/typesafe": "2.1.0-alpha.3",
-    "@graphql-tools/schema": "^10.0.7",
-    "chalk": "^5.3.0",
-    "chalk-table": "^1.0.2",
-    "fast-glob": "^3.3.2",
-    "graphql": "^16.9.0",
-    "js-yaml": "^4.1.0",
-    "lodash-es": "^4.17.21",
-    "pg": "^8.12.0",
-    "preact": "^10.23.2",
-    "preact-render-to-string": "^6.5.11",
-    "prompts": "^2.4.2",
-    "semver": "^7.6.3",
-    "yawn-yaml": "^2.3.0"
+    "@contember/cli-common": "workspace:*",
+    "@contember/config-loader": "workspace:*",
+    "@contember/database": "workspace:*",
+    "@contember/dic": "workspace:*",
+    "@contember/engine-common": "workspace:*",
+    "@contember/engine-content-api": "workspace:*",
+    "@contember/graphql-client": "workspace:*",
+    "@contember/migrations-client": "workspace:*",
+    "@contember/schema": "workspace:*",
+    "@contember/schema-migrations": "workspace:*",
+    "@contember/schema-utils": "workspace:*",
+    "@contember/typesafe": "workspace:*",
+    "@graphql-tools/schema": "catalog:",
+    "chalk": "catalog:",
+    "chalk-table": "catalog:",
+    "fast-glob": "catalog:",
+    "graphql": "catalog:",
+    "js-yaml": "catalog:",
+    "lodash-es": "catalog:",
+    "pg": "catalog:",
+    "preact": "catalog:",
+    "preact-render-to-string": "catalog:",
+    "prompts": "catalog:",
+    "semver": "catalog:",
+    "yawn-yaml": "catalog:"
   },
   "peerDependencies": {
-    "esbuild": "*"
+    "esbuild": "catalog:"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/contember/contember.git",
+    "directory": "packages/cli"
   }
 }

package/src/commands/actions/ActionsGetEventCommand.ts

@@ -0,0 +1,41 @@
+import { Command, CommandConfiguration, Input } from '@contember/cli-common'
+import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
+import { ActionsClient } from '../../lib/actions/ActionsClient'
+
+type Args = {
+	eventId: string
+}
+
+type Options = {
+	project?: string
+}
+
+export class ActionsGetEventCommand extends Command<Args, Options> {
+	constructor(
+		private readonly remoteProjectResolver: RemoteProjectResolver,
+	) {
+		super()
+	}
+
+	protected configure(configuration: CommandConfiguration<Args, Options>): void {
+		configuration.description('Get single event')
+		configuration.argument('eventId')
+		configuration.option('project').valueRequired()
+	}
+
+	protected async execute(input: Input<Args, Options>): Promise<void | number> {
+		const dsn = input.getOption('project')
+		const project = await this.remoteProjectResolver.resolve(dsn)
+		if (!project) {
+			throw `Project not defined`
+		}
+		const api = ActionsClient.create(project.endpoint, project.name, project.token)
+
+		const result = await api.getEvent(input.getArgument('eventId'))
+		if (!result) {
+			console.log('Event not found')
+			return 1
+		}
+		console.log(JSON.stringify(result, null, 2))
+	}
+}

package/src/commands/actions/ActionsListFailedEventsCommand.ts

@@ -0,0 +1,68 @@
+import { Command, CommandConfiguration, Input } from '@contember/cli-common'
+import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
+import { ActionsClient } from '../../lib/actions/ActionsClient'
+import chalkTable from 'chalk-table'
+type Args = {}
+
+type Options = {
+	project?: string
+	json?: boolean
+}
+
+export class ActionsListFailedEventsCommand extends Command<Args, Options> {
+	constructor(
+		private readonly remoteProjectResolver: RemoteProjectResolver,
+	) {
+		super()
+	}
+
+	protected configure(configuration: CommandConfiguration<Args, Options>): void {
+		configuration.description('Show failed events')
+		configuration.option('project').valueRequired()
+		configuration.option('json').valueNone()
+	}
+
+	protected async execute(input: Input<Args, Options>): Promise<void | number> {
+		const dsn = input.getOption('project')
+		const project = await this.remoteProjectResolver.resolve(dsn)
+		if (!project) {
+			throw `Project not defined`
+		}
+		const api = ActionsClient.create(project.endpoint, project.name, project.token)
+
+		const result = await api.listFailedEvents()
+		if (input.getOption('json')) {
+			console.log(JSON.stringify(result, null, 2))
+			return
+		}
+		if (result.length === 0) {
+			console.log('No failed events')
+			return
+		}
+		const table = chalkTable(
+			{
+				columns: [
+					{ field: 'id', name: 'ID' },
+					{ field: 'createdAt', name: 'Created at' },
+					{ field: 'lastStateChange', name: 'Last state change' },
+					{ field: 'visibleAt', name: 'Visible at' },
+					{ field: 'numRetries', name: 'Retries' },
+					{ field: 'state', name: 'State' },
+					{ field: 'target', name: 'Target' },
+					{ field: 'log', name: 'Log' },
+				],
+			},
+			result.map(it => ({
+				id: it.id,
+				createdAt: it.createdAt,
+				lastStateChange: it.lastStateChange,
+				visibleAt: it.visibleAt || '',
+				numRetries: it.numRetries.toString(),
+				state: it.state,
+				target: it.target,
+				log: JSON.stringify(it.log.length > 0 ? it.log[it.log.length - 1] : {}),
+			})),
+		)
+		console.log(table)
+	}
+}

package/src/commands/actions/ActionsListVariablesCommand.ts

@@ -0,0 +1,36 @@
+import { Command, CommandConfiguration, Input } from '@contember/cli-common'
+import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
+import { ActionsClient } from '../../lib/actions/ActionsClient'
+import chalkTable from 'chalk-table'
+
+type Args = {}
+
+type Options = {
+	project?: string
+}
+
+export class ActionsListVariablesCommand extends Command<Args, Options> {
+	constructor(
+		private readonly remoteProjectResolver: RemoteProjectResolver,
+	) {
+		super()
+	}
+
+	protected configure(configuration: CommandConfiguration<Args, Options>): void {
+		configuration.description('Show action variables')
+		configuration.option('project').valueRequired()
+	}
+
+	protected async execute(input: Input<Args, Options>): Promise<void | number> {
+		const dsn = input.getOption('project')
+		const project = await this.remoteProjectResolver.resolve(dsn)
+		if (!project) {
+			throw `Project not defined`
+		}
+		const api = ActionsClient.create(project.endpoint, project.name, project.token)
+		const result = await api.listVariables()
+		console.log(chalkTable({
+			columns: ['name', 'value'],
+		}, result))
+	}
+}

package/src/commands/actions/ActionsRetryEventCommand.ts

@@ -0,0 +1,42 @@
+import { Command, CommandConfiguration, Input } from '@contember/cli-common'
+import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
+import { ActionsClient } from '../../lib/actions/ActionsClient'
+import chalkTable from 'chalk-table'
+type Args = {
+	eventId: string
+}
+
+type Options = {
+	project?: string
+}
+
+export class ActionsRetryEventCommand extends Command<Args, Options> {
+	constructor(
+		private readonly remoteProjectResolver: RemoteProjectResolver,
+	) {
+		super()
+	}
+
+	protected configure(configuration: CommandConfiguration<Args, Options>): void {
+		configuration.description('Retry given event')
+		configuration.argument('eventId')
+		configuration.option('project').valueRequired()
+	}
+
+	protected async execute(input: Input<Args, Options>): Promise<void | number> {
+		const dsn = input.getOption('project')
+		const project = await this.remoteProjectResolver.resolve(dsn)
+		if (!project) {
+			throw `Project not defined`
+		}
+		const api = ActionsClient.create(project.endpoint, project.name, project.token)
+
+		const result = await api.retryEvent(input.getArgument('eventId'))
+		if (result) {
+			console.log('Event requeued for processing')
+		} else {
+			console.log('Failed to requeue event. Check the event status')
+			return 1
+		}
+	}
+}

package/src/commands/actions/ActionsSetVariablesCommand.ts

@@ -0,0 +1,62 @@
+import { Command, CommandConfiguration, Input } from '@contember/cli-common'
+import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
+import { ActionsClient } from '../../lib/actions/ActionsClient'
+
+type Args = {
+	variables: string[]
+}
+
+type Options = {
+	project?: string
+	merge?: boolean
+	set?: boolean
+	['append-only-missing']?: boolean
+}
+
+export class ActionsSetVariablesCommand extends Command<Args, Options> {
+	constructor(
+		private readonly remoteProjectResolver: RemoteProjectResolver,
+	) {
+		super()
+	}
+
+	protected configure(configuration: CommandConfiguration<Args, Options>): void {
+		configuration.description('Set action variables')
+		configuration.option('project').valueRequired()
+		configuration.option('merge').valueNone().description('merges with new values (default behaviour)')
+		configuration.option('set').valueNone().description('replaces all variables')
+		configuration.option('append-only-missing').valueNone().description('appends values if not already exist')
+		configuration.argument('variables').variadic().description('variables to set, in the form of name=value')
+	}
+
+	protected async execute(input: Input<Args, Options>): Promise<void | number> {
+		const dsn = input.getOption('project')
+		const project = await this.remoteProjectResolver.resolve(dsn)
+		if (!project) {
+			throw `Project not defined`
+		}
+		const api = ActionsClient.create(project.endpoint, project.name, project.token)
+		const mode = input.getOption('merge')
+			? 'MERGE' as const
+			: input.getOption('set')
+			? 'SET' as const
+			: input.getOption('append-only-missing')
+			? 'APPEND_ONLY_MISSING' as const
+			: 'MERGE' as const
+
+		const variables = input.getArgument('variables').flatMap(it => it.split('\n')).filter(it => it.trim().length > 0)
+		const result = await api.setVariables(
+			variables.map(it => {
+				const [name, value] = it.split('=')
+				return { name, value }
+			}),
+			mode,
+		)
+		if (result) {
+			console.log('Success')
+		} else {
+			console.error('Failed')
+			return 1
+		}
+	}
+}

package/src/commands/actions/ActionsStopEventCommand.ts

@@ -0,0 +1,42 @@
+import { Command, CommandConfiguration, Input } from '@contember/cli-common'
+import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
+import { ActionsClient } from '../../lib/actions/ActionsClient'
+import chalkTable from 'chalk-table'
+type Args = {
+	eventId: string
+}
+
+type Options = {
+	project?: string
+}
+
+export class ActionsStopEventCommand extends Command<Args, Options> {
+	constructor(
+		private readonly remoteProjectResolver: RemoteProjectResolver,
+	) {
+		super()
+	}
+
+	protected configure(configuration: CommandConfiguration<Args, Options>): void {
+		configuration.description('Stop given event')
+		configuration.argument('eventId')
+		configuration.option('project').valueRequired()
+	}
+
+	protected async execute(input: Input<Args, Options>): Promise<void | number> {
+		const dsn = input.getOption('project')
+		const project = await this.remoteProjectResolver.resolve(dsn)
+		if (!project) {
+			throw `Project not defined`
+		}
+		const api = ActionsClient.create(project.endpoint, project.name, project.token)
+
+		const result = await api.stopEvent(input.getArgument('eventId'))
+		if (result) {
+			console.log('Event stopped')
+		} else {
+			console.log('Failed to stop event. Check the event id.')
+			return 1
+		}
+	}
+}

package/src/commands/deploy/DeployCommand.ts

@@ -48,7 +48,6 @@ export class DeployCommand extends Command<Args, Options> {
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<void | number> {
-
 		const dsn = input.getArgument('dsn')
 		const adminEndpoint = input.getOption('admin')
 		const remoteProject = this.remoteProjectResolver.resolve(dsn, adminEndpoint)
@@ -63,7 +62,6 @@ export class DeployCommand extends Command<Args, Options> {
 
 		const deployAdmin = input.getOption('no-admin') !== true && !!remoteProject.adminEndpoint && !!projectAdminDistDir
 
-
 		console.log('')
 		console.log('Contember project deployment configuration:')
 		console.log(`Target project name: ${remoteProject.name}`)
@@ -72,7 +70,6 @@ export class DeployCommand extends Command<Args, Options> {
 		console.log(`Deploy token: ${maskToken(remoteProject.token)}`)
 		console.log('')
 
-
 		if (deployAdmin && !(await this.fs.pathExists(`${projectAdminDistDir}/index.html`))) {
 			throw `Missing ${projectAdminDistDir}/index.html. Please build admin before deploying.`
 		}

package/src/commands/migrations/MigrationAmendCommand.ts

@@ -58,7 +58,6 @@ export class MigrationAmendCommand extends Command<Args, Options> {
 			throw `Some migrations are not executed. Unable to amend.`
 		}
 
-
 		const schema = await this.schemaLoader.loadSchema()
 		try {
 			const initialSchema = await this.schemaVersionBuilder.buildSchema()
@@ -152,7 +151,8 @@ export class MigrationAmendCommand extends Command<Args, Options> {
 		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.',
+			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' },

package/src/commands/migrations/MigrationBlankCommand.ts

@@ -6,8 +6,7 @@ type Args = {
 	format?: string
 }
 
-type Options = {
-}
+type Options = {}
 
 export class MigrationBlankCommand extends Command<Args, Options> {
 	constructor(
@@ -31,4 +30,3 @@ export class MigrationBlankCommand extends Command<Args, Options> {
 		return 0
 	}
 }
-

package/src/commands/migrations/MigrationDescribeCommand.ts

@@ -11,7 +11,6 @@ type Options = {
 	['no-sql']: boolean
 }
 
-
 export class MigrationDescribeCommand extends Command<Args, Options> {
 	constructor(
 		private readonly migrationPrinter: MigrationPrinter,

package/src/commands/migrations/MigrationDiffCommand.ts

@@ -58,7 +58,6 @@ export class MigrationDiffCommand extends Command<Args, Options> {
 			}
 			this.migrationPrinter.printMigrationDescription(result.initialSchema, result.migration, { noSql: true })
 
-
 			if (!yes) {
 				const { action } = await prompts({
 					type: 'select',
@@ -82,7 +81,6 @@ export class MigrationDiffCommand extends Command<Args, Options> {
 			const filename = await this.migrationCreator.saveMigration(result.migration)
 
 			console.log(`${filename} created`)
-
 		} catch (e) {
 			if (e instanceof InvalidSchemaException) {
 				printValidationErrors(e.validationErrors, e.message)

package/src/commands/migrations/MigrationExecuteCommand.ts

@@ -1,8 +1,7 @@
 import { Command, CommandConfiguration, Input } from '@contember/cli-common'
 import { MigrationExecutionFacade } from '../../lib/migrations/MigrationExecutionFacade'
 
-type Args = {
-}
+type Args = {}
 
 type Options = {
 	until?: string

package/src/commands/migrations/MigrationRebaseCommand.ts

@@ -18,7 +18,6 @@ export class MigrationRebaseCommand extends Command<Args, Options> {
 		super()
 	}
 
-
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Rebase migrations on filesystem and in local instance')
 		configuration.argument('migration').variadic()
@@ -29,7 +28,6 @@ export class MigrationRebaseCommand extends Command<Args, Options> {
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<void> {
-
 		const migrationNames = input.getArgument('migration')
 
 		const migrations: Migration[] = []

package/src/commands/migrations/MigrationStatusCommand.ts

@@ -5,8 +5,7 @@ import { MigrationsStatusFacade } from '../../lib/migrations/MigrationsStatusFac
 import { MigrationPrinter } from '../../lib/migrations/MigrationPrinter'
 import { SystemClientProvider } from '../../lib/SystemClientProvider'
 
-type Args = {
-}
+type Args = {}
 
 type Options = {
 	['only-to-execute']?: true
@@ -41,7 +40,6 @@ export class MigrationStatusCommand extends Command<Args, Options> {
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<number> {
-
 		const onlyErrors = input.getOption('only-errors')
 		const onlyToExecute = input.getOption('only-to-execute')
 		const restoreMissing = input.getOption('restore-missing')
@@ -68,17 +66,14 @@ export class MigrationStatusCommand extends Command<Args, Options> {
 			status = await this.migrationsStatusFacade.resolveMigrationsStatus({})
 		}
 
+		const filtered = onlyErrors || onlyToExecute
+			? sortMigrations([
+				...(onlyErrors ? status.errorMigrations : []),
+				...(onlyToExecute ? status.migrationsToExecute : []),
+			])
+			: status.allMigrations
 
-
-		const filtered =
-			onlyErrors || onlyToExecute
-				? sortMigrations([
-					...(onlyErrors ? status.errorMigrations : []),
-					...(onlyToExecute ? status.migrationsToExecute : []),
-				  ])
-				: status.allMigrations
-
-		this.migrationPrinter.printStatusTable(filtered)
+		console.log(this.migrationPrinter.printStatusTable(filtered))
 
 		const hasErrors = status.errorMigrations.length > 0
 

package/src/commands/project/ProjectGenerateDocumentationCommand.ts

@@ -6,8 +6,7 @@ import { SchemaLoader } from '../../lib/schema/SchemaLoader'
 import { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper'
 import { SchemaVersionBuilder } from '@contember/migrations-client'
 
-type Args = {
-}
+type Args = {}
 
 type Options = {
 	source?: 'migrations' | 'definition'

package/src/commands/project/ProjectPrintSchemaCommand.ts

@@ -14,8 +14,7 @@ import { SchemaLoader } from '../../lib/schema/SchemaLoader'
 import { SchemaVersionBuilder } from '@contember/migrations-client'
 import { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper'
 
-type Args = {
-}
+type Args = {}
 
 type Options = {
 	role?: string[]
@@ -51,7 +50,6 @@ export class ProjectPrintSchemaCommand extends Command<Args, Options> {
 	protected async execute(input: Input<Args, Options>): Promise<number> {
 		const format = input.getOption('format') || 'graphql'
 
-
 		const schema = input.getOption('source') === 'migrations'
 			? await this.schemaVersionBuilder.buildSchema()
 			: await this.schemaLoader.loadSchema()

package/src/commands/transfer/ExportCommand.ts

@@ -6,6 +6,7 @@ import { printProgressLine } from '../../lib/transfer/stdio'
 import { createGunzip, createGzip } from 'node:zlib'
 import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
 import { DataTransferClient } from '../../lib/transfer/DataTransferClient'
+import { Readable } from 'node:stream'
 
 type Args = {
 	source?: string
@@ -64,12 +65,16 @@ export class ExportCommand extends Command<Args, Options> {
 			includeSystem,
 			gzip: gzipTransfer,
 		})
+		if (!response.body) {
+			throw new Error('Response does not contain a readable stream.')
+		}
 
 		let transferred = 0
 		let start = Date.now()
 		let lastMbReported = 0
 		console.log('')
-		response.on('data', chunk => {
+		const stream = Readable.fromWeb(response.body as any)
+		stream.on('data', chunk => {
 			transferred += chunk.length
 			const currentMb = Math.floor(transferred / 1024 / 1024)
 			if (currentMb > lastMbReported) {
@@ -82,9 +87,9 @@ export class ExportCommand extends Command<Args, Options> {
 		const fileName = input.getOption('output') ?? `${project.name}.jsonl${gzipOutput ? '.gz' : ''}`
 		const fileStream = createWriteStream(fileName)
 
-		const responseStream = gzipOutput === gzipTransfer
-			? response
-			: response.pipe(gzipOutput ? createGzip() : createGunzip())
+		const responseStream = !gzipOutput
+			? stream
+			: stream.pipe(createGzip())
 
 		await pipeline(responseStream, fileStream)
 

package/src/commands/transfer/ImportCommand.ts

@@ -51,7 +51,11 @@ export class ImportCommand extends Command<Args, Options> {
 		}
 		const file = input.getArgument('file')
 		const baseInputStream = createReadStream(file)
-		const stream = (file.endsWith('.gz') ? baseInputStream.pipe(createGunzip()) : baseInputStream)
+		const stream = file.endsWith('.gz') ? baseInputStream.pipe(createGunzip()) : baseInputStream
+		stream.on('error', (err: any) => {
+			console.error('Error in import stream:', err)
+		})
+
 		const gzipTransfer = !input.getOption('no-gzip-transfer')
 		const response = await this.dataTransferClient.dataImport({
 			stream: stream,
@@ -60,13 +64,13 @@ export class ImportCommand extends Command<Args, Options> {
 			gzip: gzipTransfer,
 		})
 		console.log('')
-		const responseData = JSON.parse((await readStream(response)).toString())
+		const responseData = await response.json()
 		if (responseData.ok) {
 			console.log('Import done.')
 		} else {
 			console.error('Import failed:')
 			console.log(responseData)
+			return 1
 		}
 	}
 }
-