@contember/cli 2.1.0-beta.2 → 2.2.0-alpha.1

package/src/commands/tenant/TenantApplyCommand.ts

@@ -0,0 +1,57 @@
+import { Command, CommandConfiguration, Input } from '@contember/cli-common'
+import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'
+import { TenantClient } from '../../lib/tenant/TenantClient.js'
+import { TenantConfigLoader } from '../../lib/tenant/TenantConfigLoader.js'
+import { TenantConfigApplier } from '../../lib/tenant/TenantConfigApplier.js'
+
+type Args = {
+	config?: string
+}
+
+type Options = {
+	dsn?: string
+	['dry-run']?: boolean
+}
+
+const DEFAULT_CONFIG_PATH = 'tenant.config.ts'
+
+export class TenantApplyCommand extends Command<Args, Options> {
+	constructor(
+		private readonly remoteProjectResolver: RemoteProjectResolver,
+		private readonly tenantConfigLoader: TenantConfigLoader,
+		private readonly tenantConfigApplier: TenantConfigApplier,
+	) {
+		super()
+	}
+
+	protected configure(configuration: CommandConfiguration<Args, Options>): void {
+		configuration.description('Apply declarative tenant configuration (global config, identity providers, mail templates)')
+		configuration.argument('config').optional().description(`Path to the tenant config file (default: ${DEFAULT_CONFIG_PATH})`)
+		configuration.option('dsn').valueRequired().description('Project DSN. Falls back to CONTEMBER_* environment variables.')
+		configuration.option('dry-run').valueNone().description('Print the actions that would be performed without executing them.')
+	}
+
+	protected async execute(input: Input<Args, Options>): Promise<void | number> {
+		const configPath = input.getArgument('config') ?? DEFAULT_CONFIG_PATH
+		const dsn = input.getOption('dsn')
+		const dryRun = input.getOption('dry-run') === true
+
+		const remoteProject = this.remoteProjectResolver.resolve(dsn)
+		if (!remoteProject) {
+			throw `Project not defined. Please provide a DSN (--dsn) or set CONTEMBER_* environment variables.`
+		}
+
+		const config = await this.tenantConfigLoader.loadConfig(configPath)
+		const client = TenantClient.create(remoteProject.endpoint, remoteProject.token)
+
+		console.log(`Applying tenant config from ${configPath}`)
+		console.log(`API URL: ${remoteProject.endpoint}`)
+		console.log('')
+
+		await this.tenantConfigApplier.apply(client, config, { dryRun })
+
+		console.log('')
+		console.log(dryRun ? 'Dry run complete. No changes were made.' : 'Tenant configuration applied.')
+		return 0
+	}
+}

package/src/commands/tenant/index.ts

@@ -0,0 +1 @@
+export * from './TenantApplyCommand.js'

package/src/commands/transfer/ExportCommand.ts

@@ -1,11 +1,11 @@
 import { Command, CommandConfiguration, Input } from '@contember/cli-common'
 import { createWriteStream } from 'node:fs'
-import { maskToken } from '../../lib/maskToken'
+import { maskToken } from '../../lib/maskToken.js'
 import { pipeline } from 'node:stream/promises'
-import { printProgressLine } from '../../lib/transfer/stdio'
+import { printProgressLine } from '../../lib/transfer/stdio.js'
 import { createGunzip, createGzip } from 'node:zlib'
