@contember/cli 1.1.2 → 1.2.0-alpha.11

package/dist/src/utils/instance/interactiveUtils.d.ts

@@ -1,4 +1,4 @@
 import { InstanceApiEnvironment } from './environment';
 import { Workspace } from '@contember/cli-common';
-export declare const interactiveResolveInstanceEnvironmentFromInput: (workspace: Workspace, instance?: string | undefined) => Promise<InstanceApiEnvironment>;
+export declare const interactiveResolveInstanceEnvironmentFromInput: (workspace: Workspace, instance?: string) => Promise<InstanceApiEnvironment>;
 //# sourceMappingURL=interactiveUtils.d.ts.map

package/dist/src/utils/instance/interactiveUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interactiveUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/instance/interactiveUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAgBjD,eAAO,MAAM,8CAA8C,cAC/C,SAAS,oCAElB,QAAQ,sBAAsB,CAkBhC,CAAA"}
+{"version":3,"file":"interactiveUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/instance/interactiveUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAgBjD,eAAO,MAAM,8CAA8C,cAC/C,SAAS,aACT,MAAM,KACf,QAAQ,sBAAsB,CAkBhC,CAAA"}

package/dist/src/utils/project/resources/out.css

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.0.24 | MIT License | https://tailwindcss.com
+! tailwindcss v3.1.8 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -187,6 +187,8 @@ textarea {
   /* 1 */
   font-size: 100%;
   /* 1 */
+  font-weight: inherit;
+  /* 1 */
   line-height: inherit;
   /* 1 */
   color: inherit;
@@ -353,13 +355,6 @@ input::-moz-placeholder, textarea::-moz-placeholder {
   /* 2 */
 }
 
-input:-ms-input-placeholder, textarea:-ms-input-placeholder {
-  opacity: 1;
-  /* 1 */
-  color: #9ca3af;
-  /* 2 */
-}
-
 input::placeholder,
 textarea::placeholder {
   opacity: 1;
@@ -415,15 +410,103 @@ video {
   height: auto;
 }
 
-/*
-Ensure the default browser behavior of the `hidden` attribute.
-*/
+*, ::before, ::after {
+  --tw-border-spacing-x: 0;
+  --tw-border-spacing-y: 0;
+  --tw-translate-x: 0;
+  --tw-translate-y: 0;
+  --tw-rotate: 0;
+  --tw-skew-x: 0;
+  --tw-skew-y: 0;
+  --tw-scale-x: 1;
+  --tw-scale-y: 1;
+  --tw-pan-x:  ;
+  --tw-pan-y:  ;
+  --tw-pinch-zoom:  ;
+  --tw-scroll-snap-strictness: proximity;
+  --tw-ordinal:  ;
+  --tw-slashed-zero:  ;
+  --tw-numeric-figure:  ;
+  --tw-numeric-spacing:  ;
+  --tw-numeric-fraction:  ;
+  --tw-ring-inset:  ;
+  --tw-ring-offset-width: 0px;
+  --tw-ring-offset-color: #fff;
+  --tw-ring-color: rgb(59 130 246 / 0.5);
+  --tw-ring-offset-shadow: 0 0 #0000;
+  --tw-ring-shadow: 0 0 #0000;
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  --tw-blur:  ;
+  --tw-brightness:  ;
+  --tw-contrast:  ;
+  --tw-grayscale:  ;
+  --tw-hue-rotate:  ;
+  --tw-invert:  ;
+  --tw-saturate:  ;
+  --tw-sepia:  ;
+  --tw-drop-shadow:  ;
+  --tw-backdrop-blur:  ;
+  --tw-backdrop-brightness:  ;
+  --tw-backdrop-contrast:  ;
+  --tw-backdrop-grayscale:  ;
+  --tw-backdrop-hue-rotate:  ;
+  --tw-backdrop-invert:  ;
+  --tw-backdrop-opacity:  ;
+  --tw-backdrop-saturate:  ;
+  --tw-backdrop-sepia:  ;
+}
 
-[hidden] {
-  display: none;
+::-webkit-backdrop {
+  --tw-border-spacing-x: 0;
+  --tw-border-spacing-y: 0;
+  --tw-translate-x: 0;
+  --tw-translate-y: 0;
+  --tw-rotate: 0;
+  --tw-skew-x: 0;
+  --tw-skew-y: 0;
+  --tw-scale-x: 1;
+  --tw-scale-y: 1;
+  --tw-pan-x:  ;
+  --tw-pan-y:  ;
+  --tw-pinch-zoom:  ;
+  --tw-scroll-snap-strictness: proximity;
+  --tw-ordinal:  ;
+  --tw-slashed-zero:  ;
+  --tw-numeric-figure:  ;
+  --tw-numeric-spacing:  ;
+  --tw-numeric-fraction:  ;
+  --tw-ring-inset:  ;
+  --tw-ring-offset-width: 0px;
+  --tw-ring-offset-color: #fff;
+  --tw-ring-color: rgb(59 130 246 / 0.5);
+  --tw-ring-offset-shadow: 0 0 #0000;
+  --tw-ring-shadow: 0 0 #0000;
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  --tw-blur:  ;
+  --tw-brightness:  ;
+  --tw-contrast:  ;
+  --tw-grayscale:  ;
+  --tw-hue-rotate:  ;
+  --tw-invert:  ;
+  --tw-saturate:  ;
+  --tw-sepia:  ;
+  --tw-drop-shadow:  ;
+  --tw-backdrop-blur:  ;
+  --tw-backdrop-brightness:  ;
+  --tw-backdrop-contrast:  ;
+  --tw-backdrop-grayscale:  ;
+  --tw-backdrop-hue-rotate:  ;
+  --tw-backdrop-invert:  ;
+  --tw-backdrop-opacity:  ;
+  --tw-backdrop-saturate:  ;
+  --tw-backdrop-sepia:  ;
 }
 
-*, ::before, ::after {
+::backdrop {
+  --tw-border-spacing-x: 0;
+  --tw-border-spacing-y: 0;
   --tw-translate-x: 0;
   --tw-translate-y: 0;
   --tw-rotate: 0;

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

@@ -1,5 +1,5 @@
 import { ValidationError } from '@contember/schema-utils';
 import { Schema } from '@contember/schema';
-export declare const printValidationErrors: (errors: ValidationError[], message?: string | undefined) => void;
-export declare const validateSchemaAndPrintErrors: (schema: Schema, message?: string | undefined) => boolean;
+export declare const printValidationErrors: (errors: ValidationError[], message?: string) => void;
+export declare const validateSchemaAndPrintErrors: (schema: Schema, message?: string) => boolean;
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,eAAO,MAAM,qBAAqB,WAAY,eAAe,EAAE,uCAS9D,CAAA;AAED,eAAO,MAAM,4BAA4B,WAAY,MAAM,mCAAqB,OAI/E,CAAA"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,eAAO,MAAM,qBAAqB,WAAY,eAAe,EAAE,YAAY,MAAM,SAShF,CAAA;AAED,eAAO,MAAM,4BAA4B,WAAY,MAAM,YAAY,MAAM,KAAG,OAI/E,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "1.1.2",
+  "version": "1.2.0-alpha.11",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/src/run.js"
@@ -18,24 +18,23 @@
     "tailwindcss": "^3.0.24"
   },
   "dependencies": {
-    "@contember/cli-common": "^1.1.2",
-    "@contember/config-loader": "^1.1.2",
-    "@contember/database-migrations": "^1.1.2",
-    "@contember/dic": "^1.1.2",
-    "@contember/engine-content-api": "^1.1.2",
-    "@contember/schema": "^1.1.2",
-    "@contember/schema-definition": "^1.1.2",
-    "@contember/schema-migrations": "^1.1.2",
-    "@contember/schema-utils": "^1.1.2",
-    "@graphql-tools/merge": "^6.2.14",
-    "chalk": "^4.1.0",
+    "@contember/cli-common": "^1.2.0-alpha.11",
+    "@contember/config-loader": "^1.2.0-alpha.11",
+    "@contember/database-migrations": "^1.2.0-alpha.11",
+    "@contember/dic": "^1.2.0-alpha.11",
+    "@contember/engine-content-api": "^1.2.0-alpha.11",
+    "@contember/schema": "^1.2.0-alpha.11",
+    "@contember/schema-definition": "^1.2.0-alpha.11",
+    "@contember/schema-migrations": "^1.2.0-alpha.11",
+    "@contember/schema-utils": "^1.2.0-alpha.11",
+    "chalk": "^4.1.2",
     "chalk-table": "^1.0.2",
-    "esbuild": "^0.14.14",
+    "esbuild": "^0.14.54",
     "get-port": "^5.0.0",
-    "graphql": "^15.4.0",
-    "graphql-request": "^3.3.0",
+    "graphql": "^16.5.0",
+    "graphql-request": "^4.3.0",
     "js-yaml": "^4.1.0",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.0",
     "pg": "^8.5.0",
     "preact": "^10.7.1",
     "preact-render-to-string": "^5.2.0",

package/src/commands/deploy/DeployCommand.ts

@@ -13,7 +13,7 @@ import { MigrationsContainerFactory } from '../../MigrationsContainer'
 import { AdminClient, readAdminFiles } from '../../utils/admin'
 import { URL } from 'url'
 import prompts from 'prompts'
-import { createMigrationStatusTable, printMigrationDescription } from '../../utils/migrations'
+import { createMigrationStatusTable } from '../../utils/migrations'
 import { maskToken } from '../../utils/token'
 
 type Args = {
@@ -26,32 +26,31 @@ type Options = ExecuteMigrationOptions & {
 }
 
 export class DeployCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Deploy Contember project')
 		configuration.argument('dsn')
-		configuration.argument('project').optional()
+		if (!this.workspace.isSingleProjectMode()) {
+			configuration.argument('project').optional()
+		}
 		configuration.option('admin').valueRequired()
 		configureExecuteMigrationCommand(configuration)
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<void | number> {
 		const [dsn, projectName] = this.getNormalizedInput(input)
-		const workspace = await Workspace.get(process.cwd())
-		let project: Project
+		const project = await this.workspace.projects.getProject(projectName, { fuzzy: true })
 
 		let apiUrl = input.getOption('instance')
 		let adminEndpoint = input.getOption('admin')
 
 		let apiTokenFromDsn: string | undefined = undefined
-		if (projectName) {
-			project = await workspace.projects.getProject(projectName, { fuzzy: true })
-		} else {
-			const projects = await workspace.projects.listProjects()
-			if (projects.length !== 1) {
-				throw 'Please specify a local name project'
-			}
-			project = projects[0]
-		}
+
 		let remoteProject = input.getOption('remote-project') || project.name
 		if (dsn) {
 			const uri = new URL(dsn)
@@ -62,8 +61,8 @@ export class DeployCommand extends Command<Args, Options> {
 			apiTokenFromDsn = uri.password
 			adminEndpoint = (uri.protocol === 'contember-unsecure:' ? 'http://' : 'https://') + uri.host
 		}
-		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, apiUrl ?? (adminEndpoint ? adminEndpoint + '/_api' : undefined))
-		const apiToken = await interactiveResolveApiToken({ workspace, instance, apiToken: apiTokenFromDsn })
+		const instance = await interactiveResolveInstanceEnvironmentFromInput(this.workspace, apiUrl ?? (adminEndpoint ? adminEndpoint + '/_api' : undefined))
+		const apiToken = await interactiveResolveApiToken({ workspace: this.workspace, instance, apiToken: apiTokenFromDsn })
 		console.log('')
 		console.log('Contember project deployment configuration:')
 		console.log(`Local project name: ${project.name}`)

package/src/commands/migrations/MigrationAmendCommand.ts

@@ -1,4 +1,4 @@
-import { Command, CommandConfiguration, Input } from '@contember/cli-common'
+import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common'
 import { printValidationErrors } from '../../utils/schema'
 import { InvalidSchemaException } from '@contember/schema-migrations'
 import { executeCreateMigrationCommand } from './MigrationCreateHelper'
@@ -16,7 +16,7 @@ import { validateMigrations } from './MigrationValidationHelper'
 import { loadSchema } from '../../utils/project/loadSchema'
 
 type Args = {
-	project: string
+	project?: string
 	migration?: string
 }
 
@@ -26,9 +26,17 @@ type Options = {
 }
 
 export class MigrationAmendCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Amends latest migration')
-		configuration.argument('project')
+		if (!this.workspace.isSingleProjectMode()) {
+			configuration.argument('project')
+		}
 		configuration.argument('migration').optional()
 		configuration.option('force').description('Ignore migrations order and missing migrations (dev only)')
 		configuration //
@@ -40,6 +48,7 @@ export class MigrationAmendCommand extends Command<Args, Options> {
 	protected async execute(input: Input<Args, Options>): Promise<number> {
 		return await executeCreateMigrationCommand(
 			input,
+			{ workspace: this.workspace },
 			async ({
 				schemaVersionBuilder,
 				migrationsResolver,

package/src/commands/migrations/MigrationCreateHelper.ts

@@ -11,19 +11,15 @@ import {
 import { Workspace, Project } from '@contember/cli-common'
 
 type Args = {
-	project: string
+	project?: string
 	migrationName: string
 }
 
 type Options = {}
 
-export const configureCreateMigrationCommand = (configuration: CommandConfiguration<Args, Options>) => {
-	configuration.argument('project')
-	configuration.argument('migrationName')
-}
-
 export const executeCreateMigrationCommand = async (
 	input: Input<Pick<Args, 'project'>, Options>,
+	{ workspace }: {workspace: Workspace},
 	createMigrationCallback: (args: {
 		workspace: Workspace
 		project: Project
@@ -36,7 +32,6 @@ export const executeCreateMigrationCommand = async (
 	}) => Promise<number>,
 ) => {
 	const projectName = input.getArgument('project')
-	const workspace = await Workspace.get(process.cwd())
 	const allProjects = projectName === '.'
 	const projects = allProjects
 		? await workspace.projects.listProjects()

package/src/commands/migrations/MigrationDescribeCommand.ts

@@ -7,7 +7,7 @@ import { Schema } from '@contember/schema'
 import { Workspace } from '@contember/cli-common'
 
 type Args = {
-	project: string
+	project?: string
 	migration?: string
 }
 
@@ -48,9 +48,17 @@ let printMigrationDescription = async function (
 }
 
 export class MigrationDescribeCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Describes a migration')
-		configuration.argument('project')
+		if (!this.workspace.isSingleProjectMode()) {
+			configuration.argument('project')
+		}
 		configuration.argument('migration').optional()
 		configuration.option('sql-only').valueNone()
 		configuration.option('no-sql').valueNone()
@@ -59,7 +67,7 @@ export class MigrationDescribeCommand extends Command<Args, Options> {
 	protected async execute(input: Input<Args, Options>): Promise<void> {
 		const projectName = input.getArgument('project')
 
-		const workspace = await Workspace.get(process.cwd())
+		const workspace = this.workspace
 		const project = await workspace.projects.getProject(projectName, { fuzzy: true })
 		const migrationsDir = await project.migrationsDir
 		const container = new MigrationsContainerFactory(migrationsDir).create()

package/src/commands/migrations/MigrationDiffCommand.ts

@@ -1,7 +1,7 @@
-import { Command, CommandConfiguration, Input } from '@contember/cli-common'
+import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common'
 import { printValidationErrors } from '../../utils/schema'
 import { InvalidSchemaException } from '@contember/schema-migrations'
-import { configureCreateMigrationCommand, executeCreateMigrationCommand } from './MigrationCreateHelper'
+import { executeCreateMigrationCommand } from './MigrationCreateHelper'
 import { createMigrationStatusTable, printMigrationDescription } from '../../utils/migrations'
 import { executeMigrations, resolveMigrationStatus } from './MigrationExecuteHelper'
 import prompts from 'prompts'
@@ -11,7 +11,7 @@ import { SystemClient } from '../../utils/system'
 import { loadSchema } from '../../utils/project/loadSchema'
 
 type Args = {
-	project: string
+	project?: string
 	migrationName: string
 }
 
@@ -21,9 +21,18 @@ type Options = {
 }
 
 export class MigrationDiffCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Creates schema migration diff for given project')
-		configureCreateMigrationCommand(configuration)
+		if (!this.workspace.isSingleProjectMode()) {
+			configuration.argument('project')
+		}
+		configuration.argument('migrationName')
 		configuration.option('execute').valueNone()
 		configuration //
 			.option('yes')
@@ -34,6 +43,7 @@ export class MigrationDiffCommand extends Command<Args, Options> {
 	protected async execute(input: Input<Args, Options>): Promise<number> {
 		return await executeCreateMigrationCommand(
 			input,
+			{ workspace: this.workspace },
 			async ({
 				schemaVersionBuilder,
 				migrationsResolver,

package/src/commands/migrations/MigrationExecuteCommand.ts

@@ -13,7 +13,7 @@ import { interactiveResolveApiToken, TenantClient } from '../../utils/tenant'
 import { SystemClient } from '../../utils/system'
 
 type Args = {
-	project: string
+	project?: string
 	migration?: string
 }
 
@@ -22,9 +22,17 @@ type Options = ExecuteMigrationOptions & {
 }
 
 export class MigrationExecuteCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Executes migrations on an instance')
-		configuration.argument('project')
+		if (!this.workspace.isSingleProjectMode()) {
+			configuration.argument('project')
+		}
 		configuration.argument('migration').optional()
 		configuration.option('force').description('Ignore migrations order and missing migrations (dev only)')
 		configureExecuteMigrationCommand(configuration)
@@ -33,12 +41,9 @@ export class MigrationExecuteCommand extends Command<Args, Options> {
 	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 remoteProjectOption = input?.getOption('remote-project')
 		if (remoteProjectOption && allProjects) {
 			throw 'Option remote-project can be used only for a single project'

package/src/commands/migrations/MigrationRebaseCommand.ts

@@ -1,4 +1,4 @@
-import { Command, CommandConfiguration, Input } from '@contember/cli-common'
+import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common'
 import { MigrationVersionHelper } from '@contember/schema-migrations'
 import { executeCreateMigrationCommand } from './MigrationCreateHelper'
 import { getMigrationByName } from '../../utils/migrations'
@@ -7,7 +7,7 @@ import { emptySchema } from '@contember/schema-utils'
 import { validateMigrations } from './MigrationValidationHelper'
 
 type Args = {
-	project: string
+	project?: string
 	migration: string[]
 }
 
@@ -16,9 +16,18 @@ type Options = {
 }
 
 export class MigrationRebaseCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Rebase migrations on filesystem and in local instance')
-		configuration.argument('project')
+		if (!this.workspace.isSingleProjectMode()) {
+			configuration.argument('project')
+		}
 		configuration.argument('migration').variadic()
 		configuration //
 			.option('yes')
@@ -29,6 +38,7 @@ export class MigrationRebaseCommand extends Command<Args, Options> {
 	protected async execute(input: Input<Args, Options>): Promise<number> {
 		return await executeCreateMigrationCommand(
 			input,
+			{ workspace: this.workspace },
 			async ({
 				schemaVersionBuilder,
 				migrationsResolver,

package/src/commands/migrations/MigrationStatusCommand.ts

@@ -8,7 +8,7 @@ import chalk from 'chalk'
 import { Workspace } from '@contember/cli-common'
 
 type Args = {
-	project: string
+	project?: string
 }
 
 type Options = {
@@ -20,9 +20,17 @@ type Options = {
 }
 
 export class MigrationStatusCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Shows status of executed migrations on an instance & sync status')
-		configuration.argument('project')
+		if (!this.workspace.isSingleProjectMode()) {
+			configuration.argument('project')
+		}
 		configuration //
 			.option('instance')
 			.valueRequired()
@@ -48,7 +56,7 @@ export class MigrationStatusCommand extends Command<Args, Options> {
 	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 project = await workspace.projects.getProject(projectName, { fuzzy: true })
 		const migrationsDir = await project.migrationsDir
 		const container = new MigrationsContainerFactory(migrationsDir).create()

package/src/commands/project/ProjectCreateCommand.ts

@@ -10,6 +10,12 @@ type Options = {
 }
 
 export class ProjectCreateCommand extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Creates a new Contember project')
 		configuration.argument('project')
@@ -19,7 +25,7 @@ export class ProjectCreateCommand extends Command<Args, Options> {
 	protected async execute(input: Input<Args, Options>): Promise<void> {
 		const [projectName] = [input.getArgument('project')]
 		validateProjectName(projectName)
-		const workspace = await Workspace.get(process.cwd())
+		const workspace = this.workspace
 
 		const template = input.getOption('template')
 		await workspace.projects.createProject(projectName, { template })

package/src/commands/project/ProjectGenerateDocumentation.ts

@@ -1,4 +1,4 @@
-import { Command, CommandConfiguration, Input, validateProjectName, Workspace } from '@contember/cli-common'
+import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common'
 import { validateSchemaAndPrintErrors } from '../../utils/schema'
 import { loadSchema } from '../../utils/project/loadSchema'
 import { renderProjectInfoHtml } from '../../utils/project/projectDescribe'
@@ -6,7 +6,7 @@ import { writeFile } from 'fs/promises'
 import { join } from 'path'
 
 type Args = {
-	project: string
+	project?: string
 }
 
 type Options = {
@@ -14,18 +14,23 @@ type Options = {
 }
 
 export class ProjectGenerateDocumentation extends Command<Args, Options> {
+	constructor(
+		private readonly workspace: Workspace,
+	) {
+		super()
+	}
+
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Generates HTML documentation from project schema')
-		configuration.argument('project')
+		if (!this.workspace.isSingleProjectMode()) {
+			configuration.argument('project')
+		}
 		configuration.option('output').valueRequired().description('file name or "stdout"')
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<number> {
 		const projectName = input.getArgument('project')
-		const workspace = await Workspace.get(process.cwd())
-
-		validateProjectName(projectName)
-		const project = await workspace.projects.getProject(projectName, { fuzzy: true })
+		const project = await this.workspace.projects.getProject(projectName, { fuzzy: true })
 		const schema = await loadSchema(project)
 		if (!validateSchemaAndPrintErrors(schema, 'Defined schema is invalid:')) {
 			return 1

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:')) {