@contember/cli 2.2.0-alpha.3 → 2.2.0-alpha.4

package/dist/production/src/commands/transfer/ImportCommand.js

@@ -1,14 +1,18 @@
-import { Command } from "@contember/cli-common";
+import { Command, CliError, ExitCode, escapeTerminalText } from "@contember/cli-common";
 import { createReadStream } from "node:fs";
 import { createGunzip } from "node:zlib";
+import { PassThrough } from "node:stream";
+import { pipeline } from "node:stream/promises";
 import { confirmImport } from "./utils.js";
 import { maskToken } from "../../lib/maskToken.js";
-import { printProgressLine } from "../../lib/transfer/stdio.js";
+import { createProgressReporter } from "../../lib/transfer/stdio.js";
+import { toDataTransferStreamError } from "../../lib/transfer/DataTransferClient.js";
 class ImportCommand extends Command {
-  constructor(remoteProjectResolver, dataTransferClient) {
+  constructor(remoteProjectResolver, dataTransferClient, inputStreamFactory = (path) => createReadStream(path)) {
     super();
     this.remoteProjectResolver = remoteProjectResolver;
     this.dataTransferClient = dataTransferClient;
+    this.inputStreamFactory = inputStreamFactory;
   }
   configure(configuration) {
     configuration.description("Import data into a project");
@@ -16,45 +20,84 @@ class ImportCommand extends Command {
     configuration.argument("target").optional();
     configuration.option("no-gzip-transfer").valueNone();
     configuration.option("yes").valueNone();
+    configuration.option("dry-run").valueNone().description("Print what would happen without importing any data.");
   }
-  async execute(input) {
+  async execute(input, output) {
     const target = input.getArgument("target");
     const project = await this.remoteProjectResolver.resolve(target);
     if (!project) {
-      throw `Target project not defined`;
-    }
-    console.log("");
-    console.log("Importing data into a following project");
-    console.log("");
-    console.log(`Project name: ${project.name}`);
-    console.log(`API URL: ${project.endpoint}`);
-    console.log(`Token: ${maskToken(project.token)}`);
-    console.log("");
-    if (!await confirmImport(input)) {
-      return 1;
+      throw new CliError("Target project not defined", { code: "PROJECT_NOT_DEFINED", exitCode: ExitCode.NotFound });
     }
     const file = input.getArgument("file");
-    const baseInputStream = createReadStream(file);
-    const stream = file.endsWith(".gz") ? baseInputStream.pipe(createGunzip()) : baseInputStream;
-    stream.on("error", (err) => {
-      console.error("Error in import stream:", err);
-    });
+    if (input.getOption("dry-run") === true) {
+      output.data(
+        {
+          dryRun: true,
+          source: file,
+          target: { project: project.name, endpoint: project.endpoint },
+          wipesTarget: true
+        },
+        {
+          human: (it) => [
+            "Would import data into the following project",
+            "",
+            `Source file: ${escapeTerminalText(it.source)}`,
+            `Project name: ${escapeTerminalText(it.target.project)}`,
+            `API URL: ${escapeTerminalText(it.target.endpoint)}`,
+            `Token: ${escapeTerminalText(maskToken(project.token))}`,
+            "",
+            "This would completely wipe the target project.",
+            "No data was imported."
+          ].join("\n"),
+          quiet: (it) => it.target.project
+        }
+      );
+      return ExitCode.Success;
+    }
+    output.info("");
+    output.info("Importing data into a following project");
+    output.info("");
+    output.info(`Project name: ${project.name}`);
+    output.info(`API URL: ${project.endpoint}`);
+    output.info(`Token: ${maskToken(project.token)}`);
+    output.info("");
+    if (!await confirmImport(input, output)) {
+      return ExitCode.InputError;
+    }
+    const baseInputStream = this.inputStreamFactory(file);
     const gzipTransfer = !input.getOption("no-gzip-transfer");
-    const response = await this.dataTransferClient.dataImport({
+    const runImport = (stream) => this.dataTransferClient.dataImport({
       stream,
       project,
-      printProgress: printProgressLine,
+      printProgress: createProgressReporter(output),
       gzip: gzipTransfer
     });
-    console.log("");
-    const responseData = await response.json();
-    if (responseData.ok) {
-      console.log("Import done.");
+    if (file.endsWith(".gz")) {
+      const decompressedStream = new PassThrough();
+      const sourcePipeline = pipeline(baseInputStream, createGunzip(), decompressedStream).catch((cause) => {
+        throw toDataTransferStreamError("Import", cause);
+      });
+      const importOperation = runImport(decompressedStream);
+      try {
+        await Promise.all([sourcePipeline, importOperation]);
+      } catch (cause) {
+        baseInputStream.destroy();
+        decompressedStream.destroy();
+        await Promise.allSettled([sourcePipeline, importOperation]);
+        throw cause instanceof CliError ? cause : toDataTransferStreamError("Import", cause);
+      }
     } else {
-      console.error("Import failed:");
-      console.log(responseData);
-      return 1;
+      await runImport(baseInputStream);
     }
+    const result = {
+      source: file,
+      target: { project: project.name, endpoint: project.endpoint },
+      imported: true
+    };
+    output.data(result, {
+      human: () => "\nImport done.",
+      quiet: (it) => it.target.project
+    });
   }
 }
 export {

package/dist/production/src/commands/transfer/ImportCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImportCommand.js","sources":["../../../../../../packages/cli/src/commands/transfer/ImportCommand.ts"],"sourcesContent":["import { Command, CommandConfiguration, Input } from '@contember/cli-common'\nimport { createReadStream } from 'node:fs'\nimport { createGunzip } from 'node:zlib'\nimport { confirmImport } from './utils.js'\nimport { maskToken } from '../../lib/maskToken.js'\nimport { printProgressLine } from '../../lib/transfer/stdio.js'\nimport { readStream } from '../../lib/stream.js'\nimport { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'\nimport { DataTransferClient } from '../../lib/transfer/DataTransferClient.js'\n\ntype Args = {\n\tfile: string\n\ttarget?: string\n}\ntype Options = {\n\t'yes': boolean\n\t'no-gzip-transfer'?: boolean\n}\n\nexport class ImportCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly remoteProjectResolver: RemoteProjectResolver,\n\t\tprivate readonly dataTransferClient: DataTransferClient,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Import data into a project')\n\t\tconfiguration.argument('file')\n\t\tconfiguration.argument('target').optional()\n\t\tconfiguration.option('no-gzip-transfer').valueNone()\n\t\tconfiguration.option('yes').valueNone()\n\t}\n\n\tprotected async execute(input: Input<Args, Options>): Promise<void | number> {\n\t\tconst target = input.getArgument('target')\n\t\tconst project = await this.remoteProjectResolver.resolve(target)\n\t\tif (!project) {\n\t\t\tthrow `Target project not defined`\n\t\t}\n\t\tconsole.log('')\n\t\tconsole.log('Importing data into a following project')\n\t\tconsole.log('')\n\t\tconsole.log(`Project name: ${project.name}`)\n\t\tconsole.log(`API URL: ${project.endpoint}`)\n\t\tconsole.log(`Token: ${maskToken(project.token)}`)\n\t\tconsole.log('')\n\t\tif (!await confirmImport(input)) {\n\t\t\treturn 1\n\t\t}\n\t\tconst file = input.getArgument('file')\n\t\tconst baseInputStream = createReadStream(file)\n\t\tconst stream = file.endsWith('.gz') ? baseInputStream.pipe(createGunzip()) : baseInputStream\n\t\tstream.on('error', (err: any) => {\n\t\t\tconsole.error('Error in import stream:', err)\n\t\t})\n\n\t\tconst gzipTransfer = !input.getOption('no-gzip-transfer')\n\t\tconst response = await this.dataTransferClient.dataImport({\n\t\t\tstream: stream,\n\t\t\tproject,\n\t\t\tprintProgress: printProgressLine,\n\t\t\tgzip: gzipTransfer,\n\t\t})\n\t\tconsole.log('')\n\t\tconst responseData = await response.json()\n\t\tif (responseData.ok) {\n\t\t\tconsole.log('Import done.')\n\t\t} else {\n\t\t\tconsole.error('Import failed:')\n\t\t\tconsole.log(responseData)\n\t\t\treturn 1\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;;;;AAmBO,MAAM,sBAAsB,QAAuB;AAAA,EACzD,YACkB,uBACA,oBAChB;AACD,UAAA;AAHiB,SAAA,wBAAA;AACA,SAAA,qBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,4BAA4B;AACtD,kBAAc,SAAS,MAAM;AAC7B,kBAAc,SAAS,QAAQ,EAAE,SAAA;AACjC,kBAAc,OAAO,kBAAkB,EAAE,UAAA;AACzC,kBAAc,OAAO,KAAK,EAAE,UAAA;AAAA,EAC7B;AAAA,EAEA,MAAgB,QAAQ,OAAqD;AAC5E,UAAM,SAAS,MAAM,YAAY,QAAQ;AACzC,UAAM,UAAU,MAAM,KAAK,sBAAsB,QAAQ,MAAM;AAC/D,QAAI,CAAC,SAAS;AACb,YAAM;AAAA,IACP;AACA,YAAQ,IAAI,EAAE;AACd,YAAQ,IAAI,yCAAyC;AACrD,YAAQ,IAAI,EAAE;AACd,YAAQ,IAAI,iBAAiB,QAAQ,IAAI,EAAE;AAC3C,YAAQ,IAAI,YAAY,QAAQ,QAAQ,EAAE;AAC1C,YAAQ,IAAI,UAAU,UAAU,QAAQ,KAAK,CAAC,EAAE;AAChD,YAAQ,IAAI,EAAE;AACd,QAAI,CAAC,MAAM,cAAc,KAAK,GAAG;AAChC,aAAO;AAAA,IACR;AACA,UAAM,OAAO,MAAM,YAAY,MAAM;AACrC,UAAM,kBAAkB,iBAAiB,IAAI;AAC7C,UAAM,SAAS,KAAK,SAAS,KAAK,IAAI,gBAAgB,KAAK,aAAA,CAAc,IAAI;AAC7E,WAAO,GAAG,SAAS,CAAC,QAAa;AAChC,cAAQ,MAAM,2BAA2B,GAAG;AAAA,IAC7C,CAAC;AAED,UAAM,eAAe,CAAC,MAAM,UAAU,kBAAkB;AACxD,UAAM,WAAW,MAAM,KAAK,mBAAmB,WAAW;AAAA,MACzD;AAAA,MACA;AAAA,MACA,eAAe;AAAA,MACf,MAAM;AAAA,IAAA,CACN;AACD,YAAQ,IAAI,EAAE;AACd,UAAM,eAAe,MAAM,SAAS,KAAA;AACpC,QAAI,aAAa,IAAI;AACpB,cAAQ,IAAI,cAAc;AAAA,IAC3B,OAAO;AACN,cAAQ,MAAM,gBAAgB;AAC9B,cAAQ,IAAI,YAAY;AACxB,aAAO;AAAA,IACR;AAAA,EACD;AACD;"}
+{"version":3,"file":"ImportCommand.js","sources":["../../../../../../packages/cli/src/commands/transfer/ImportCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, escapeTerminalText, ExitCode, Input, Output } from '@contember/cli-common'\nimport { createReadStream } from 'node:fs'\nimport { createGunzip } from 'node:zlib'\nimport { PassThrough, Readable } from 'node:stream'\nimport { pipeline } from 'node:stream/promises'\nimport { confirmImport } from './utils.js'\nimport { maskToken } from '../../lib/maskToken.js'\nimport { createProgressReporter } from '../../lib/transfer/stdio.js'\nimport { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'\nimport { DataTransferClient, toDataTransferStreamError } from '../../lib/transfer/DataTransferClient.js'\n\nexport interface ImportResult {\n\treadonly source: string\n\treadonly target: { readonly project: string; readonly endpoint: string }\n\treadonly imported: true\n}\n\ntype Args = {\n\tfile: string\n\ttarget?: string\n}\ntype Options = {\n\t'yes': boolean\n\t'no-gzip-transfer'?: boolean\n\t'dry-run'?: boolean\n}\n\ntype InputStreamFactory = (path: string) => Readable\n\nexport class ImportCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly remoteProjectResolver: RemoteProjectResolver,\n\t\tprivate readonly dataTransferClient: DataTransferClient,\n\t\tprivate readonly inputStreamFactory: InputStreamFactory = path => createReadStream(path),\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Import data into a project')\n\t\tconfiguration.argument('file')\n\t\tconfiguration.argument('target').optional()\n\t\tconfiguration.option('no-gzip-transfer').valueNone()\n\t\tconfiguration.option('yes').valueNone()\n\t\tconfiguration.option('dry-run').valueNone().description('Print what would happen without importing any data.')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void | number> {\n\t\tconst target = input.getArgument('target')\n\t\tconst project = await this.remoteProjectResolver.resolve(target)\n\t\tif (!project) {\n\t\t\tthrow new CliError('Target project not defined', { code: 'PROJECT_NOT_DEFINED', exitCode: ExitCode.NotFound })\n\t\t}\n\t\tconst file = input.getArgument('file')\n\n\t\tif (input.getOption('dry-run') === true) {\n\t\t\toutput.data(\n\t\t\t\t{\n\t\t\t\t\tdryRun: true,\n\t\t\t\t\tsource: file,\n\t\t\t\t\ttarget: { project: project.name, endpoint: project.endpoint },\n\t\t\t\t\twipesTarget: true,\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\thuman: it =>\n\t\t\t\t\t\t[\n\t\t\t\t\t\t\t'Would import data into the following project',\n\t\t\t\t\t\t\t'',\n\t\t\t\t\t\t\t`Source file: ${escapeTerminalText(it.source)}`,\n\t\t\t\t\t\t\t`Project name: ${escapeTerminalText(it.target.project)}`,\n\t\t\t\t\t\t\t`API URL: ${escapeTerminalText(it.target.endpoint)}`,\n\t\t\t\t\t\t\t`Token: ${escapeTerminalText(maskToken(project.token))}`,\n\t\t\t\t\t\t\t'',\n\t\t\t\t\t\t\t'This would completely wipe the target project.',\n\t\t\t\t\t\t\t'No data was imported.',\n\t\t\t\t\t\t].join('\\n'),\n\t\t\t\t\tquiet: it => it.target.project,\n\t\t\t\t},\n\t\t\t)\n\t\t\treturn ExitCode.Success\n\t\t}\n\n\t\toutput.info('')\n\t\toutput.info('Importing data into a following project')\n\t\toutput.info('')\n\t\toutput.info(`Project name: ${project.name}`)\n\t\toutput.info(`API URL: ${project.endpoint}`)\n\t\toutput.info(`Token: ${maskToken(project.token)}`)\n\t\toutput.info('')\n\t\tif (!await confirmImport(input, output)) {\n\t\t\treturn ExitCode.InputError\n\t\t}\n\t\tconst baseInputStream = this.inputStreamFactory(file)\n\t\tconst gzipTransfer = !input.getOption('no-gzip-transfer')\n\t\tconst runImport = (stream: Readable): Promise<void> =>\n\t\t\tthis.dataTransferClient.dataImport({\n\t\t\t\tstream,\n\t\t\t\tproject,\n\t\t\t\tprintProgress: createProgressReporter(output),\n\t\t\t\tgzip: gzipTransfer,\n\t\t\t})\n\t\tif (file.endsWith('.gz')) {\n\t\t\tconst decompressedStream = new PassThrough()\n\t\t\tconst sourcePipeline = pipeline(baseInputStream, createGunzip(), decompressedStream).catch(cause => {\n\t\t\t\tthrow toDataTransferStreamError('Import', cause)\n\t\t\t})\n\t\t\tconst importOperation = runImport(decompressedStream)\n\t\t\ttry {\n\t\t\t\tawait Promise.all([sourcePipeline, importOperation])\n\t\t\t} catch (cause) {\n\t\t\t\tbaseInputStream.destroy()\n\t\t\t\tdecompressedStream.destroy()\n\t\t\t\tawait Promise.allSettled([sourcePipeline, importOperation])\n\t\t\t\tthrow cause instanceof CliError ? cause : toDataTransferStreamError('Import', cause)\n\t\t\t}\n\t\t} else {\n\t\t\tawait runImport(baseInputStream)\n\t\t}\n\t\tconst result: ImportResult = {\n\t\t\tsource: file,\n\t\t\ttarget: { project: project.name, endpoint: project.endpoint },\n\t\t\timported: true,\n\t\t}\n\t\toutput.data(result, {\n\t\t\thuman: () => '\\nImport done.',\n\t\t\tquiet: it => it.target.project,\n\t\t})\n\t}\n}\n"],"names":[],"mappings":"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"}

package/dist/production/src/commands/transfer/TransferCommand.cjs

@@ -4,7 +4,21 @@ const cliCommon = require("@contember/cli-common");
 const utils = require("./utils.cjs");
 const maskToken = require("../../lib/maskToken.cjs");
 const stdio = require("../../lib/transfer/stdio.cjs");
-const node_stream = require("node:stream");
+const DataTransferClient = require("../../lib/transfer/DataTransferClient.cjs");
+const canonicalEndpoint = (endpoint) => {
+  try {
+    const url = new URL(endpoint);
+    url.username = "";
+    url.password = "";
+    url.search = "";
+    url.hash = "";
+    url.pathname = url.pathname.replace(/\/+$/, "");
+    return url.toString().replace(/\/$/, "");
+  } catch {
+    return endpoint.replace(/\/+$/, "");
+  }
+};
+const isSameProject = (source, target) => source.name === target.name && canonicalEndpoint(source.endpoint) === canonicalEndpoint(target.endpoint);
 class TransferCommand extends cliCommon.Command {
   constructor(remoteProjectResolver, dataTransferClient) {
     super();
@@ -19,31 +33,67 @@ class TransferCommand extends cliCommon.Command {
     configuration.option("no-gzip-transfer").valueNone();
     configuration.option("yes").valueNone();
     configuration.option("exclude-table").valueArray();
+    configuration.option("dry-run").valueNone().description("Print what would happen without transferring any data.");
   }
-  async execute(input) {
+  async execute(input, output) {
     const source = input.getArgument("source");
     const sourceProject = await this.remoteProjectResolver.resolve(source);
     if (!sourceProject) {
-      throw `Source project not defined`;
+      throw new cliCommon.CliError("Source project not defined", { code: "PROJECT_NOT_DEFINED", exitCode: cliCommon.ExitCode.NotFound });
     }
     const target = input.getArgument("target");
     const targetProject = await this.remoteProjectResolver.resolve(target);
     if (!targetProject) {
-      throw `Target project not defined`;
+      throw new cliCommon.CliError("Target project not defined", { code: "PROJECT_NOT_DEFINED", exitCode: cliCommon.ExitCode.NotFound });
+    }
+    if (isSameProject(sourceProject, targetProject)) {
+      throw new cliCommon.CliError("Source and target resolve to the same project", {
+        code: "TRANSFER_SOURCE_EQUALS_TARGET",
+        exitCode: cliCommon.ExitCode.InputError,
+        details: { project: sourceProject.name }
+      });
+    }
+    if (input.getOption("dry-run") === true) {
+      output.data(
+        {
+          dryRun: true,
+          source: { project: sourceProject.name, endpoint: sourceProject.endpoint },
+          target: { project: targetProject.name, endpoint: targetProject.endpoint },
+          wipesTarget: true
+        },
+        {
+          human: (it) => [
+            "Would transfer data between projects",
+            "",
+            `Source project name: ${cliCommon.escapeTerminalText(it.source.project)}`,
+            `Source API URL: ${cliCommon.escapeTerminalText(it.source.endpoint)}`,
+            `Source token: ${cliCommon.escapeTerminalText(maskToken.maskToken(sourceProject.token))}`,
+            "",
+            `Target project name: ${cliCommon.escapeTerminalText(it.target.project)}`,
+            `Target API URL: ${cliCommon.escapeTerminalText(it.target.endpoint)}`,
+            `Target token: ${cliCommon.escapeTerminalText(maskToken.maskToken(targetProject.token))}`,
+            "",
+            "This would completely wipe the target project.",
+            "No data was transferred."
+          ].join("\n"),
+          quiet: (it) => it.target.project
+        }
+      );
+      return cliCommon.ExitCode.Success;
     }
-    console.log("");
-    console.log("Transferring data between projects:");
-    console.log("");
-    console.log(`Source project name: ${sourceProject.name}`);
-    console.log(`Source API URL: ${sourceProject.endpoint}`);
-    console.log(`Source token: ${maskToken.maskToken(sourceProject.token)}`);
-    console.log("");
-    console.log(`Target project name: ${targetProject.name}`);
-    console.log(`Target API URL: ${targetProject.endpoint}`);
-    console.log(`Target token: ${maskToken.maskToken(targetProject.token)}`);
-    console.log("");
-    if (!await utils.confirmImport(input)) {
-      return 1;
+    output.info("");
+    output.info("Transferring data between projects:");
+    output.info("");
+    output.info(`Source project name: ${sourceProject.name}`);
+    output.info(`Source API URL: ${sourceProject.endpoint}`);
+    output.info(`Source token: ${maskToken.maskToken(sourceProject.token)}`);
+    output.info("");
+    output.info(`Target project name: ${targetProject.name}`);
+    output.info(`Target API URL: ${targetProject.endpoint}`);
+    output.info(`Target token: ${maskToken.maskToken(targetProject.token)}`);
+    output.info("");
+    if (!await utils.confirmImport(input, output)) {
+      return cliCommon.ExitCode.InputError;
     }
     const includeSystem = input.getOption("include-system") === true;
     const gzipTransfer = !input.getOption("no-gzip-transfer");
@@ -53,21 +103,21 @@ class TransferCommand extends cliCommon.Command {
       excludeTables: input.getOption("exclude-table") ?? [],
       gzip: gzipTransfer
     });
-    const stream = node_stream.Readable.fromWeb(exportResponse.body);
-    const importResponse = await this.dataTransferClient.dataImport({
-      stream,
+    await this.dataTransferClient.dataImport({
+      stream: DataTransferClient.toDataExportStream(exportResponse),
       project: targetProject,
-      printProgress: stdio.printProgressLine,
+      printProgress: stdio.createProgressReporter(output),
       gzip: gzipTransfer
     });
-    console.log("");
-    const responseData = await importResponse.json();
-    if (responseData.ok) {
-      console.log("Transfer done.");
-    } else {
-      console.error("Transfer failed:");
-      console.log(responseData);
-    }
+    const result = {
+      source: { project: sourceProject.name, endpoint: sourceProject.endpoint },
+      target: { project: targetProject.name, endpoint: targetProject.endpoint },
+      transferred: true
+    };
+    output.data(result, {
+      human: () => "\nTransfer done.",
+      quiet: (it) => it.target.project
+    });
   }
 }
 exports.TransferCommand = TransferCommand;

package/dist/production/src/commands/transfer/TransferCommand.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"TransferCommand.cjs","sources":["../../../../../../packages/cli/src/commands/transfer/TransferCommand.ts"],"sourcesContent":["import { Command, CommandConfiguration, Input } from '@contember/cli-common'\nimport { confirmImport } from './utils.js'\nimport { maskToken } from '../../lib/maskToken.js'\nimport { printProgressLine } from '../../lib/transfer/stdio.js'\nimport { readStream } from '../../lib/stream.js'\nimport { createGunzip } from 'node:zlib'\nimport { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'\nimport { DataTransferClient } from '../../lib/transfer/DataTransferClient.js'\nimport { Duplex, Readable } from 'node:stream'\n\ntype Args = {\n\tsource: string\n\ttarget: string\n}\ntype Options = {\n\t'include-system'?: boolean\n\t'no-gzip-transfer'?: boolean\n\tyes: boolean\n\t'exclude-table'?: string[]\n}\n\nexport class TransferCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly remoteProjectResolver: RemoteProjectResolver,\n\t\tprivate readonly dataTransferClient: DataTransferClient,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Transfer data between projects')\n\t\tconfiguration.argument('source')\n\t\tconfiguration.argument('target').optional()\n\t\tconfiguration.option('include-system').valueNone()\n\t\tconfiguration.option('no-gzip-transfer').valueNone()\n\t\tconfiguration.option('yes').valueNone()\n\t\tconfiguration.option('exclude-table').valueArray()\n\t}\n\n\tprotected async execute(input: Input<Args, Options>): Promise<void | number> {\n\t\tconst source = input.getArgument('source')\n\t\tconst sourceProject = await this.remoteProjectResolver.resolve(source)\n\t\tif (!sourceProject) {\n\t\t\tthrow `Source project not defined`\n\t\t}\n\n\t\tconst target = input.getArgument('target')\n\t\tconst targetProject = await this.remoteProjectResolver.resolve(target)\n\t\tif (!targetProject) {\n\t\t\tthrow `Target project not defined`\n\t\t}\n\n\t\tconsole.log('')\n\t\tconsole.log('Transferring data between projects:')\n\t\tconsole.log('')\n\t\tconsole.log(`Source project name: ${sourceProject.name}`)\n\t\tconsole.log(`Source API URL: ${sourceProject.endpoint}`)\n\t\tconsole.log(`Source token: ${maskToken(sourceProject.token)}`)\n\t\tconsole.log('')\n\t\tconsole.log(`Target project name: ${targetProject.name}`)\n\t\tconsole.log(`Target API URL: ${targetProject.endpoint}`)\n\t\tconsole.log(`Target token: ${maskToken(targetProject.token)}`)\n\t\tconsole.log('')\n\t\tif (!await confirmImport(input)) {\n\t\t\treturn 1\n\t\t}\n\n\t\tconst includeSystem = input.getOption('include-system') === true\n\t\tconst gzipTransfer = !input.getOption('no-gzip-transfer')\n\t\tconst exportResponse = await this.dataTransferClient.dataExport({\n\t\t\tproject: sourceProject,\n\t\t\tincludeSystem,\n\t\t\texcludeTables: input.getOption('exclude-table') ?? [],\n\t\t\tgzip: gzipTransfer,\n\t\t})\n\t\tconst stream = Readable.fromWeb(exportResponse.body! as any)\n\t\tconst importResponse = await this.dataTransferClient.dataImport({\n\t\t\tstream: stream,\n\t\t\tproject: targetProject,\n\t\t\tprintProgress: printProgressLine,\n\t\t\tgzip: gzipTransfer,\n\t\t})\n\t\tconsole.log('')\n\n\t\tconst responseData = await importResponse.json()\n\t\tif (responseData.ok) {\n\t\t\tconsole.log('Transfer done.')\n\t\t} else {\n\t\t\tconsole.error('Transfer failed:')\n\t\t\tconsole.log(responseData)\n\t\t}\n\t}\n}\n"],"names":["Command","maskToken","confirmImport","Readable","printProgressLine"],"mappings":";;;;;;;AAqBO,MAAM,wBAAwBA,UAAAA,QAAuB;AAAA,EAC3D,YACkB,uBACA,oBAChB;AACD,UAAA;AAHiB,SAAA,wBAAA;AACA,SAAA,qBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,gCAAgC;AAC1D,kBAAc,SAAS,QAAQ;AAC/B,kBAAc,SAAS,QAAQ,EAAE,SAAA;AACjC,kBAAc,OAAO,gBAAgB,EAAE,UAAA;AACvC,kBAAc,OAAO,kBAAkB,EAAE,UAAA;AACzC,kBAAc,OAAO,KAAK,EAAE,UAAA;AAC5B,kBAAc,OAAO,eAAe,EAAE,WAAA;AAAA,EACvC;AAAA,EAEA,MAAgB,QAAQ,OAAqD;AAC5E,UAAM,SAAS,MAAM,YAAY,QAAQ;AACzC,UAAM,gBAAgB,MAAM,KAAK,sBAAsB,QAAQ,MAAM;AACrE,QAAI,CAAC,eAAe;AACnB,YAAM;AAAA,IACP;AAEA,UAAM,SAAS,MAAM,YAAY,QAAQ;AACzC,UAAM,gBAAgB,MAAM,KAAK,sBAAsB,QAAQ,MAAM;AACrE,QAAI,CAAC,eAAe;AACnB,YAAM;AAAA,IACP;AAEA,YAAQ,IAAI,EAAE;AACd,YAAQ,IAAI,qCAAqC;AACjD,YAAQ,IAAI,EAAE;AACd,YAAQ,IAAI,wBAAwB,cAAc,IAAI,EAAE;AACxD,YAAQ,IAAI,mBAAmB,cAAc,QAAQ,EAAE;AACvD,YAAQ,IAAI,iBAAiBC,UAAAA,UAAU,cAAc,KAAK,CAAC,EAAE;AAC7D,YAAQ,IAAI,EAAE;AACd,YAAQ,IAAI,wBAAwB,cAAc,IAAI,EAAE;AACxD,YAAQ,IAAI,mBAAmB,cAAc,QAAQ,EAAE;AACvD,YAAQ,IAAI,iBAAiBA,UAAAA,UAAU,cAAc,KAAK,CAAC,EAAE;AAC7D,YAAQ,IAAI,EAAE;AACd,QAAI,CAAC,MAAMC,oBAAc,KAAK,GAAG;AAChC,aAAO;AAAA,IACR;AAEA,UAAM,gBAAgB,MAAM,UAAU,gBAAgB,MAAM;AAC5D,UAAM,eAAe,CAAC,MAAM,UAAU,kBAAkB;AACxD,UAAM,iBAAiB,MAAM,KAAK,mBAAmB,WAAW;AAAA,MAC/D,SAAS;AAAA,MACT;AAAA,MACA,eAAe,MAAM,UAAU,eAAe,KAAK,CAAA;AAAA,MACnD,MAAM;AAAA,IAAA,CACN;AACD,UAAM,SAASC,YAAAA,SAAS,QAAQ,eAAe,IAAY;AAC3D,UAAM,iBAAiB,MAAM,KAAK,mBAAmB,WAAW;AAAA,MAC/D;AAAA,MACA,SAAS;AAAA,MACT,eAAeC,MAAAA;AAAAA,MACf,MAAM;AAAA,IAAA,CACN;AACD,YAAQ,IAAI,EAAE;AAEd,UAAM,eAAe,MAAM,eAAe,KAAA;AAC1C,QAAI,aAAa,IAAI;AACpB,cAAQ,IAAI,gBAAgB;AAAA,IAC7B,OAAO;AACN,cAAQ,MAAM,kBAAkB;AAChC,cAAQ,IAAI,YAAY;AAAA,IACzB;AAAA,EACD;AACD;;"}
+{"version":3,"file":"TransferCommand.cjs","sources":["../../../../../../packages/cli/src/commands/transfer/TransferCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, escapeTerminalText, ExitCode, Input, Output } from '@contember/cli-common'\nimport { confirmImport } from './utils.js'\nimport { maskToken } from '../../lib/maskToken.js'\nimport { createProgressReporter } from '../../lib/transfer/stdio.js'\nimport { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'\nimport { DataTransferClient, toDataExportStream } from '../../lib/transfer/DataTransferClient.js'\n\ntype Args = {\n\tsource: string\n\ttarget: string\n}\ntype Options = {\n\t'include-system'?: boolean\n\t'no-gzip-transfer'?: boolean\n\tyes: boolean\n\t'exclude-table'?: string[]\n\t'dry-run'?: boolean\n}\n\nexport interface TransferResult {\n\treadonly source: { readonly project: string; readonly endpoint: string }\n\treadonly target: { readonly project: string; readonly endpoint: string }\n\treadonly transferred: true\n}\n\nconst canonicalEndpoint = (endpoint: string): string => {\n\ttry {\n\t\tconst url = new URL(endpoint)\n\t\turl.username = ''\n\t\turl.password = ''\n\t\turl.search = ''\n\t\turl.hash = ''\n\t\turl.pathname = url.pathname.replace(/\\/+$/, '')\n\t\treturn url.toString().replace(/\\/$/, '')\n\t} catch {\n\t\treturn endpoint.replace(/\\/+$/, '')\n\t}\n}\n\nconst isSameProject = (\n\tsource: { readonly name: string; readonly endpoint: string },\n\ttarget: { readonly name: string; readonly endpoint: string },\n): boolean => source.name === target.name && canonicalEndpoint(source.endpoint) === canonicalEndpoint(target.endpoint)\n\nexport class TransferCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly remoteProjectResolver: RemoteProjectResolver,\n\t\tprivate readonly dataTransferClient: DataTransferClient,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Transfer data between projects')\n\t\tconfiguration.argument('source')\n\t\tconfiguration.argument('target').optional()\n\t\tconfiguration.option('include-system').valueNone()\n\t\tconfiguration.option('no-gzip-transfer').valueNone()\n\t\tconfiguration.option('yes').valueNone()\n\t\tconfiguration.option('exclude-table').valueArray()\n\t\tconfiguration.option('dry-run').valueNone().description('Print what would happen without transferring any data.')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void | number> {\n\t\tconst source = input.getArgument('source')\n\t\tconst sourceProject = await this.remoteProjectResolver.resolve(source)\n\t\tif (!sourceProject) {\n\t\t\tthrow new CliError('Source project not defined', { code: 'PROJECT_NOT_DEFINED', exitCode: ExitCode.NotFound })\n\t\t}\n\n\t\tconst target = input.getArgument('target')\n\t\tconst targetProject = await this.remoteProjectResolver.resolve(target)\n\t\tif (!targetProject) {\n\t\t\tthrow new CliError('Target project not defined', { code: 'PROJECT_NOT_DEFINED', exitCode: ExitCode.NotFound })\n\t\t}\n\t\tif (isSameProject(sourceProject, targetProject)) {\n\t\t\tthrow new CliError('Source and target resolve to the same project', {\n\t\t\t\tcode: 'TRANSFER_SOURCE_EQUALS_TARGET',\n\t\t\t\texitCode: ExitCode.InputError,\n\t\t\t\tdetails: { project: sourceProject.name },\n\t\t\t})\n\t\t}\n\n\t\tif (input.getOption('dry-run') === true) {\n\t\t\toutput.data(\n\t\t\t\t{\n\t\t\t\t\tdryRun: true,\n\t\t\t\t\tsource: { project: sourceProject.name, endpoint: sourceProject.endpoint },\n\t\t\t\t\ttarget: { project: targetProject.name, endpoint: targetProject.endpoint },\n\t\t\t\t\twipesTarget: true,\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\thuman: it =>\n\t\t\t\t\t\t[\n\t\t\t\t\t\t\t'Would transfer data between projects',\n\t\t\t\t\t\t\t'',\n\t\t\t\t\t\t\t`Source project name: ${escapeTerminalText(it.source.project)}`,\n\t\t\t\t\t\t\t`Source API URL: ${escapeTerminalText(it.source.endpoint)}`,\n\t\t\t\t\t\t\t`Source token: ${escapeTerminalText(maskToken(sourceProject.token))}`,\n\t\t\t\t\t\t\t'',\n\t\t\t\t\t\t\t`Target project name: ${escapeTerminalText(it.target.project)}`,\n\t\t\t\t\t\t\t`Target API URL: ${escapeTerminalText(it.target.endpoint)}`,\n\t\t\t\t\t\t\t`Target token: ${escapeTerminalText(maskToken(targetProject.token))}`,\n\t\t\t\t\t\t\t'',\n\t\t\t\t\t\t\t'This would completely wipe the target project.',\n\t\t\t\t\t\t\t'No data was transferred.',\n\t\t\t\t\t\t].join('\\n'),\n\t\t\t\t\tquiet: it => it.target.project,\n\t\t\t\t},\n\t\t\t)\n\t\t\treturn ExitCode.Success\n\t\t}\n\n\t\toutput.info('')\n\t\toutput.info('Transferring data between projects:')\n\t\toutput.info('')\n\t\toutput.info(`Source project name: ${sourceProject.name}`)\n\t\toutput.info(`Source API URL: ${sourceProject.endpoint}`)\n\t\toutput.info(`Source token: ${maskToken(sourceProject.token)}`)\n\t\toutput.info('')\n\t\toutput.info(`Target project name: ${targetProject.name}`)\n\t\toutput.info(`Target API URL: ${targetProject.endpoint}`)\n\t\toutput.info(`Target token: ${maskToken(targetProject.token)}`)\n\t\toutput.info('')\n\t\tif (!await confirmImport(input, output)) {\n\t\t\treturn ExitCode.InputError\n\t\t}\n\n\t\tconst includeSystem = input.getOption('include-system') === true\n\t\tconst gzipTransfer = !input.getOption('no-gzip-transfer')\n\t\tconst exportResponse = await this.dataTransferClient.dataExport({\n\t\t\tproject: sourceProject,\n\t\t\tincludeSystem,\n\t\t\texcludeTables: input.getOption('exclude-table') ?? [],\n\t\t\tgzip: gzipTransfer,\n\t\t})\n\t\tawait this.dataTransferClient.dataImport({\n\t\t\tstream: toDataExportStream(exportResponse),\n\t\t\tproject: targetProject,\n\t\t\tprintProgress: createProgressReporter(output),\n\t\t\tgzip: gzipTransfer,\n\t\t})\n\t\tconst result: TransferResult = {\n\t\t\tsource: { project: sourceProject.name, endpoint: sourceProject.endpoint },\n\t\t\ttarget: { project: targetProject.name, endpoint: targetProject.endpoint },\n\t\t\ttransferred: true,\n\t\t}\n\t\toutput.data(result, {\n\t\t\thuman: () => '\\nTransfer done.',\n\t\t\tquiet: it => it.target.project,\n\t\t})\n\t}\n}\n"],"names":["Command","CliError","ExitCode","escapeTerminalText","maskToken","confirmImport","toDataExportStream","createProgressReporter"],"mappings":"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"}

package/dist/production/src/commands/transfer/TransferCommand.js

@@ -1,8 +1,22 @@
-import { Command } from "@contember/cli-common";
+import { Command, CliError, ExitCode, escapeTerminalText } from "@contember/cli-common";
 import { confirmImport } from "./utils.js";
 import { maskToken } from "../../lib/maskToken.js";
-import { printProgressLine } from "../../lib/transfer/stdio.js";
-import { Readable } from "node:stream";
+import { createProgressReporter } from "../../lib/transfer/stdio.js";
+import { toDataExportStream } from "../../lib/transfer/DataTransferClient.js";
+const canonicalEndpoint = (endpoint) => {
+  try {
+    const url = new URL(endpoint);
+    url.username = "";
+    url.password = "";
+    url.search = "";
+    url.hash = "";
+    url.pathname = url.pathname.replace(/\/+$/, "");
+    return url.toString().replace(/\/$/, "");
+  } catch {
+    return endpoint.replace(/\/+$/, "");
+  }
+};
+const isSameProject = (source, target) => source.name === target.name && canonicalEndpoint(source.endpoint) === canonicalEndpoint(target.endpoint);
 class TransferCommand extends Command {
   constructor(remoteProjectResolver, dataTransferClient) {
     super();
@@ -17,31 +31,67 @@ class TransferCommand extends Command {
     configuration.option("no-gzip-transfer").valueNone();
     configuration.option("yes").valueNone();
     configuration.option("exclude-table").valueArray();
+    configuration.option("dry-run").valueNone().description("Print what would happen without transferring any data.");
   }
-  async execute(input) {
+  async execute(input, output) {
     const source = input.getArgument("source");
     const sourceProject = await this.remoteProjectResolver.resolve(source);
     if (!sourceProject) {
-      throw `Source project not defined`;
+      throw new CliError("Source project not defined", { code: "PROJECT_NOT_DEFINED", exitCode: ExitCode.NotFound });
     }
     const target = input.getArgument("target");
     const targetProject = await this.remoteProjectResolver.resolve(target);
     if (!targetProject) {
-      throw `Target project not defined`;
+      throw new CliError("Target project not defined", { code: "PROJECT_NOT_DEFINED", exitCode: ExitCode.NotFound });
+    }
+    if (isSameProject(sourceProject, targetProject)) {
+      throw new CliError("Source and target resolve to the same project", {
+        code: "TRANSFER_SOURCE_EQUALS_TARGET",
+        exitCode: ExitCode.InputError,
+        details: { project: sourceProject.name }
+      });
     }
-    console.log("");
-    console.log("Transferring data between projects:");
-    console.log("");
-    console.log(`Source project name: ${sourceProject.name}`);
-    console.log(`Source API URL: ${sourceProject.endpoint}`);
-    console.log(`Source token: ${maskToken(sourceProject.token)}`);
-    console.log("");
-    console.log(`Target project name: ${targetProject.name}`);
-    console.log(`Target API URL: ${targetProject.endpoint}`);
-    console.log(`Target token: ${maskToken(targetProject.token)}`);
-    console.log("");
-    if (!await confirmImport(input)) {
-      return 1;
+    if (input.getOption("dry-run") === true) {
+      output.data(
+        {
+          dryRun: true,
+          source: { project: sourceProject.name, endpoint: sourceProject.endpoint },
+          target: { project: targetProject.name, endpoint: targetProject.endpoint },
+          wipesTarget: true
+        },
+        {
+          human: (it) => [
+            "Would transfer data between projects",
+            "",
+            `Source project name: ${escapeTerminalText(it.source.project)}`,
+            `Source API URL: ${escapeTerminalText(it.source.endpoint)}`,
+            `Source token: ${escapeTerminalText(maskToken(sourceProject.token))}`,
+            "",
+            `Target project name: ${escapeTerminalText(it.target.project)}`,
+            `Target API URL: ${escapeTerminalText(it.target.endpoint)}`,
+            `Target token: ${escapeTerminalText(maskToken(targetProject.token))}`,
+            "",
+            "This would completely wipe the target project.",
+            "No data was transferred."
+          ].join("\n"),
+          quiet: (it) => it.target.project
+        }
+      );
+      return ExitCode.Success;
+    }
+    output.info("");
+    output.info("Transferring data between projects:");
+    output.info("");
+    output.info(`Source project name: ${sourceProject.name}`);
+    output.info(`Source API URL: ${sourceProject.endpoint}`);
+    output.info(`Source token: ${maskToken(sourceProject.token)}`);
+    output.info("");
+    output.info(`Target project name: ${targetProject.name}`);
+    output.info(`Target API URL: ${targetProject.endpoint}`);
+    output.info(`Target token: ${maskToken(targetProject.token)}`);
+    output.info("");
+    if (!await confirmImport(input, output)) {
+      return ExitCode.InputError;
     }
     const includeSystem = input.getOption("include-system") === true;
     const gzipTransfer = !input.getOption("no-gzip-transfer");
@@ -51,21 +101,21 @@ class TransferCommand extends Command {
       excludeTables: input.getOption("exclude-table") ?? [],
       gzip: gzipTransfer
     });
-    const stream = Readable.fromWeb(exportResponse.body);
-    const importResponse = await this.dataTransferClient.dataImport({
-      stream,
+    await this.dataTransferClient.dataImport({
+      stream: toDataExportStream(exportResponse),
       project: targetProject,
-      printProgress: printProgressLine,
+      printProgress: createProgressReporter(output),
       gzip: gzipTransfer
     });
-    console.log("");
-    const responseData = await importResponse.json();
-    if (responseData.ok) {
-      console.log("Transfer done.");
-    } else {
-      console.error("Transfer failed:");
-      console.log(responseData);
-    }
+    const result = {
+      source: { project: sourceProject.name, endpoint: sourceProject.endpoint },
+      target: { project: targetProject.name, endpoint: targetProject.endpoint },
+      transferred: true
+    };
+    output.data(result, {
+      human: () => "\nTransfer done.",
+      quiet: (it) => it.target.project
+    });
   }
 }
 export {

package/dist/production/src/commands/transfer/TransferCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"TransferCommand.js","sources":["../../../../../../packages/cli/src/commands/transfer/TransferCommand.ts"],"sourcesContent":["import { Command, CommandConfiguration, Input } from '@contember/cli-common'\nimport { confirmImport } from './utils.js'\nimport { maskToken } from '../../lib/maskToken.js'\nimport { printProgressLine } from '../../lib/transfer/stdio.js'\nimport { readStream } from '../../lib/stream.js'\nimport { createGunzip } from 'node:zlib'\nimport { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'\nimport { DataTransferClient } from '../../lib/transfer/DataTransferClient.js'\nimport { Duplex, Readable } from 'node:stream'\n\ntype Args = {\n\tsource: string\n\ttarget: string\n}\ntype Options = {\n\t'include-system'?: boolean\n\t'no-gzip-transfer'?: boolean\n\tyes: boolean\n\t'exclude-table'?: string[]\n}\n\nexport class TransferCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly remoteProjectResolver: RemoteProjectResolver,\n\t\tprivate readonly dataTransferClient: DataTransferClient,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Transfer data between projects')\n\t\tconfiguration.argument('source')\n\t\tconfiguration.argument('target').optional()\n\t\tconfiguration.option('include-system').valueNone()\n\t\tconfiguration.option('no-gzip-transfer').valueNone()\n\t\tconfiguration.option('yes').valueNone()\n\t\tconfiguration.option('exclude-table').valueArray()\n\t}\n\n\tprotected async execute(input: Input<Args, Options>): Promise<void | number> {\n\t\tconst source = input.getArgument('source')\n\t\tconst sourceProject = await this.remoteProjectResolver.resolve(source)\n\t\tif (!sourceProject) {\n\t\t\tthrow `Source project not defined`\n\t\t}\n\n\t\tconst target = input.getArgument('target')\n\t\tconst targetProject = await this.remoteProjectResolver.resolve(target)\n\t\tif (!targetProject) {\n\t\t\tthrow `Target project not defined`\n\t\t}\n\n\t\tconsole.log('')\n\t\tconsole.log('Transferring data between projects:')\n\t\tconsole.log('')\n\t\tconsole.log(`Source project name: ${sourceProject.name}`)\n\t\tconsole.log(`Source API URL: ${sourceProject.endpoint}`)\n\t\tconsole.log(`Source token: ${maskToken(sourceProject.token)}`)\n\t\tconsole.log('')\n\t\tconsole.log(`Target project name: ${targetProject.name}`)\n\t\tconsole.log(`Target API URL: ${targetProject.endpoint}`)\n\t\tconsole.log(`Target token: ${maskToken(targetProject.token)}`)\n\t\tconsole.log('')\n\t\tif (!await confirmImport(input)) {\n\t\t\treturn 1\n\t\t}\n\n\t\tconst includeSystem = input.getOption('include-system') === true\n\t\tconst gzipTransfer = !input.getOption('no-gzip-transfer')\n\t\tconst exportResponse = await this.dataTransferClient.dataExport({\n\t\t\tproject: sourceProject,\n\t\t\tincludeSystem,\n\t\t\texcludeTables: input.getOption('exclude-table') ?? [],\n\t\t\tgzip: gzipTransfer,\n\t\t})\n\t\tconst stream = Readable.fromWeb(exportResponse.body! as any)\n\t\tconst importResponse = await this.dataTransferClient.dataImport({\n\t\t\tstream: stream,\n\t\t\tproject: targetProject,\n\t\t\tprintProgress: printProgressLine,\n\t\t\tgzip: gzipTransfer,\n\t\t})\n\t\tconsole.log('')\n\n\t\tconst responseData = await importResponse.json()\n\t\tif (responseData.ok) {\n\t\t\tconsole.log('Transfer done.')\n\t\t} else {\n\t\t\tconsole.error('Transfer failed:')\n\t\t\tconsole.log(responseData)\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;;;AAqBO,MAAM,wBAAwB,QAAuB;AAAA,EAC3D,YACkB,uBACA,oBAChB;AACD,UAAA;AAHiB,SAAA,wBAAA;AACA,SAAA,qBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,gCAAgC;AAC1D,kBAAc,SAAS,QAAQ;AAC/B,kBAAc,SAAS,QAAQ,EAAE,SAAA;AACjC,kBAAc,OAAO,gBAAgB,EAAE,UAAA;AACvC,kBAAc,OAAO,kBAAkB,EAAE,UAAA;AACzC,kBAAc,OAAO,KAAK,EAAE,UAAA;AAC5B,kBAAc,OAAO,eAAe,EAAE,WAAA;AAAA,EACvC;AAAA,EAEA,MAAgB,QAAQ,OAAqD;AAC5E,UAAM,SAAS,MAAM,YAAY,QAAQ;AACzC,UAAM,gBAAgB,MAAM,KAAK,sBAAsB,QAAQ,MAAM;AACrE,QAAI,CAAC,eAAe;AACnB,YAAM;AAAA,IACP;AAEA,UAAM,SAAS,MAAM,YAAY,QAAQ;AACzC,UAAM,gBAAgB,MAAM,KAAK,sBAAsB,QAAQ,MAAM;AACrE,QAAI,CAAC,eAAe;AACnB,YAAM;AAAA,IACP;AAEA,YAAQ,IAAI,EAAE;AACd,YAAQ,IAAI,qCAAqC;AACjD,YAAQ,IAAI,EAAE;AACd,YAAQ,IAAI,wBAAwB,cAAc,IAAI,EAAE;AACxD,YAAQ,IAAI,mBAAmB,cAAc,QAAQ,EAAE;AACvD,YAAQ,IAAI,iBAAiB,UAAU,cAAc,KAAK,CAAC,EAAE;AAC7D,YAAQ,IAAI,EAAE;AACd,YAAQ,IAAI,wBAAwB,cAAc,IAAI,EAAE;AACxD,YAAQ,IAAI,mBAAmB,cAAc,QAAQ,EAAE;AACvD,YAAQ,IAAI,iBAAiB,UAAU,cAAc,KAAK,CAAC,EAAE;AAC7D,YAAQ,IAAI,EAAE;AACd,QAAI,CAAC,MAAM,cAAc,KAAK,GAAG;AAChC,aAAO;AAAA,IACR;AAEA,UAAM,gBAAgB,MAAM,UAAU,gBAAgB,MAAM;AAC5D,UAAM,eAAe,CAAC,MAAM,UAAU,kBAAkB;AACxD,UAAM,iBAAiB,MAAM,KAAK,mBAAmB,WAAW;AAAA,MAC/D,SAAS;AAAA,MACT;AAAA,MACA,eAAe,MAAM,UAAU,eAAe,KAAK,CAAA;AAAA,MACnD,MAAM;AAAA,IAAA,CACN;AACD,UAAM,SAAS,SAAS,QAAQ,eAAe,IAAY;AAC3D,UAAM,iBAAiB,MAAM,KAAK,mBAAmB,WAAW;AAAA,MAC/D;AAAA,MACA,SAAS;AAAA,MACT,eAAe;AAAA,MACf,MAAM;AAAA,IAAA,CACN;AACD,YAAQ,IAAI,EAAE;AAEd,UAAM,eAAe,MAAM,eAAe,KAAA;AAC1C,QAAI,aAAa,IAAI;AACpB,cAAQ,IAAI,gBAAgB;AAAA,IAC7B,OAAO;AACN,cAAQ,MAAM,kBAAkB;AAChC,cAAQ,IAAI,YAAY;AAAA,IACzB;AAAA,EACD;AACD;"}
+{"version":3,"file":"TransferCommand.js","sources":["../../../../../../packages/cli/src/commands/transfer/TransferCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, escapeTerminalText, ExitCode, Input, Output } from '@contember/cli-common'\nimport { confirmImport } from './utils.js'\nimport { maskToken } from '../../lib/maskToken.js'\nimport { createProgressReporter } from '../../lib/transfer/stdio.js'\nimport { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'\nimport { DataTransferClient, toDataExportStream } from '../../lib/transfer/DataTransferClient.js'\n\ntype Args = {\n\tsource: string\n\ttarget: string\n}\ntype Options = {\n\t'include-system'?: boolean\n\t'no-gzip-transfer'?: boolean\n\tyes: boolean\n\t'exclude-table'?: string[]\n\t'dry-run'?: boolean\n}\n\nexport interface TransferResult {\n\treadonly source: { readonly project: string; readonly endpoint: string }\n\treadonly target: { readonly project: string; readonly endpoint: string }\n\treadonly transferred: true\n}\n\nconst canonicalEndpoint = (endpoint: string): string => {\n\ttry {\n\t\tconst url = new URL(endpoint)\n\t\turl.username = ''\n\t\turl.password = ''\n\t\turl.search = ''\n\t\turl.hash = ''\n\t\turl.pathname = url.pathname.replace(/\\/+$/, '')\n\t\treturn url.toString().replace(/\\/$/, '')\n\t} catch {\n\t\treturn endpoint.replace(/\\/+$/, '')\n\t}\n}\n\nconst isSameProject = (\n\tsource: { readonly name: string; readonly endpoint: string },\n\ttarget: { readonly name: string; readonly endpoint: string },\n): boolean => source.name === target.name && canonicalEndpoint(source.endpoint) === canonicalEndpoint(target.endpoint)\n\nexport class TransferCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly remoteProjectResolver: RemoteProjectResolver,\n\t\tprivate readonly dataTransferClient: DataTransferClient,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Transfer data between projects')\n\t\tconfiguration.argument('source')\n\t\tconfiguration.argument('target').optional()\n\t\tconfiguration.option('include-system').valueNone()\n\t\tconfiguration.option('no-gzip-transfer').valueNone()\n\t\tconfiguration.option('yes').valueNone()\n\t\tconfiguration.option('exclude-table').valueArray()\n\t\tconfiguration.option('dry-run').valueNone().description('Print what would happen without transferring any data.')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void | number> {\n\t\tconst source = input.getArgument('source')\n\t\tconst sourceProject = await this.remoteProjectResolver.resolve(source)\n\t\tif (!sourceProject) {\n\t\t\tthrow new CliError('Source project not defined', { code: 'PROJECT_NOT_DEFINED', exitCode: ExitCode.NotFound })\n\t\t}\n\n\t\tconst target = input.getArgument('target')\n\t\tconst targetProject = await this.remoteProjectResolver.resolve(target)\n\t\tif (!targetProject) {\n\t\t\tthrow new CliError('Target project not defined', { code: 'PROJECT_NOT_DEFINED', exitCode: ExitCode.NotFound })\n\t\t}\n\t\tif (isSameProject(sourceProject, targetProject)) {\n\t\t\tthrow new CliError('Source and target resolve to the same project', {\n\t\t\t\tcode: 'TRANSFER_SOURCE_EQUALS_TARGET',\n\t\t\t\texitCode: ExitCode.InputError,\n\t\t\t\tdetails: { project: sourceProject.name },\n\t\t\t})\n\t\t}\n\n\t\tif (input.getOption('dry-run') === true) {\n\t\t\toutput.data(\n\t\t\t\t{\n\t\t\t\t\tdryRun: true,\n\t\t\t\t\tsource: { project: sourceProject.name, endpoint: sourceProject.endpoint },\n\t\t\t\t\ttarget: { project: targetProject.name, endpoint: targetProject.endpoint },\n\t\t\t\t\twipesTarget: true,\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\thuman: it =>\n\t\t\t\t\t\t[\n\t\t\t\t\t\t\t'Would transfer data between projects',\n\t\t\t\t\t\t\t'',\n\t\t\t\t\t\t\t`Source project name: ${escapeTerminalText(it.source.project)}`,\n\t\t\t\t\t\t\t`Source API URL: ${escapeTerminalText(it.source.endpoint)}`,\n\t\t\t\t\t\t\t`Source token: ${escapeTerminalText(maskToken(sourceProject.token))}`,\n\t\t\t\t\t\t\t'',\n\t\t\t\t\t\t\t`Target project name: ${escapeTerminalText(it.target.project)}`,\n\t\t\t\t\t\t\t`Target API URL: ${escapeTerminalText(it.target.endpoint)}`,\n\t\t\t\t\t\t\t`Target token: ${escapeTerminalText(maskToken(targetProject.token))}`,\n\t\t\t\t\t\t\t'',\n\t\t\t\t\t\t\t'This would completely wipe the target project.',\n\t\t\t\t\t\t\t'No data was transferred.',\n\t\t\t\t\t\t].join('\\n'),\n\t\t\t\t\tquiet: it => it.target.project,\n\t\t\t\t},\n\t\t\t)\n\t\t\treturn ExitCode.Success\n\t\t}\n\n\t\toutput.info('')\n\t\toutput.info('Transferring data between projects:')\n\t\toutput.info('')\n\t\toutput.info(`Source project name: ${sourceProject.name}`)\n\t\toutput.info(`Source API URL: ${sourceProject.endpoint}`)\n\t\toutput.info(`Source token: ${maskToken(sourceProject.token)}`)\n\t\toutput.info('')\n\t\toutput.info(`Target project name: ${targetProject.name}`)\n\t\toutput.info(`Target API URL: ${targetProject.endpoint}`)\n\t\toutput.info(`Target token: ${maskToken(targetProject.token)}`)\n\t\toutput.info('')\n\t\tif (!await confirmImport(input, output)) {\n\t\t\treturn ExitCode.InputError\n\t\t}\n\n\t\tconst includeSystem = input.getOption('include-system') === true\n\t\tconst gzipTransfer = !input.getOption('no-gzip-transfer')\n\t\tconst exportResponse = await this.dataTransferClient.dataExport({\n\t\t\tproject: sourceProject,\n\t\t\tincludeSystem,\n\t\t\texcludeTables: input.getOption('exclude-table') ?? [],\n\t\t\tgzip: gzipTransfer,\n\t\t})\n\t\tawait this.dataTransferClient.dataImport({\n\t\t\tstream: toDataExportStream(exportResponse),\n\t\t\tproject: targetProject,\n\t\t\tprintProgress: createProgressReporter(output),\n\t\t\tgzip: gzipTransfer,\n\t\t})\n\t\tconst result: TransferResult = {\n\t\t\tsource: { project: sourceProject.name, endpoint: sourceProject.endpoint },\n\t\t\ttarget: { project: targetProject.name, endpoint: targetProject.endpoint },\n\t\t\ttransferred: true,\n\t\t}\n\t\toutput.data(result, {\n\t\t\thuman: () => '\\nTransfer done.',\n\t\t\tquiet: it => it.target.project,\n\t\t})\n\t}\n}\n"],"names":[],"mappings":"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"}

package/dist/production/src/commands/transfer/utils.cjs

@@ -1,19 +1,21 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const prompts = require("prompts");
-const confirmImport = async (input) => {
+const cliCommon = require("@contember/cli-common");
+const prompt = require("../../lib/prompt/prompt.cjs");
+const confirmImport = async (input, output) => {
   if (input.getOption("yes")) {
     return true;
   }
-  if (!process.stdin.isTTY) {
-    throw "TTY not available. Pass --yes option to confirm execution.";
+  if (!output.canPrompt()) {
+    throw new cliCommon.CliError("TTY not available. Pass --yes to confirm execution.", {
+      code: "TTY_UNAVAILABLE",
+      exitCode: cliCommon.ExitCode.InputError
+    });
   }
-  console.log("This will completely wipe the target project.");
-  console.log("(to skip this dialog, you can pass --yes option)");
-  console.log("");
-  const { ok } = await prompts({
-    type: "confirm",
-    name: "ok",
+  output.warn("This will completely wipe the target project.");
+  output.info("(to skip this dialog, you can pass --yes option)");
+  output.info("");
+  const ok = await prompt.promptConfirm(output, {
     message: `Do you want to continue?`
   });
   return ok;

package/dist/production/src/commands/transfer/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","sources":["../../../../../../packages/cli/src/commands/transfer/utils.ts"],"sourcesContent":["import { Input } from '@contember/cli-common'\nimport prompts from 'prompts'\n\nexport const confirmImport = async (input: Input<{}, { yes: boolean }>): Promise<boolean> => {\n\tif (input.getOption('yes')) {\n\t\treturn true\n\t}\n\tif (!process.stdin.isTTY) {\n\t\tthrow 'TTY not available. Pass --yes option to confirm execution.'\n\t}\n\tconsole.log('This will completely wipe the target project.')\n\tconsole.log('(to skip this dialog, you can pass --yes option)')\n\tconsole.log('')\n\tconst { ok } = await prompts({\n\t\ttype: 'confirm',\n\t\tname: 'ok',\n\t\tmessage: `Do you want to continue?`,\n\t})\n\treturn ok\n}\n"],"names":[],"mappings":";;;AAGO,MAAM,gBAAgB,OAAO,UAAyD;AAC5F,MAAI,MAAM,UAAU,KAAK,GAAG;AAC3B,WAAO;AAAA,EACR;AACA,MAAI,CAAC,QAAQ,MAAM,OAAO;AACzB,UAAM;AAAA,EACP;AACA,UAAQ,IAAI,+CAA+C;AAC3D,UAAQ,IAAI,kDAAkD;AAC9D,UAAQ,IAAI,EAAE;AACd,QAAM,EAAE,OAAO,MAAM,QAAQ;AAAA,IAC5B,MAAM;AAAA,IACN,MAAM;AAAA,IACN,SAAS;AAAA,EAAA,CACT;AACD,SAAO;AACR;;"}
+{"version":3,"file":"utils.cjs","sources":["../../../../../../packages/cli/src/commands/transfer/utils.ts"],"sourcesContent":["import { CliError, ExitCode, Input, Output } from '@contember/cli-common'\nimport { promptConfirm } from '../../lib/prompt/index.js'\n\nexport const confirmImport = async (input: Input<{}, { yes: boolean }>, output: Output): Promise<boolean> => {\n\tif (input.getOption('yes')) {\n\t\treturn true\n\t}\n\tif (!output.canPrompt()) {\n\t\tthrow new CliError('TTY not available. Pass --yes to confirm execution.', {\n\t\t\tcode: 'TTY_UNAVAILABLE',\n\t\t\texitCode: ExitCode.InputError,\n\t\t})\n\t}\n\toutput.warn('This will completely wipe the target project.')\n\toutput.info('(to skip this dialog, you can pass --yes option)')\n\toutput.info('')\n\tconst ok = await promptConfirm(output, {\n\t\tmessage: `Do you want to continue?`,\n\t})\n\treturn ok\n}\n"],"names":["CliError","ExitCode","promptConfirm"],"mappings":";;;;AAGO,MAAM,gBAAgB,OAAO,OAAoC,WAAqC;AAC5G,MAAI,MAAM,UAAU,KAAK,GAAG;AAC3B,WAAO;AAAA,EACR;AACA,MAAI,CAAC,OAAO,aAAa;AACxB,UAAM,IAAIA,UAAAA,SAAS,uDAAuD;AAAA,MACzE,MAAM;AAAA,MACN,UAAUC,UAAAA,SAAS;AAAA,IAAA,CACnB;AAAA,EACF;AACA,SAAO,KAAK,+CAA+C;AAC3D,SAAO,KAAK,kDAAkD;AAC9D,SAAO,KAAK,EAAE;AACd,QAAM,KAAK,MAAMC,OAAAA,cAAc,QAAQ;AAAA,IACtC,SAAS;AAAA,EAAA,CACT;AACD,SAAO;AACR;;"}

package/dist/production/src/commands/transfer/utils.js

@@ -1,17 +1,19 @@
-import prompts from "prompts";
-const confirmImport = async (input) => {
+import { CliError, ExitCode } from "@contember/cli-common";
+import { promptConfirm } from "../../lib/prompt/prompt.js";
+const confirmImport = async (input, output) => {
   if (input.getOption("yes")) {
     return true;
   }
-  if (!process.stdin.isTTY) {
-    throw "TTY not available. Pass --yes option to confirm execution.";
+  if (!output.canPrompt()) {
+    throw new CliError("TTY not available. Pass --yes to confirm execution.", {
+      code: "TTY_UNAVAILABLE",
+      exitCode: ExitCode.InputError
+    });
   }
-  console.log("This will completely wipe the target project.");
-  console.log("(to skip this dialog, you can pass --yes option)");
-  console.log("");
-  const { ok } = await prompts({
-    type: "confirm",
-    name: "ok",
+  output.warn("This will completely wipe the target project.");
+  output.info("(to skip this dialog, you can pass --yes option)");
+  output.info("");
+  const ok = await promptConfirm(output, {
     message: `Do you want to continue?`
   });
   return ok;