@contember/cli 1.3.0-alpha.7 → 1.3.0-beta.1

package/src/commands/migrations/MigrationExecuteCommand.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 { MigrationsContainerFactory } from '../../MigrationsContainer'
 import {
 	configureExecuteMigrationCommand,
@@ -6,18 +6,18 @@ import {
 	executeMigrations,
 	resolveMigrationStatus,
 } from './MigrationExecuteHelper'
-import { createMigrationStatusTable, findMigration, MigrationState } from '../../utils/migrations'
-import { assertNever } from '../../utils/assertNever'
+import { createMigrationStatusTable } from '../../utils/migrations'
 import { interactiveResolveInstanceEnvironmentFromInput } from '../../utils/instance'
 import { interactiveResolveApiToken, TenantClient } from '../../utils/tenant'
 import { SystemClient } from '../../utils/system'
+import { MigrationVersionHelper } from '@contember/schema-migrations'
 
 type Args = {
 	project?: string
-	migration?: string
 }
 
 type Options = ExecuteMigrationOptions & {
+	until?: string
 	force: boolean
 }
 
@@ -33,8 +33,8 @@ export class MigrationExecuteCommand extends Command<Args, Options> {
 		if (!this.workspace.isSingleProjectMode()) {
 			configuration.argument('project')
 		}
-		configuration.argument('migration').optional()
 		configuration.option('force').description('Ignore migrations order and missing migrations (dev only)')
+		configuration.option('until').valueRequired().description('Execute all migrations leading up to, and inclusive of, a specified migration')
 		configureExecuteMigrationCommand(configuration)
 	}
 
@@ -51,12 +51,10 @@ export class MigrationExecuteCommand extends Command<Args, Options> {
 		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({ workspace, instance })
@@ -73,29 +71,13 @@ export class MigrationExecuteCommand extends Command<Args, Options> {
 					throw `Cannot execute migrations`
 				}
 			}
+			const until = input.getOption('until')
+			const untilNormalized = until ? MigrationVersionHelper.extractVersion(until) : null
+
+			const migrations = untilNormalized
+				? status.migrationsToExecute.filter(it => it.version <= MigrationVersionHelper.extractVersion(untilNormalized))
+				: status.migrationsToExecute
 
-			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
-				}
-			})()
 			if (migrations.length === 0) {
 				console.log('No migrations to execute')
 				continue

package/src/commands/migrations/MigrationValidationHelper.ts

@@ -1,6 +1,7 @@
 import { Schema } from '@contember/schema'
-import { Migration, MigrationDescriber, SchemaMigrator, SchemaUpdateError } from '@contember/schema-migrations'
+import { Migration, MigrationDescriber, MigrationVersionHelper, SchemaMigrator, SchemaUpdateError } from '@contember/schema-migrations'
 import { validateSchemaAndPrintErrors } from '../../utils/schema'
+import { SchemaValidatorSkippedErrors } from '@contember/schema-utils'
 
 export const validateMigrations = async (
 	initialSchema: Schema,
@@ -10,10 +11,11 @@ export const validateMigrations = async (
 ): Promise<boolean> => {
 	let migratedSchema = initialSchema
 	let projectValid = true
+	let skippedErrors: SchemaValidatorSkippedErrors[] = []
 	for (const migration of await migrations) {
 		try {
 			// just a check that it does not fail
-			await describer.describeModifications(migratedSchema, migration, 'system') // schema name not important here
+			describer.describeModifications(migratedSchema, migration)
 
 			migratedSchema = migrator.applyModifications(migratedSchema, migration.modifications, migration.formatVersion)
 		} catch (e) {
@@ -23,7 +25,11 @@ export const validateMigrations = async (
 			throw e
 		}
 		const errorMessage = `Migration ${migration.name} produces invalid schema:`
-		projectValid = validateSchemaAndPrintErrors(migratedSchema, errorMessage, migration.skippedErrors)
+		skippedErrors = [
+			...skippedErrors.filter(it => it.skipUntil && MigrationVersionHelper.extractVersion(it.skipUntil) >= migration.version),
+			...migration.skippedErrors ?? [],
+		]
+		projectValid = validateSchemaAndPrintErrors(migratedSchema, errorMessage, skippedErrors)
 			&& projectValid
 	}
 	return projectValid

package/src/commands/project/ProjectPrintSchemaCommand.ts

@@ -12,6 +12,7 @@ import {
 import { DocumentNode, printSchema } from 'graphql'
 import { mergeSchemas } from '@graphql-tools/schema'
 import { loadSchema } from '../../utils/project/loadSchema'
+import { normalizeSchema } from '@contember/schema-utils'
 
 type Args = {
 	project?: string
@@ -19,6 +20,7 @@ type Args = {
 
 type Options = {
 	role?: string[]
+	normalize?: boolean
 	format?: 'graphql' | 'introspection' | 'schema'
 }
 
@@ -36,6 +38,7 @@ export class ProjectPrintSchemaCommand extends Command<Args, Options> {
 		}
 		configuration.option('format').valueRequired().description('graphql|introspection|schema')
 		configuration.option('role').valueArray()
+		configuration.option('normalize').valueNone()
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<number> {
@@ -50,23 +53,24 @@ export class ProjectPrintSchemaCommand extends Command<Args, Options> {
 		}
 		const permissionFactory = new PermissionFactory()
 		const inputRoles = input.getOption('role')
-		const permissions = permissionFactory.create(schema, inputRoles || ['admin'])
+		const schemaNormalized = input.getOption('normalize') ? normalizeSchema(schema) : schema
+		const permissions = permissionFactory.create(schemaNormalized, inputRoles || ['admin'])
 		const schemaBuilderFactory = new GraphQlSchemaBuilderFactory()
-		const authorizator = new Authorizator(permissions, schema.acl.customPrimary ?? false)
+		const authorizator = new Authorizator(permissions, schemaNormalized.acl.customPrimary ?? false)
 		const introspection = new IntrospectionSchemaFactory(
-			schema.model,
-			new EntityRulesResolver(schema.validation, schema.model),
+			schemaNormalized.model,
+			new EntityRulesResolver(schemaNormalized.validation, schemaNormalized.model),
 			authorizator,
 		)
 		if (format === 'schema') {
 			if (inputRoles) {
 				throw `--roles option is not supported for "schema" format`
 			}
-			console.log(JSON.stringify(schema, null, '\t'))
+			console.log(JSON.stringify(schemaNormalized, null, '\t'))
 		} else if (format === 'introspection') {
 			console.log(JSON.stringify(introspection.create(), null, '\t'))
 		} else if (format === 'graphql') {
-			const contentSchema = schemaBuilderFactory.create(schema.model, authorizator).build()
+			const contentSchema = schemaBuilderFactory.create(schemaNormalized.model, authorizator).build()
 			const introspectionSchemaFactory = new IntrospectionSchemaDefinitionFactory(introspection)
 			const introspectionSchema = introspectionSchemaFactory.create()
 			const gqlSchema = mergeSchemas({

package/src/commands/workspace/WorkspaceUpdateApiCommand.ts

@@ -1,7 +1,6 @@
 import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common'
-import { updateNpmPackages } from '../../utils/npm'
 import { updateWorkspaceApiVersion } from '../../utils/workspace'
-import { updateMainDockerComposeConfig } from '../../utils/dockerCompose'
+import { contemberDockerImages, updateMainDockerComposeConfig } from '../../utils/dockerCompose'
 
 type Args = {
 	version: string
@@ -24,11 +23,14 @@ export class WorkspaceUpdateApiCommand extends Command<Args, Options> {
 	protected async execute(input: Input<Args, Options>): Promise<void> {
 		const version = input.getArgument('version')
 		const workspace = this.workspace
-		const upgradablePackages = ['@contember/schema', '@contember/schema-definition', '@contember/cli']
+		const packageWorkspace = await workspace.resolvePackageWorkspace()
 
-		await updateNpmPackages(upgradablePackages.map(it => ({ name: it, version })), workspace.directory)
+		await packageWorkspace.updateEverywhere({
+			'@contember/schema': version,
+			'@contember/schema-definition': version,
+			'@contember/cli': version,
+		})
 
-		const prevVersion = workspace.apiVersion
 		const updatedYaml = await updateWorkspaceApiVersion(workspace, version)
 
 		if (updatedYaml) {
@@ -39,8 +41,8 @@ export class WorkspaceUpdateApiCommand extends Command<Args, Options> {
 
 		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}:`)) {
+			for (const candidate of contemberDockerImages) {
+				if (currentImage.startsWith(`${candidate}:`)) {
 					return `${candidate}:${version}`
 				}
 			}
@@ -51,7 +53,7 @@ export class WorkspaceUpdateApiCommand extends Command<Args, Options> {
 			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`)
+					console.log(`docker-compose service ${name} updated`)
 					return [
 						name,
 						{

package/src/run.ts

@@ -21,10 +21,16 @@ import {
 } from './commands'
 import { ExportCommand } from './commands/transfer/ExportCommand'
 import { ImportCommand } from './commands/transfer/ImportCommand'
-import { TransferCommand } from './commands/transfer/TransferCommand';
+import { TransferCommand } from './commands/transfer/TransferCommand'
+import { checkVersions } from './utils/checkVersions';
 
 (async () => {
 	const workspace = await Workspace.get(process.cwd())
+
+	if (!process.env.CONTEMBER_SKIP_VERSION_CHECK) {
+		await checkVersions(workspace)
+	}
+
 	const commands: CommandFactoryList = {
 		['deploy']: () => new DeployCommand(workspace),
 		['version']: () => new VersionCommand(),

package/src/utils/checkVersions.ts

@@ -0,0 +1,58 @@
+import { getPackageVersion, Workspace } from '@contember/cli-common'
+import { join, relative } from 'node:path'
+import * as semver from 'semver'
+import { contemberDockerImages, tryReadMainDockerComposeConfig } from './dockerCompose'
+
+export const checkVersions = async (workspace: Workspace) => {
+	const cliVersion = getPackageVersion()
+	const packageWorkspace = await workspace.resolvePackageWorkspace()
+	const errors: string[] = []
+
+	for (const packageName of ['@contember/schema', '@contember/schema-definition']) {
+		const installedPackages = await packageWorkspace.findInstalledDependencies(packageName)
+		for (const pckg of installedPackages) {
+			const jsonPath = relative(workspace.directory, join(pckg.defined.pckg.dir, 'package.json'))
+
+			if (!pckg.installed) {
+				errors.push(`Package ${packageName} defined in ${jsonPath} is not installed.`)
+				continue
+			}
+			if (!semver.satisfies(pckg.installed.version, pckg.defined.version)) {
+				errors.push(`Package ${packageName}@${pckg.installed.version} does not match constraint ${pckg.defined.version} defined in ${jsonPath}.`)
+				continue
+			}
+			if (cliVersion !== pckg.installed.version) {
+				errors.push(`Package ${packageName}@${pckg.installed.version} does not match version of CLI ${cliVersion}.`)
+			}
+		}
+	}
+	const dockerCompose = await tryReadMainDockerComposeConfig(workspace.directory)
+
+	if (!dockerCompose) {
+		errors.push('docker-compose.yaml not found.')
+	} else {
+		for (const [name, def] of Object.entries(dockerCompose.services ?? {})) {
+			if (!def.image) {
+				continue
+			}
+			const [image, version] = def.image.split(':')
+			if (!version || !contemberDockerImages.includes(image)) {
+				continue
+			}
+			const versionParts = version.split(/[.-]/)
+			if (versionParts[versionParts.length - 1] === 'debian') {
+				versionParts.pop()
+			}
+			const cliVersionParts = cliVersion.split(/[.-]/).slice(0, versionParts.length)
+			if (versionParts.join('.') !== cliVersionParts.join('.')) {
+				errors.push(`Docker service ${name} with image ${image}:${version} does not match version of CLI ${cliVersion}.`)
+			}
+		}
+	}
+
+	if (errors.length) {
+		throw `${errors.map(it => `${it}`).join('\n')}
+
+Please make sure all dependencies are up to date.\nIf you are really certain about the compatibility, you can disable this version check by running the CLI with the CONTEMBER_SKIP_VERSION_CHECK=1 environment variable`
+	}
+}

package/src/utils/dockerCompose.ts

@@ -1,6 +1,8 @@
 import { join } from 'node:path'
 import { pathExists } from '@contember/cli-common'
 import { JsonUpdateCallback, updateYaml } from './yaml'
+import jsyaml from 'js-yaml'
+import * as fs from 'node:fs/promises'
 
 const MAIN_CONFIGS = ['docker-compose.yaml', 'docker-compose.yml']
 
@@ -19,20 +21,35 @@ export interface DockerComposeConfig {
 	services?: Record<string, DockerComposeServiceConfig>
 }
 
-const resolvePath = async (dir: string, possibleFileNames: string[], fallbackFileName: string): Promise<string> => {
+const resolvePath = async (dir: string, possibleFileNames: string[]): Promise<string | null> => {
 	for (const file of possibleFileNames) {
 		const path = join(dir, file)
 		if (await pathExists(path)) {
 			return path
 		}
 	}
-	return join(dir, fallbackFileName)
+	return null
+}
+
+export const resolveMainDockerComposeConfig = async (dir: string): Promise<string | null> => {
+	return resolvePath(dir, MAIN_CONFIGS)
+}
+
+export const tryReadMainDockerComposeConfig = async (dir: string): Promise<DockerComposeConfig | null> => {
+	const path = await resolveMainDockerComposeConfig(dir)
+	if (!path) {
+		return null
+	}
+	return jsyaml.load(await fs.readFile(path, 'utf8')) as DockerComposeConfig
 }
 
 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]))
+	const path = process.env.COMPOSE_FILE || (await resolvePath(dir, MAIN_CONFIGS)) || join(dir, MAIN_CONFIGS[0])
 	return updateYaml(path, updater, { createMissing: true })
 }
+
+
+export const contemberDockerImages = ['contember/engine', 'contember/engine-ee', 'contember/cli']

package/src/utils/migrations.ts

@@ -10,6 +10,7 @@ import chalk from 'chalk'
 import { Schema } from '@contember/schema'
 import chalkTable from 'chalk-table'
 import { assertNever } from './assertNever'
+import { dummySchemaDatabaseMetadata } from '@contember/schema-utils'
 
 export const getLatestMigration = async (migrationsResolver: MigrationsResolver): Promise<Migration | null> => {
 	const migrations = await migrationsResolver.getMigrations()
@@ -28,16 +29,23 @@ export const findMigration = <M extends { version: string }>(migrations: M[], ve
 		it => MigrationVersionHelper.extractVersion(it.version) === MigrationVersionHelper.extractVersion(version),
 	) || null
 
-export const printMigrationDescription = async function (
+export const printMigrationDescription = function (
 	migrationsDescriber: MigrationDescriber,
 	schema: Schema,
 	migration: Migration,
 	options: { sqlOnly?: boolean; noSql?: boolean },
 ) {
-	const description = await migrationsDescriber.describeModifications(schema, migration, 'system') // schema name cannot be determined
-	description.forEach(({ modification, sql, description }) => {
+	const description = migrationsDescriber.describeModifications(schema, migration)
+	description.forEach(({ modification, getSql, description }) => {
+		const sql = getSql({
+			systemSchema: 'system',
+			databaseMetadata: dummySchemaDatabaseMetadata,
+			invalidateDatabaseMetadata: () => null,
+		})
 		if (options.sqlOnly) {
-			console.log(sql)
+			if (sql.trim()) {
+				console.log(sql)
+			}
 		} else {
 			const color = description.isDestructive ? chalk.red : chalk.blue
 			console.group(color(`${description.message} [${modification.modification}]`))

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

@@ -1,21 +0,0 @@
-/// <reference types="node" />
-import { ChildProcessWithoutNullStreams } from 'node:child_process';
-import { Readable, Writable } from 'node:stream';
-export declare type RunningCommand = {
-    child: ChildProcessWithoutNullStreams;
-    output: Promise<string>;
-};
-export declare const runCommand: (command: string, args: (string | undefined)[], options: {
-    cwd: string;
-    stdin?: Readable;
-    stdout?: Writable;
-    stderr?: Writable;
-    env?: NodeJS.ProcessEnv;
-    detached?: boolean;
-}) => RunningCommand;
-export declare class ChildProcessError extends Error {
-    readonly exitCode: number | null;
-    readonly stderr: string;
-    constructor(exitCode: number | null, stderr: string);
-}
-//# sourceMappingURL=commands.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/utils/commands.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,8BAA8B,EAAS,MAAM,oBAAoB,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGhD,oBAAY,cAAc,GAAG;IAAE,KAAK,EAAE,8BAA8B,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,CAAA;AAC/F,eAAO,MAAM,UAAU,YACb,MAAM,QACT,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,WACnB;IACR,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,QAAQ,CAAA;IAChB,MAAM,CAAC,EAAE,QAAQ,CAAA;IACjB,MAAM,CAAC,EAAE,QAAQ,CAAA;IACjB,GAAG,CAAC,EAAE,OAAO,UAAU,CAAA;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAA;CAClB,KACC,cA0CF,CAAA;AAED,qBAAa,iBAAkB,SAAQ,KAAK;aACf,QAAQ,EAAE,MAAM,GAAG,IAAI;aAAkB,MAAM,EAAE,MAAM;gBAAvD,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAkB,MAAM,EAAE,MAAM;CAGnF"}

package/dist/src/utils/commands.js

@@ -1,57 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChildProcessError = exports.runCommand = void 0;
-const node_child_process_1 = require("node:child_process");
-const chalk_1 = __importDefault(require("chalk"));
-const runCommand = (command, args, options) => {
-    const args2 = args.filter((it) => it !== undefined);
-    if (!process.env.DISABLE_COMMAND_PRINTING) {
-        console.error(chalk_1.default.gray(`$ ${command} ${args2.map(it => `'${it.replace(/'/g, `'\\''`)}'`).join(' ')}`));
-    }
-    const child = (0, node_child_process_1.spawn)(command, args2, {
-        cwd: options.cwd,
-        env: { ...process.env, ...(options.env || {}) },
-        detached: options.detached,
-    });
-    if (options.stdin) {
-        options.stdin.pipe(child.stdin);
-    }
-    let stdout = '';
-    let stderr = '';
-    child.stdout.on('data', (chunk) => {
-        stdout += chunk.toString();
-    });
-    child.stderr.on('data', (chunk) => {
-        stderr += chunk.toString();
-    });
-    if (options.stdout) {
-        child.stdout.pipe(options.stdout);
-    }
-    if (options.stderr) {
-        child.stderr.pipe(options.stderr);
-    }
-    const output = new Promise((resolve, reject) => {
-        child.on('exit', (exitCode) => {
-            if (exitCode === 0) {
-                resolve(stdout);
-            }
-            else {
-                reject(new ChildProcessError(exitCode, stderr));
-            }
-        });
-    });
-    return { output, child };
-};
-exports.runCommand = runCommand;
-class ChildProcessError extends Error {
-    constructor(exitCode, stderr) {
-        super(`Command has failed(${exitCode}): ${stderr} `);
-        this.exitCode = exitCode;
-        this.stderr = stderr;
-    }
-}
-exports.ChildProcessError = ChildProcessError;
-//# sourceMappingURL=commands.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/utils/commands.ts"],"names":[],"mappings":";;;;;;AAAA,2DAA0E;AAE1E,kDAAyB;AAGlB,MAAM,UAAU,GAAG,CACzB,OAAe,EACf,IAA4B,EAC5B,OAOC,EACgB,EAAE;IACnB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAgB,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,CAAA;IACjE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE;QAC1C,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,KAAK,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;KACxG;IACD,MAAM,KAAK,GAAG,IAAA,0BAAK,EAAC,OAAO,EAAE,KAAK,EAAE;QACnC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE;QAC/C,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC1B,CAAC,CAAA;IACF,IAAI,OAAO,CAAC,KAAK,EAAE;QAClB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;KAC/B;IAED,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,MAAM,GAAG,EAAE,CAAA;IAEf,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAQ,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAA;IAC3B,CAAC,CAAC,CAAA;IAEF,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAQ,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAA;IAC3B,CAAC,CAAC,CAAA;IACF,IAAI,OAAO,CAAC,MAAM,EAAE;QACnB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;KACjC;IACD,IAAI,OAAO,CAAC,MAAM,EAAE;QACnB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;KACjC;IAED,MAAM,MAAM,GAAG,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtD,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAQ,EAAE;YACnC,IAAI,QAAQ,KAAK,CAAC,EAAE;gBACnB,OAAO,CAAC,MAAM,CAAC,CAAA;aACf;iBAAM;gBACN,MAAM,CAAC,IAAI,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;aAC/C;QACF,CAAC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAA;AACzB,CAAC,CAAA;AArDY,QAAA,UAAU,cAqDtB;AAED,MAAa,iBAAkB,SAAQ,KAAK;IAC3C,YAA4B,QAAuB,EAAkB,MAAc;QAClF,KAAK,CAAC,sBAAsB,QAAQ,MAAM,MAAM,GAAG,CAAC,CAAA;QADzB,aAAQ,GAAR,QAAQ,CAAe;QAAkB,WAAM,GAAN,MAAM,CAAQ;IAEnF,CAAC;CACD;AAJD,8CAIC"}

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

@@ -1,6 +0,0 @@
-export interface NpmPackageUpdate {
-    name: string;
-    version: string;
-}
-export declare const updateNpmPackages: (packages: NpmPackageUpdate[], workspaceDirectory: string) => Promise<void>;
-//# sourceMappingURL=npm.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../../src/utils/npm.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;CACf;AAqBD,eAAO,MAAM,iBAAiB,aAAoB,gBAAgB,EAAE,sBAAsB,MAAM,kBAiC/F,CAAA"}

package/dist/src/utils/npm.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateNpmPackages = void 0;
-const cli_common_1 = require("@contember/cli-common");
-const node_path_1 = require("node:path");
-const commands_1 = require("./commands");
-const cli_common_2 = require("@contember/cli-common");
-const install = async (hasYarn, packages, isDev, dir) => {
-    const [cmd, ...args] = hasYarn
-        ? ['yarn', 'add', isDev ? '--dev' : undefined, '--ignore-workspace-root-check']
-        : ['npm', 'install', isDev ? '--save-dev' : '--save'];
-    const label = isDev ? 'devDependencies' : 'dependencies';
-    if (packages.length === 0) {
-        console.log(`No npm ${label} to update.`);
-        return;
-    }
-    console.log(`Updating npm ${label}: ${packages.join(', ')}`);
-    const { output } = (0, commands_1.runCommand)(cmd, [...args, ...packages], {
-        cwd: dir,
-        stderr: process.stderr,
-        stdout: process.stdout,
-    });
-    await output;
-    console.log('npm update done');
-};
-const updateNpmPackages = async (packages, workspaceDirectory) => {
-    const hasYarn = await (0, cli_common_1.pathExists)((0, node_path_1.join)(workspaceDirectory, 'yarn.lock'));
-    const processPackageFile = async (dir) => {
-        const packageJsonFile = (0, node_path_1.join)(dir, 'package.json');
-        if (!(await (0, cli_common_1.pathExists)(packageJsonFile))) {
-            return;
-        }
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const packageJson = require(packageJsonFile);
-        const isRoot = workspaceDirectory === dir;
-        const upgradeDeps = async (type) => {
-            const deps = packageJson[type] || {};
-            const packagesToUpdate = packages.filter(it => !!deps[it.name]).map(it => `${it.name}@${it.version}`);
-            await install(hasYarn, packagesToUpdate, type === 'devDependencies', dir);
-        };
-        await upgradeDeps('dependencies');
-        await upgradeDeps('devDependencies');
-        if (hasYarn && isRoot && packageJson.workspaces) {
-            const dirsPromise = packageJson.workspaces.map(async (it) => {
-                if (it.substr(-1) === '*') {
-                    const baseDir = it.substring(0, it.length - 1);
-                    return await (0, cli_common_2.listDirectories)(baseDir);
-                }
-                else {
-                    return [(0, node_path_1.join)(dir, it)];
-                }
-            });
-            const workspaceDirs = (await Promise.all(dirsPromise)).flatMap(it => it);
-            for (const dir of workspaceDirs) {
-                await processPackageFile(dir);
-            }
-        }
-    };
-    await processPackageFile(workspaceDirectory);
-};
-exports.updateNpmPackages = updateNpmPackages;
-//# sourceMappingURL=npm.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/utils/npm.ts"],"names":[],"mappings":"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"}

package/src/utils/commands.ts

@@ -1,65 +0,0 @@
-import { ChildProcessWithoutNullStreams, spawn } from 'node:child_process'
-import { Readable, Writable } from 'node:stream'
-import chalk from 'chalk'
-
-export type RunningCommand = { child: ChildProcessWithoutNullStreams; output: Promise<string> }
-export const runCommand = (
-	command: string,
-	args: (string | undefined)[],
-	options: {
-		cwd: string
-		stdin?: Readable
-		stdout?: Writable
-		stderr?: Writable
-		env?: NodeJS.ProcessEnv
-		detached?: boolean
-	},
-): RunningCommand => {
-	const args2 = args.filter((it): it is string => it !== undefined)
-	if (!process.env.DISABLE_COMMAND_PRINTING) {
-		console.error(chalk.gray(`$ ${command} ${args2.map(it => `'${it.replace(/'/g, `'\\''`)}'`).join(' ')}`))
-	}
-	const child = spawn(command, args2, {
-		cwd: options.cwd,
-		env: { ...process.env, ...(options.env || {}) },
-		detached: options.detached,
-	})
-	if (options.stdin) {
-		options.stdin.pipe(child.stdin)
-	}
-
-	let stdout = ''
-	let stderr = ''
-
-	child.stdout.on('data', (chunk): void => {
-		stdout += chunk.toString()
-	})
-
-	child.stderr.on('data', (chunk): void => {
-		stderr += chunk.toString()
-	})
-	if (options.stdout) {
-		child.stdout.pipe(options.stdout)
-	}
-	if (options.stderr) {
-		child.stderr.pipe(options.stderr)
-	}
-
-	const output = new Promise<string>((resolve, reject) => {
-		child.on('exit', (exitCode): void => {
-			if (exitCode === 0) {
-				resolve(stdout)
-			} else {
-				reject(new ChildProcessError(exitCode, stderr))
-			}
-		})
-	})
-
-	return { output, child }
-}
-
-export class ChildProcessError extends Error {
-	constructor(public readonly exitCode: number | null, public readonly stderr: string) {
-		super(`Command has failed(${exitCode}): ${stderr} `)
-	}
-}