@contember/cli 1.1.1 → 1.2.0-alpha.10

package/src/commands/project/ProjectPrintSchemaCommand.ts

@@ -10,11 +10,11 @@ import {
 	Authorizator,
 } from '@contember/engine-content-api'
 import { DocumentNode, printSchema } from 'graphql'
-import { mergeSchemas } from '@graphql-tools/merge'
+import { mergeSchemas } from '@graphql-tools/schema'
 import { loadSchema } from '../../utils/project/loadSchema'
 
 type Args = {
-	project: string
+	project?: string
 }
 
 type Options = {
@@ -23,19 +23,26 @@ type Options = {
 }
 
 export class ProjectPrintSchemaCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Prints project schema')
-		configuration.argument('project')
+		if (!this.workspace.isSingleProjectMode()) {
+			configuration.argument('project')
+		}
 		configuration.option('format').valueRequired().description('graphql|introspection|schema')
 		configuration.option('role').valueArray()
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<number> {
 		const projectName = input.getArgument('project')
-		const workspace = await Workspace.get(process.cwd())
+		const workspace = this.workspace
 		const format = input.getOption('format') || 'graphql'
 
-		validateProjectName(projectName)
 		const project = await workspace.projects.getProject(projectName, { fuzzy: true })
 		const schema = await loadSchema(project)
 		if (!validateSchemaAndPrintErrors(schema, 'Defined schema is invalid:')) {

package/src/commands/project/ProjectValidateCommand.ts

@@ -6,25 +6,30 @@ import { validateMigrations } from '../migrations/MigrationValidationHelper'
 import { loadSchema } from '../../utils/project/loadSchema'
 
 type Args = {
-	project: string
+	project?: string
 }
 
 type Options = {}
 
 export class ProjectValidateCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Validates project schema')
-		configuration.argument('project')
+		if (!this.workspace.isSingleProjectMode()) {
+			configuration.argument('project')
+		}
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<number> {
 		const [projectName] = [input.getArgument('project')]
-		const workspace = await Workspace.get(process.cwd())
+		const workspace = this.workspace
 
 		const allProjects = projectName === '.'
-		if (!allProjects) {
-			validateProjectName(projectName)
-		}
 		const projects = allProjects
 			? await workspace.projects.listProjects()
 			: [await workspace.projects.getProject(projectName, { fuzzy: true })]

package/src/commands/tenant/CreateApiKeyCommand.ts

@@ -10,6 +10,12 @@ type Args = {
 type Options = {}
 
 export class CreateApiKeyCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Creates an API key')
 		configuration //
@@ -22,7 +28,7 @@ export class CreateApiKeyCommand extends Command<Args, Options> {
 		if (!process.stdin.isTTY) {
 			throw 'This command is interactive and requires TTY'
 		}
-		const workspace = await Workspace.get(process.cwd())
+		const workspace = this.workspace
 		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input.getArgument('instance'))
 		const apiToken = await interactiveResolveApiToken({ workspace, instance })
 		const tenantClient = TenantClient.create(instance.baseUrl, apiToken)

package/src/commands/tenant/InviteCommand.ts

@@ -10,6 +10,12 @@ type Args = {
 type Options = {}
 
 export class InviteCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Invites a user by an email')
 		configuration //
@@ -22,7 +28,7 @@ export class InviteCommand extends Command<Args, Options> {
 		if (!process.stdin.isTTY) {
 			throw 'This command is interactive and requires TTY'
 		}
-		const workspace = await Workspace.get(process.cwd())
+		const workspace = this.workspace
 		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input.getArgument('instance'))
 		const apiToken = await interactiveResolveApiToken({ workspace, instance })
 		const tenantClient = TenantClient.create(instance.baseUrl, apiToken)

package/src/commands/tenant/ResetPasswordCommand.ts

@@ -10,6 +10,12 @@ type Args = {
 type Options = {}
 
 export class ResetPasswordCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Resets user password')
 		configuration //
@@ -22,7 +28,7 @@ export class ResetPasswordCommand extends Command<Args, Options> {
 		if (!process.stdin.isTTY) {
 			throw 'This command is interactive and requires TTY'
 		}
-		const workspace = await Workspace.get(process.cwd())
+		const workspace = this.workspace
 		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input.getArgument('instance'))
 		const loginToken = await interactiveResolveLoginToken(workspace)
 		await interactiveResetPassword({ apiUrl: instance.baseUrl, loginToken })

package/src/commands/tenant/SignInCommand.ts

@@ -10,6 +10,12 @@ type Args = {
 type Options = {}
 
 export class SignInCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Signs in a user')
 		configuration //
@@ -22,7 +28,7 @@ export class SignInCommand extends Command<Args, Options> {
 		if (!process.stdin.isTTY) {
 			throw 'This command is interactive and requires TTY'
 		}
-		const workspace = await Workspace.get(process.cwd())
+		const workspace = this.workspace
 		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input.getArgument('instance'))
 		const loginToken = await interactiveResolveLoginToken(workspace)
 		const { sessionToken } = await interactiveSignIn({ apiUrl: instance.baseUrl, loginToken })

package/src/commands/workspace/WorkspaceUpdateApiCommand.ts

@@ -10,6 +10,12 @@ type Args = {
 type Options = {}
 
 export class WorkspaceUpdateApiCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Updates Contember API version and all related packages')
 		configuration.argument('version')
@@ -17,7 +23,7 @@ export class WorkspaceUpdateApiCommand extends Command<Args, Options> {
 
 	protected async execute(input: Input<Args, Options>): Promise<void> {
 		const version = input.getArgument('version')
-		const workspace = await Workspace.get(process.cwd())
+		const workspace = this.workspace
 		const upgradablePackages = ['@contember/schema', '@contember/schema-definition', '@contember/cli']
 
 		await updateNpmPackages(upgradablePackages.map(it => ({ name: it, version })), workspace.directory)

package/src/run.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Application, CommandManager, getPackageVersion } from '@contember/cli-common'
+import { Application, CommandFactoryList, CommandManager, getPackageVersion, Workspace } from '@contember/cli-common'
 import {
 	CreateApiKeyCommand,
 	DeployCommand,
@@ -18,34 +18,32 @@ import {
 	SignInCommand,
 	VersionCommand,
 	WorkspaceUpdateApiCommand,
-} from './commands';
+} from './commands'
 
 (async () => {
-	const diffCommandFactory = () => new MigrationDiffCommand()
-	const migrationsDescribeFactory = () => new MigrationDescribeCommand()
-	const commandManager = new CommandManager({
-		['deploy']: () => new DeployCommand(),
+	const workspace = await Workspace.get(process.cwd())
+	const commands: CommandFactoryList = {
+		['deploy']: () => new DeployCommand(workspace),
 		['version']: () => new VersionCommand(),
-		['migrations:diff']: diffCommandFactory,
-		['migrations:amend']: () => new MigrationAmendCommand(),
-		['migrations:describe']: migrationsDescribeFactory,
-		['migrations:execute']: () => new MigrationExecuteCommand(),
-		['migrations:rebase']: () => new MigrationRebaseCommand(),
-		['migrations:status']: () => new MigrationStatusCommand(),
-		['workspace:update:api']: () => new WorkspaceUpdateApiCommand(),
-		['project:create']: () => new ProjectCreateCommand(),
-		['project:validate']: () => new ProjectValidateCommand(),
-		['project:print-schema']: () => new ProjectPrintSchemaCommand(),
-		['project:generate-doc']: () => new ProjectGenerateDocumentation(),
-		['tenant:sign-in']: () => new SignInCommand(),
-		['tenant:create-api-key']: () => new CreateApiKeyCommand(),
-		['tenant:invite']: () => new InviteCommand(),
-		['tenant:reset-password']: () => new ResetPasswordCommand(),
-
-		// deprecated
-		['migrations:dry-run']: migrationsDescribeFactory,
-		['diff']: diffCommandFactory,
-	})
+		['migrations:diff']: () => new MigrationDiffCommand(workspace),
+		['migrations:amend']: () => new MigrationAmendCommand(workspace),
+		['migrations:describe']: () => new MigrationDescribeCommand(workspace),
+		['migrations:execute']: () => new MigrationExecuteCommand(workspace),
+		['migrations:rebase']: () => new MigrationRebaseCommand(workspace),
+		['migrations:status']: () => new MigrationStatusCommand(workspace),
+		['workspace:update:api']: () => new WorkspaceUpdateApiCommand(workspace),
+		['project:validate']: () => new ProjectValidateCommand(workspace),
+		['project:print-schema']: () => new ProjectPrintSchemaCommand(workspace),
+		['project:generate-doc']: () => new ProjectGenerateDocumentation(workspace),
+		['tenant:sign-in']: () => new SignInCommand(workspace),
+		['tenant:create-api-key']: () => new CreateApiKeyCommand(workspace),
+		['tenant:invite']: () => new InviteCommand(workspace),
+		['tenant:reset-password']: () => new ResetPasswordCommand(workspace),
+	}
+	if (!workspace.isSingleProjectMode()) {
+		commands['project:create'] = () => new ProjectCreateCommand(workspace)
+	}
+	const commandManager = new CommandManager(commands)
 
 	const nodeVersion = process.version.match(/^v?(\d+)\..+$/)
 	if (nodeVersion && Number(nodeVersion[1]) < 12) {