-import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
-import { DataTransferClient } from '../../lib/transfer/DataTransferClient'
+import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'
+import { DataTransferClient } from '../../lib/transfer/DataTransferClient.js'
 import { Readable } from 'node:stream'
 
 type Args = {

package/src/commands/transfer/ImportCommand.ts

@@ -1,12 +1,12 @@
 import { Command, CommandConfiguration, Input } from '@contember/cli-common'
 import { createReadStream } from 'node:fs'
 import { createGunzip } from 'node:zlib'
-import { confirmImport } from './utils'
-import { maskToken } from '../../lib/maskToken'
-import { printProgressLine } from '../../lib/transfer/stdio'
-import { readStream } from '../../lib/stream'
-import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
-import { DataTransferClient } from '../../lib/transfer/DataTransferClient'
+import { confirmImport } from './utils.js'
+import { maskToken } from '../../lib/maskToken.js'
+import { printProgressLine } from '../../lib/transfer/stdio.js'
+import { readStream } from '../../lib/stream.js'
+import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'
+import { DataTransferClient } from '../../lib/transfer/DataTransferClient.js'
 
 type Args = {
 	file: string

package/src/commands/transfer/TransferCommand.ts

@@ -1,11 +1,11 @@
 import { Command, CommandConfiguration, Input } from '@contember/cli-common'
-import { confirmImport } from './utils'
-import { maskToken } from '../../lib/maskToken'
-import { printProgressLine } from '../../lib/transfer/stdio'
-import { readStream } from '../../lib/stream'
+import { confirmImport } from './utils.js'
+import { maskToken } from '../../lib/maskToken.js'
+import { printProgressLine } from '../../lib/transfer/stdio.js'
+import { readStream } from '../../lib/stream.js'
 import { createGunzip } from 'node:zlib'
-import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
-import { DataTransferClient } from '../../lib/transfer/DataTransferClient'
+import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'
+import { DataTransferClient } from '../../lib/transfer/DataTransferClient.js'
 import { Duplex, Readable } from 'node:stream'
 
 type Args = {

package/src/commands/transfer/index.ts

@@ -1,3 +1,3 @@
-export * from './ExportCommand'
-export * from './ImportCommand'
-export * from './TransferCommand'
+export * from './ExportCommand.js'
+export * from './ImportCommand.js'
+export * from './TransferCommand.js'

package/src/commands/workspace/WorkspaceUpdateApiCommand.ts

@@ -1,6 +1,6 @@
 import { Command, CommandConfiguration, Input, PackageWorkspaceResolver } from '@contember/cli-common'
-import { DockerComposeManager } from '../../lib/fs/DockerComposeManager'
-import { contemberDockerImages } from '../../consts'
+import { DockerComposeManager } from '../../lib/fs/DockerComposeManager.js'
+import { contemberDockerImages } from '../../consts.js'
 
 type Args = {
 	version: string

package/src/commands/workspace/index.ts

@@ -1 +1 @@
-export * from './WorkspaceUpdateApiCommand'
+export * from './WorkspaceUpdateApiCommand.js'

package/src/dic.ts

@@ -12,19 +12,21 @@ import {
 	ModificationHandlerFactory,
 	SchemaDiffer,
 	SchemaMigrator,
+	SchemaStateManager,
 	SchemaVersionBuilder,
+	SnapshotManager,
 	VERSION_LATEST,
 } from '@contember/migrations-client'
-import { JsCodeRunner } from './lib/js/JsCodeRunner'
-import { EsBuildBuilder } from './lib/js/EsBuildBuilder'
-import { EvalExecutor } from './lib/js/EvalExecutor'
-import { AdminDeployer } from './lib/admin/AdminDeployer'
-import { RemoteProjectResolver } from './lib/project/RemoteProjectResolver'
-import { CliEnv } from './lib/env'
-import { AdminClient } from './lib/admin/AdminClient'
-import { FileSystem } from './lib/fs/FileSystem'
-import { WorkspaceResolver } from './lib/workspace/WorkspaceResolver'
-import { YamlHandler } from './lib/fs/YamlHandler'
+import { JsCodeRunner } from './lib/js/JsCodeRunner.js'
+import { EsBuildBuilder } from './lib/js/EsBuildBuilder.js'
+import { EvalExecutor } from './lib/js/EvalExecutor.js'
+import { AdminDeployer } from './lib/admin/AdminDeployer.js'
+import { RemoteProjectResolver } from './lib/project/RemoteProjectResolver.js'
+import { CliEnv } from './lib/env.js'
+import { AdminClient } from './lib/admin/AdminClient.js'
+import { FileSystem } from './lib/fs/FileSystem.js'
+import { WorkspaceResolver } from './lib/workspace/WorkspaceResolver.js'
+import { YamlHandler } from './lib/fs/YamlHandler.js'
 import {
 	DeployCommand,
 	MigrationAmendCommand,
@@ -32,22 +34,26 @@ import {
 	MigrationDescribeCommand,
 	MigrationDiffCommand,
 	MigrationExecuteCommand,
+	MigrationInitStateCommand,
 	MigrationRebaseCommand,
+	MigrationSnapshotCommand,
 	MigrationStatusCommand,
+	MigrationVerifySnapshotCommand,
 	ProjectGenerateDocumentationCommand,
 	ProjectPrintSchemaCommand,
 	ProjectValidateCommand,
 	VersionCommand,
 	WorkspaceUpdateApiCommand,
-} from './commands'
-import { MigrationExecutionFacade } from './lib/migrations/MigrationExecutionFacade'
-import { MigrationPrinter } from './lib/migrations/MigrationPrinter'
-import { MigrationsStatusFacade } from './lib/migrations/MigrationsStatusFacade'
-import { ImportSchemaLoader, SchemaLoader, TranspilingSchemaLoader } from './lib/schema/SchemaLoader'
-import { MigrationsValidator } from './lib/migrations/MigrationsValidator'
-import { MigrationRebaseFacade } from './lib/migrations/MigrationRebaseFacade'
-import { DataTransferClient } from './lib/transfer/DataTransferClient'
-import { ExportCommand, ImportCommand, TransferCommand } from './commands/transfer'
+} from './commands/index.js'
+import { MigrationExecutionFacade } from './lib/migrations/MigrationExecutionFacade.js'
+import { MigrationPrinter } from './lib/migrations/MigrationPrinter.js'
+import { MigrationSnapshotFacade } from './lib/migrations/MigrationSnapshotFacade.js'
+import { MigrationsStatusFacade } from './lib/migrations/MigrationsStatusFacade.js'
+import { ImportSchemaLoader, SchemaLoader, TranspilingSchemaLoader } from './lib/schema/SchemaLoader.js'
+import { MigrationsValidator } from './lib/migrations/MigrationsValidator.js'
+import { MigrationRebaseFacade } from './lib/migrations/MigrationRebaseFacade.js'
+import { DataTransferClient } from './lib/transfer/DataTransferClient.js'
+import { ExportCommand, ImportCommand, TransferCommand } from './commands/transfer/index.js'
 import {
 	Application,
 	Bun,
@@ -60,18 +66,21 @@ import {
 	Yarn,
 	YarnClassic,
 } from '@contember/cli-common'
-import { VersionChecker } from './lib/VersionChecker'
-import { DockerComposeManager } from './lib/fs/DockerComposeManager'
-import { RemoteProjectProvider } from './lib/project/RemoteProjectProvider'
-import { SystemClientProvider } from './lib/SystemClientProvider'
-import { TenantClientProvider } from './lib/TenantClientProvider'
-import { Workspace } from './lib/workspace/Workspace'
-import { ActionsListVariablesCommand } from './commands/actions/ActionsListVariablesCommand'
-import { ActionsSetVariablesCommand } from './commands/actions/ActionsSetVariablesCommand'
-import { ActionsListFailedEventsCommand } from './commands/actions/ActionsListFailedEventsCommand'
-import { ActionsRetryEventCommand } from './commands/actions/ActionsRetryEventCommand'
-import { ActionsGetEventCommand } from './commands/actions/ActionsGetEventCommand'
-import { ActionsStopEventCommand } from './commands/actions/ActionsStopEventCommand'
+import { VersionChecker } from './lib/VersionChecker.js'
+import { DockerComposeManager } from './lib/fs/DockerComposeManager.js'
+import { RemoteProjectProvider } from './lib/project/RemoteProjectProvider.js'
+import { SystemClientProvider } from './lib/SystemClientProvider.js'
+import { TenantClientProvider } from './lib/TenantClientProvider.js'
+import { Workspace } from './lib/workspace/Workspace.js'
+import { ActionsListVariablesCommand } from './commands/actions/ActionsListVariablesCommand.js'
+import { ActionsSetVariablesCommand } from './commands/actions/ActionsSetVariablesCommand.js'
+import { ActionsListFailedEventsCommand } from './commands/actions/ActionsListFailedEventsCommand.js'
+import { ActionsRetryEventCommand } from './commands/actions/ActionsRetryEventCommand.js'
+import { ActionsGetEventCommand } from './commands/actions/ActionsGetEventCommand.js'
+import { ActionsStopEventCommand } from './commands/actions/ActionsStopEventCommand.js'
+import { TenantApplyCommand } from './commands/tenant/index.js'
+import { ImportTenantConfigLoader, TranspilingTenantConfigLoader } from './lib/tenant/TenantConfigLoader.js'
+import { TenantConfigApplier } from './lib/tenant/TenantConfigApplier.js'
 
 const jsSample = `
 export const query = \`\`
@@ -138,7 +147,12 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 		.addService('modificationHandlerFactory', () => new ModificationHandlerFactory(ModificationHandlerFactory.defaultFactoryMap))
 		.addService('schemaMigrator', ({ modificationHandlerFactory }) => new SchemaMigrator(modificationHandlerFactory))
 		.addService('migrationsResolver', ({ migrationFilesManager }) => new MigrationsResolver(migrationFilesManager))
-		.addService('schemaVersionBuilder', ({ migrationsResolver, schemaMigrator }) => new SchemaVersionBuilder(migrationsResolver, schemaMigrator))
+		.addService('schemaStateManager', ({ workspace }) => new SchemaStateManager(workspace.migrationsDir + '/state'))
+		.addService('snapshotManager', ({ workspace }) => new SnapshotManager(workspace.migrationsDir + '/snapshot.json'))
+		.addService(
+			'schemaVersionBuilder',
+			({ migrationsResolver, schemaMigrator, schemaStateManager }) => new SchemaVersionBuilder(migrationsResolver, schemaMigrator, schemaStateManager),
+		)
 		.addService('schemaDiffer', ({ schemaMigrator }) =>
 			new SchemaDiffer(schemaMigrator, {
 				maxPatchSize: env.migrationsOptions?.maxPatchSize,
@@ -153,6 +167,18 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 		.addService('migrationPrinter', ({ migrationDescriber }) => new MigrationPrinter(migrationDescriber))
 		.addService('migrationsExecutor', () => new MigrationExecutor())
 		.addService('migrationsStatusResolver', () => new MigrationsStatusResolver())
+		.addService(
+			'migrationSnapshotFacade',
+			({ migrationsResolver, schemaVersionBuilder, schemaDiffer, schemaMigrator, schemaStateManager, snapshotManager }) =>
+				new MigrationSnapshotFacade(
+					migrationsResolver,
+					schemaVersionBuilder,
+					schemaDiffer,
+					schemaMigrator,
+					schemaStateManager,
+					snapshotManager,
+				),
+		)
 		.addService(
 			'migrationsStatusFacade',
 			({ systemClientProvider, migrationsResolver, migrationsStatusResolver, migrationPrinter }) =>
@@ -168,6 +194,8 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 				migrationPrinter,
 				migrationsExecutor,
 				migrationsStatusFacade,
+				schemaStateManager,
+				migrationSnapshotFacade,
 			}) =>
 				new MigrationExecutionFacade(
 					systemClientProvider,
@@ -177,13 +205,15 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 					migrationPrinter,
 					migrationsExecutor,
 					migrationsStatusFacade,
+					schemaStateManager,
+					migrationSnapshotFacade,
 				),
 		)
 		.addService('migrationsValidator', ({ migrationDescriber, schemaMigrator }) => new MigrationsValidator(migrationDescriber, schemaMigrator))
 		.addService(
 			'migrationRebaseFacade',
-			({ schemaVersionBuilder, migrationsValidator, systemClientProvider, migrationFilesManager }) =>
-				new MigrationRebaseFacade(schemaVersionBuilder, migrationsValidator, systemClientProvider, migrationFilesManager),
+			({ schemaVersionBuilder, migrationsValidator, systemClientProvider, migrationFilesManager, schemaStateManager }) =>
+				new MigrationRebaseFacade(schemaVersionBuilder, migrationsValidator, systemClientProvider, migrationFilesManager, schemaStateManager),
 		)
 		.addService(
 			'schemaLoader',
@@ -209,6 +239,7 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 				migrationsValidator,
 				migrationPrinter,
 				schemaMigrator,
+				schemaStateManager,
 			}) =>
 				new MigrationAmendCommand(
 					migrationsResolver,
@@ -220,6 +251,7 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 					migrationsValidator,
 					migrationPrinter,
 					schemaMigrator,
+					schemaStateManager,
 				),
 		)
 		.addService('migrationBlankCommand', ({ migrationCreator }) => new MigrationBlankCommand(migrationCreator))
@@ -230,14 +262,31 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 		)
 		.addService(
 			'migrationDiffCommand',
-			({ schemaLoader, schemaVersionBuilder, migrationCreator, migrationPrinter, migrationExecutionFacade }) =>
-				new MigrationDiffCommand(schemaLoader, schemaVersionBuilder, migrationCreator, migrationPrinter, migrationExecutionFacade),
+			({ schemaLoader, schemaVersionBuilder, migrationCreator, migrationPrinter, migrationExecutionFacade, schemaStateManager, migrationsResolver }) =>
+				new MigrationDiffCommand(
+					schemaLoader,
+					schemaVersionBuilder,
+					migrationCreator,
+					migrationPrinter,
+					migrationExecutionFacade,
+					schemaStateManager,
+					migrationsResolver,
+				),
 		)
 		.addService('migrationExecuteCommand', ({ migrationExecutionFacade }) => new MigrationExecuteCommand(migrationExecutionFacade))
+		.addService(
+			'migrationInitStateCommand',
+			({ schemaLoader, schemaStateManager }) => new MigrationInitStateCommand(schemaLoader, schemaStateManager),
+		)
 		.addService(
 			'migrationRebaseCommand',
 			({ migrationsResolver, migrationRebaseFacade }) => new MigrationRebaseCommand(migrationsResolver, migrationRebaseFacade),
 		)
+		.addService('migrationSnapshotCommand', ({ migrationSnapshotFacade }) => new MigrationSnapshotCommand(migrationSnapshotFacade))
+		.addService(
+			'migrationVerifySnapshotCommand',
+			({ migrationSnapshotFacade }) => new MigrationVerifySnapshotCommand(migrationSnapshotFacade),
+		)
 		.addService(
 			'migrationStatusCommand',
 			({ migrationsStatusFacade, migrationFilesManager, systemClientProvider, migrationPrinter }) =>
@@ -270,6 +319,16 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 		.addService('actionsRetryEvent', ({ remoteProjectResolver }) => new ActionsRetryEventCommand(remoteProjectResolver))
 		.addService('actionsGetEvent', ({ remoteProjectResolver }) => new ActionsGetEventCommand(remoteProjectResolver))
 		.addService('actionsStopEvent', ({ remoteProjectResolver }) => new ActionsStopEventCommand(remoteProjectResolver))
+		.addService(
+			'tenantConfigLoader',
+			({ jsCodeRunner }) => runtime === 'bun' ? new ImportTenantConfigLoader() : new TranspilingTenantConfigLoader(jsCodeRunner),
+		)
+		.addService('tenantConfigApplier', () => new TenantConfigApplier())
+		.addService(
+			'tenantApplyCommand',
+			({ remoteProjectResolver, tenantConfigLoader, tenantConfigApplier }) =>
+				new TenantApplyCommand(remoteProjectResolver, tenantConfigLoader, tenantConfigApplier),
+		)
 		.addService('commandList', dic => {
 			const commands: CommandFactoryList = {
 				['deploy']: () => dic.deployCommand,
@@ -280,9 +339,12 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 				['migrations:diff']: () => dic.migrationDiffCommand,
 				['migrations:amend']: () => dic.migrationAmendCommand,
 				['migrations:blank']: () => dic.migrationBlankCommand,
+				['migrations:init-state']: () => dic.migrationInitStateCommand,
 				['migrations:describe']: () => dic.migrationDescribeCommand,
 				['migrations:execute']: () => dic.migrationExecuteCommand,
 				['migrations:rebase']: () => dic.migrationRebaseCommand,
+				['migrations:snapshot']: () => dic.migrationSnapshotCommand,
+				['migrations:verify-snapshot']: () => dic.migrationVerifySnapshotCommand,
 				['migrations:status']: () => dic.migrationStatusCommand,
 				['workspace:update:api']: () => dic.workspaceUpdateCommand,
 				['project:validate']: () => dic.projectValidateCommand,
@@ -294,6 +356,7 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 				['actions:retry-event']: () => dic.actionsRetryEvent,
 				['actions:get-event']: () => dic.actionsGetEvent,
 				['actions:stop-event']: () => dic.actionsStopEvent,
+				['tenant:apply']: () => dic.tenantApplyCommand,
 			}
 			return commands
 		})
@@ -309,7 +372,10 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 				`Contember CLI version ${version}`,
 				{
 					beforeRun: async ({ name }) => {
-						if (!process.env.CONTEMBER_SKIP_VERSION_CHECK && !['deploy', 'version', 'data:export', 'data:import', 'data:transfer'].includes(name)) {
+						if (
+							!process.env.CONTEMBER_SKIP_VERSION_CHECK
+							&& !['deploy', 'version', 'data:export', 'data:import', 'data:transfer', 'tenant:apply'].includes(name)
+						) {
 							await versionChecker.checkVersions()
 						}
 					},

package/src/index.ts

@@ -0,0 +1 @@
+export * from './lib/tenant/tenantConfig.js'

package/src/lib/SystemClientProvider.ts

@@ -1,4 +1,4 @@
-import { RemoteProjectProvider } from './project/RemoteProjectProvider'
+import { RemoteProjectProvider } from './project/RemoteProjectProvider.js'
 import { SystemClient } from '@contember/migrations-client'
 
 export class SystemClientProvider {

package/src/lib/TenantClientProvider.ts

@@ -1,5 +1,5 @@
-import { TenantClient } from './tenant/TenantClient'
-import { RemoteProjectProvider } from './project/RemoteProjectProvider'
+import { TenantClient } from './tenant/TenantClient.js'
+import { RemoteProjectProvider } from './project/RemoteProjectProvider.js'
 
 export class TenantClientProvider {
 	constructor(

package/src/lib/VersionChecker.ts

@@ -1,8 +1,8 @@
 import { join, relative } from 'node:path'
 import * as semver from 'semver'
 import { PackageWorkspaceResolver } from '@contember/cli-common'
-import { DockerComposeManager } from './fs/DockerComposeManager'
-import { contemberDockerImages } from '../consts'
+import { DockerComposeManager } from './fs/DockerComposeManager.js'
+import { contemberDockerImages } from '../consts.js'
 
 export class VersionChecker {
 	constructor(

package/src/lib/admin/AdminClient.ts

@@ -1,5 +1,5 @@
-import { maskToken } from '../maskToken'
-import { RemoteProjectProvider } from '../project/RemoteProjectProvider'
+import { maskToken } from '../maskToken.js'
+import { RemoteProjectProvider } from '../project/RemoteProjectProvider.js'
 
 export type AdminFiles = Array<{ path: string; data: string }>
 export class AdminClient {

package/src/lib/admin/AdminDeployer.ts

@@ -1,6 +1,6 @@
-import { AdminClient, AdminFiles } from './AdminClient'
-import { FileSystem } from '../fs/FileSystem'
-import { RemoteProjectProvider } from '../project/RemoteProjectProvider'
+import { AdminClient, AdminFiles } from './AdminClient.js'
+import { FileSystem } from '../fs/FileSystem.js'
+import { RemoteProjectProvider } from '../project/RemoteProjectProvider.js'
 
 export class AdminDeployer {
 	constructor(

package/src/lib/fs/DockerComposeManager.ts

@@ -1,7 +1,7 @@
 import { dirname, join } from 'node:path'
 import jsyaml from 'js-yaml'
-import { FileSystem } from './FileSystem'
-import { JsonUpdateCallback, YamlHandler } from './YamlHandler'
+import { FileSystem } from './FileSystem.js'
+import { JsonUpdateCallback, YamlHandler } from './YamlHandler.js'
 
 export interface DockerComposeServiceConfig {
 	image?: string

package/src/lib/fs/YamlHandler.ts

@@ -1,8 +1,8 @@
 import { readFile, writeFile } from 'node:fs/promises'
 import jsyaml from 'js-yaml'
-import { FileSystem } from './FileSystem'
+import { FileSystem } from './FileSystem.js'
 import YAWN from 'yawn-yaml'
-import { JSONObject, JSONPrimitive } from '../json'
+import { JSONObject, JSONPrimitive } from '../json.js'
 import { Merger } from '@contember/config-loader'
 
 export type JsonUpdateCallback<Value = JSONObject> = (

package/src/lib/js/EsBuildBuilder.ts

@@ -1,4 +1,4 @@
-import { JsBuilder } from './JsBuilder'
+import { JsBuilder } from './JsBuilder.js'
 
 export class EsBuildBuilder implements JsBuilder {
 	async build(path: string): Promise<string> {

package/src/lib/js/EvalExecutor.ts

@@ -1,4 +1,4 @@
-import { JsExecutor } from './JsExecutor'
+import { JsExecutor } from './JsExecutor.js'
 
 export class EvalExecutor implements JsExecutor {
 	public async execute(code: string): Promise<unknown> {

package/src/lib/js/JsCodeRunner.ts

@@ -1,5 +1,5 @@
-import { JsBuilder } from './JsBuilder'
-import { JsExecutor } from './JsExecutor'
+import { JsBuilder } from './JsBuilder.js'
+import { JsExecutor } from './JsExecutor.js'
 
 export class JsCodeRunner {
 	constructor(