storyblok 4.8.0 → 4.10.0

package/dist/index.mjs

@@ -5,12 +5,12 @@ import { dirname } from 'pathe';
 import chalk from 'chalk';
 import { Command } from 'commander';
 import { readPackageUp } from 'read-package-up';
-import path, { join, resolve, parse, dirname as dirname$1, extname } from 'node:path';
+import path, { join, resolve, parse, dirname as dirname$1, extname, relative } from 'node:path';
 import { MultiBar, Presets } from 'cli-progress';
 import { Spinner } from '@topcli/spinner';
 import fs, { mkdir, writeFile, readFile as readFile$1, appendFile, access, readdir } from 'node:fs/promises';
 import filenamify from 'filenamify';
-import { mkdirSync, appendFileSync, existsSync, readdirSync, unlinkSync, readFileSync } from 'node:fs';
+import { mkdirSync, appendFileSync, writeFileSync, existsSync, readdirSync, unlinkSync, readFileSync } from 'node:fs';
 import { select, password, input, confirm } from '@inquirer/prompts';
 import { ManagementApiClient } from '@storyblok/management-api-client';
 import { RateLimit, Sema } from 'async-sema';
@@ -34,7 +34,8 @@ const commands = {
   TYPES: "types",
   DATASOURCES: "datasources",
   CREATE: "create",
-  LOGS: "logs"
+  LOGS: "logs",
+  REPORTS: "reports"
 };
 const colorPalette = {
   PRIMARY: "#8d60ff",
@@ -51,7 +52,8 @@ const colorPalette = {
   TAGS: "#fbbf24",
   PRESETS: "#a855f7",
   DATASOURCES: "#4ade80",
-  LOGS: "#4ade80"
+  LOGS: "#4ade80",
+  REPORTS: "#4ade80"
 };
 const regions = {
   EU: "eu",
@@ -92,7 +94,8 @@ const regionNames = {
   SB_Agent_Version: process.env.npm_package_version || "4.x"
 });
 const directories = {
-  log: "logs"
+  log: "logs",
+  report: "reports"
 };
 
 class FetchError extends Error {
@@ -701,6 +704,22 @@ const saveToFile = async (filePath, data, options) => {
     handleFileSystemError("write", writeError);
   }
 };
+const saveToFileSync = (filePath, data, options) => {
+  const resolvedPath = parse(filePath).dir;
+  if (resolvedPath) {
+    try {
+      mkdirSync(resolvedPath, { recursive: true });
+    } catch (mkdirError) {
+      handleFileSystemError("mkdir", mkdirError);
+      return;
+    }
+  }
+  try {
+    writeFileSync(filePath, data, options);
+  } catch (writeError) {
+    handleFileSystemError("write", writeError);
+  }
+};
 const appendToFile = async (filePath, data, options) => {
   const resolvedPath = parse(filePath).dir;
   try {
@@ -747,6 +766,12 @@ const resolvePath = (path, folder) => {
   }
   return resolve(resolve(process.cwd(), ".storyblok"), folder);
 };
+function resolveCommandPath(commandPath, space, baseDir) {
+  if (space) {
+    return resolvePath(baseDir, join(commandPath, space));
+  }
+  return resolvePath(baseDir, commandPath);
+}
 const getComponentNameFromFilename = (filename) => {
   return filename.replace(/\.js$/, "");
 };
@@ -770,11 +795,101 @@ async function readJsonFile(filePath) {
 function importModule(filePath) {
   return import(`file://${filePath}`);
 }
-function getLogsPath(logFileDir, space, baseDir) {
-  if (space) {
-    return resolvePath(baseDir, join(logFileDir, space));
+
+const REPORT_STATUS = {
+  unfinished: "UNFINISHED",
+  success: "SUCCESS",
+  partialSuccess: "PARTIAL_SUCCESS",
+  failure: "FAILURE"
+};
+class Reporter {
+  filePath;
+  enabled;
+  startedAt = /* @__PURE__ */ new Date();
+  maxFiles;
+  report = {
+    status: REPORT_STATUS.unfinished,
+    meta: {
+      startedAt: this.startedAt.toISOString()
+    },
+    summary: {}
+  };
+  constructor(options) {
+    this.enabled = options?.enabled || false;
+    this.filePath = options?.filePath ?? `./${Date.now()}.json`;
+    this.maxFiles = options?.maxFiles;
+  }
+  addMeta(key, value) {
+    this.report.meta[key] = value;
+    return this;
+  }
+  addSummary(key, value) {
+    this.report.summary[key] = value;
+    return this;
+  }
+  finalize() {
+    if (!this.enabled) {
+      return;
+    }
+    const endedAt = /* @__PURE__ */ new Date();
+    this.report.meta.endedAt = endedAt.toISOString();
+    this.report.meta.durationMs = endedAt.getTime() - this.startedAt.getTime();
+    this.updateStatus();
+    saveToFileSync(this.filePath, JSON.stringify(this.report, null, 2));
+    if (this.maxFiles !== void 0) {
+      this.pruneOldFiles();
+    }
+  }
+  updateStatus() {
+    let succeededTotal = 0;
+    let failedTotal = 0;
+    for (const item of Object.values(this.report.summary)) {
+      succeededTotal += item.succeeded;
+      failedTotal += item.failed;
+    }
+    if (failedTotal === 0) {
+      this.report.status = REPORT_STATUS.success;
+    } else if (succeededTotal > 0) {
+      this.report.status = REPORT_STATUS.partialSuccess;
+    } else {
+      this.report.status = REPORT_STATUS.failure;
+    }
+  }
+  pruneOldFiles() {
+    if (this.maxFiles === void 0) {
+      return;
+    }
+    const dir = dirname$1(this.filePath);
+    const ext = extname(this.filePath);
+    Reporter.pruneReportFiles(dir, this.maxFiles, ext);
+  }
+  static pruneReportFiles(directory, keep, extension = ".json") {
+    if (!existsSync(directory)) {
+      return 0;
+    }
+    const files = readdirSync(directory).filter((file) => extname(file) === extension).sort();
+    const filesToDelete = files.length - keep;
+    if (filesToDelete <= 0) {
+      return 0;
+    }
+    for (const file of files.slice(0, filesToDelete)) {
+      unlinkSync(join(directory, file));
+    }
+    return filesToDelete;
+  }
+  static listReportFiles(directory, extension = ".json") {
+    if (!existsSync(directory)) {
+      return [];
+    }
+    return readdirSync(directory).filter((file) => extname(file) === extension).map((f) => relative(process.cwd(), join(directory, f))).sort();
+  }
+}
+let reporterInstance = null;
+function getReporter(options) {
+  if (!reporterInstance) {
+    reporterInstance = new Reporter(options);
   }
-  return resolvePath(baseDir, logFileDir);
+  return reporterInstance;
 }
 
 class FileTransport {
@@ -896,7 +1011,7 @@ let programInstance = null;
 function getProgram() {
   if (!programInstance) {
     programInstance = new Command();
-    programInstance.name(packageJson.name).description(packageJson.description || "").version(packageJson.version).hook("preAction", (_, actionCmd) => {
+    programInstance.name(packageJson.name).description(packageJson.description || "").version(packageJson.version, "-v, --vers", "Output the current version").helpOption("-h, --help", "Display help for command").option("--verbose", "Enable verbose output").hook("preAction", (_, actionCmd) => {
       const options = actionCmd.optsWithGlobals();
       const commandPieces = [];
       for (let c = actionCmd; c; c = c.parent) {
@@ -905,7 +1020,7 @@ function getProgram() {
       const command = commandPieces.join(" ");
       const runId = Date.now();
       const transports = [];
-      const logsPath = getLogsPath(directories.log, options.space, options.path);
+      const logsPath = resolveCommandPath(directories.log, options.space, options.path);
       const logFilename = `${commandPieces.join("-")}-${runId}.jsonl`;
       const filePath = path.join(logsPath, logFilename);
       transports.push(new FileTransport({
@@ -917,6 +1032,10 @@ function getProgram() {
         transports
       });
       getUI({ enabled: true });
+      const reportPath = resolveCommandPath(directories.report, options.space, options.path);
+      const reportFilename = `${commandPieces.join("-")}-${runId}.jsonl`;
+      const reportFilePath = path.join(reportPath, reportFilename);
+      getReporter({ enabled: true, filePath: reportFilePath }).addMeta("command", command).addMeta("cliVersion", packageJson.version).addMeta("runId", String(runId)).addMeta("logPath", filePath).addMeta("config", options);
     });
     programInstance.configureOutput({
       writeErr: (str) => handleError(new Error(str))
@@ -1172,7 +1291,7 @@ function session() {
   return sessionInstance;
 }
 
-const program$g = getProgram();
+const program$h = getProgram();
 const allRegionsText = Object.values(regions).join(",");
 const loginStrategy = {
   message: "How would you like to login?",
@@ -1189,12 +1308,12 @@ const loginStrategy = {
     }
   ]
 };
-program$g.command(commands.LOGIN).description("Login to the Storyblok CLI").option("-t, --token <token>", "Token to login directly without questions, like for CI environments").option(
+program$h.command(commands.LOGIN).description("Login to the Storyblok CLI").option("-t, --token <token>", "Token to login directly without questions, like for CI environments").option(
   "-r, --region <region>",
   `The region you would like to work in. Please keep in mind that the region must match the region of your space. This region flag will be used for the other cli's commands. You can use the values: ${allRegionsText}.`
 ).action(async (options) => {
   konsola.title(`${commands.LOGIN}`, colorPalette.LOGIN);
-  const verbose = program$g.opts().verbose;
+  const verbose = program$h.opts().verbose;
   const { token, region } = options;
   const { state, updateSession, persistCredentials, initializeSession } = session();
   await initializeSession();
@@ -1322,10 +1441,10 @@ program$g.command(commands.LOGIN).description("Login to the Storyblok CLI").opti
   konsola.br();
 });
 
-const program$f = getProgram();
-program$f.command(commands.LOGOUT).description("Logout from the Storyblok CLI").action(async () => {
+const program$g = getProgram();
+program$g.command(commands.LOGOUT).description("Logout from the Storyblok CLI").action(async () => {
   konsola.title(`${commands.LOGOUT}`, colorPalette.LOGOUT);
-  const verbose = program$f.opts().verbose;
+  const verbose = program$g.opts().verbose;
   try {
     const { state, initializeSession } = session();
     await initializeSession();
@@ -1373,10 +1492,10 @@ async function openSignupInBrowser(url) {
   }
 }
 
-const program$e = getProgram();
-program$e.command(commands.SIGNUP).description("Sign up for Storyblok").action(async () => {
+const program$f = getProgram();
+program$f.command(commands.SIGNUP).description("Sign up for Storyblok").action(async () => {
   konsola.title(`${commands.SIGNUP}`, colorPalette.SIGNUP);
-  const verbose = program$e.opts().verbose;
+  const verbose = program$f.opts().verbose;
   const { state, initializeSession } = session();
   await initializeSession();
   if (state.isLoggedIn && !state.envLogin) {
@@ -1398,10 +1517,10 @@ program$e.command(commands.SIGNUP).description("Sign up for Storyblok").action(a
   konsola.br();
 });
 
-const program$d = getProgram();
-program$d.command(commands.USER).description("Get the current user").action(async () => {
+const program$e = getProgram();
+program$e.command(commands.USER).description("Get the current user").action(async () => {
   konsola.title(`${commands.USER}`, colorPalette.USER);
-  const verbose = program$d.opts().verbose;
+  const verbose = program$e.opts().verbose;
   const { state, initializeSession } = session();
   await initializeSession();
   if (!requireAuthentication(state)) {
@@ -1430,8 +1549,8 @@ program$d.command(commands.USER).description("Get the current user").action(asyn
   konsola.br();
 });
 
-const program$c = getProgram();
-const componentsCommand = program$c.command(commands.COMPONENTS).alias("comp").description(`Manage your space's block schema`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/components");
+const program$d = getProgram();
+const componentsCommand = program$d.command(commands.COMPONENTS).alias("comp").description(`Manage your space's block schema`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/components");
 
 const fetchComponents = async (spaceId) => {
   try {
@@ -1811,10 +1930,10 @@ async function readConsolidatedFiles$1(resolvedPath, suffix) {
   };
 }
 
-const program$b = getProgram();
+const program$c = getProgram();
 componentsCommand.command("pull [componentName]").option("-f, --filename <filename>", "custom name to be used in file(s) name instead of space id").option("--sf, --separate-files", "Argument to create a single file for each component").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. components.<suffix>.json)").description(`Download your space's components schema as json. Optionally specify a component name to pull a single component.`).action(async (componentName, options) => {
   konsola.title(`${commands.COMPONENTS}`, colorPalette.COMPONENTS, componentName ? `Pulling component ${componentName}...` : "Pulling components...");
-  const verbose = program$b.opts().verbose;
+  const verbose = program$c.opts().verbose;
   const { space, path } = componentsCommand.opts();
   const { separateFiles, suffix, filename = "components" } = options;
   const { state, initializeSession } = session();
@@ -1952,7 +2071,7 @@ function buildDependencyGraph(context) {
     graph.nodes.set(nodeId, node);
   });
   spaceState.local.groups.forEach((group) => {
-    if (group.parent_uuid) {
+    if (group.parent_uuid && group.parent_id && group.parent_uuid !== group.uuid) {
       const childId = `group:${group.uuid}`;
       const parentId = `group:${group.parent_uuid}`;
       addDependency(childId, parentId);
@@ -2847,12 +2966,13 @@ async function pushWithDependencyGraph(space, spaceState, maxConcurrency = 5) {
   return results;
 }
 
-const program$a = getProgram();
+const program$b = getProgram();
 componentsCommand.command("push [componentName]").description(`Push your space's components schema as json`).option("-f, --from <from>", "source space id").option("--fi, --filter <filter>", "glob filter to apply to the components before pushing").option("--sf, --separate-files", "Read from separate files instead of consolidated files").option("--su, --suffix <suffix>", "Suffix to add to the component name").action(async (componentName, options) => {
   konsola.title(`${commands.COMPONENTS}`, colorPalette.COMPONENTS, componentName ? `Pushing component ${componentName}...` : "Pushing components...");
-  const verbose = program$a.opts().verbose;
+  const verbose = program$b.opts().verbose;
   const { space, path } = componentsCommand.opts();
-  const { from, filter } = options;
+  const { filter } = options;
+  const fromSpace = options.from || space;
   const { state, initializeSession } = session();
   await initializeSession();
   if (!requireAuthentication(state, verbose)) {
@@ -2862,10 +2982,7 @@ componentsCommand.command("push [componentName]").description(`Push your space's
     handleError(new CommandError(`Please provide the target space as argument --space TARGET_SPACE_ID.`), verbose);
     return;
   }
-  if (!from) {
-    options.from = space;
-  }
-  konsola.info(`Attempting to push components ${chalk.bold("from")} space ${chalk.hex(colorPalette.COMPONENTS)(options.from)} ${chalk.bold("to")} ${chalk.hex(colorPalette.COMPONENTS)(space)}`);
+  konsola.info(`Attempting to push components ${chalk.bold("from")} space ${chalk.hex(colorPalette.COMPONENTS)(fromSpace)} ${chalk.bold("to")} ${chalk.hex(colorPalette.COMPONENTS)(space)}`);
   konsola.br();
   const { password, region } = state;
   let requestCount = 0;
@@ -2883,7 +3000,7 @@ componentsCommand.command("push [componentName]").description(`Push your space's
     const componentsData = await readComponentsFiles({
       ...options,
       path,
-      space
+      from: fromSpace
     });
     const localData = {
       ...componentsData,
@@ -3046,11 +3163,11 @@ const saveLanguagesToFile = async (space, internationalizationOptions, options)
   }
 };
 
-const program$9 = getProgram();
-const languagesCommand = program$9.command(commands.LANGUAGES).alias("lang").description(`Manage your space's languages`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/languages");
+const program$a = getProgram();
+const languagesCommand = program$a.command(commands.LANGUAGES).alias("lang").description(`Manage your space's languages`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/languages");
 languagesCommand.command("pull").description(`Download your space's languages schema as json`).option("-f, --filename <filename>", "filename to save the file as <filename>.<suffix>.json").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. languages.<suffix>.json). By default, the space ID is used.").action(async (options) => {
   konsola.title(`${commands.LANGUAGES}`, colorPalette.LANGUAGES);
-  const verbose = program$9.opts().verbose;
+  const verbose = program$a.opts().verbose;
   const { space, path } = languagesCommand.opts();
   const { filename = "languages", suffix = options.space } = options;
   const { state, initializeSession } = session();
@@ -3097,8 +3214,8 @@ languagesCommand.command("pull").description(`Download your space's languages sc
   konsola.br();
 });
 
-const program$8 = getProgram();
-const migrationsCommand = program$8.command(commands.MIGRATIONS).alias("mig").description(`Manage your space's migrations`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/migrations");
+const program$9 = getProgram();
+const migrationsCommand = program$9.command(commands.MIGRATIONS).alias("mig").description(`Manage your space's migrations`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/migrations");
 
 const getMigrationTemplate = () => {
   return `export default function (block) {
@@ -3817,6 +3934,7 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
   const program = getProgram();
   const ui = getUI();
   const logger = getLogger();
+  const reporter = getReporter();
   ui.title(`${commands.MIGRATIONS}`, colorPalette.MIGRATIONS, componentName ? `Running migrations for component ${componentName}...` : "Running migrations...");
   logger.info("Migration started");
   if (options.dryRun) {
@@ -3919,21 +4037,26 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
     ui.info(migrationSummary);
     const updateSummary = updateStream.getSummary();
     ui.info(updateSummary);
-    const migrationResults = migrationStream.getResults();
-    const updateResults = updateStream.getResults();
+    const migrationStreamResults = migrationStream.getResults();
+    const migrationResults = {
+      total: migrationStreamResults.totalProcessed,
+      succeeded: migrationStreamResults.successful.length,
+      skipped: migrationStreamResults.skipped.length,
+      failed: migrationStreamResults.failed.length
+    };
+    const updateStreamResults = updateStream.getResults();
+    const updateResults = {
+      total: updateStreamResults.totalProcessed,
+      succeeded: updateStreamResults.successful.length,
+      failed: updateStreamResults.failed.length
+    };
     logger.info("Migration finished", {
-      migrationResults: {
-        total: migrationResults.totalProcessed,
-        succeeded: migrationResults.successful.length,
-        skipped: migrationResults.skipped.length,
-        failed: migrationResults.failed.length
-      },
-      updateResults: {
-        total: updateResults.totalProcessed,
-        succeeded: updateResults.successful.length,
-        failed: updateResults.failed.length
-      }
+      migrationResults,
+      updateResults
     });
+    reporter.addSummary("migrationResults", migrationResults);
+    reporter.addSummary("updateResults", updateResults);
+    reporter.finalize();
   } catch (error) {
     handleError(error, verbose);
   }
@@ -4028,8 +4151,8 @@ migrationsCommand.command("rollback [migrationFile]").description("Rollback a mi
   }
 });
 
-const program$7 = getProgram();
-const typesCommand = program$7.command(commands.TYPES).alias("ts").description(`Generate types d.ts for your component schemas`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/types");
+const program$8 = getProgram();
+const typesCommand = program$8.command(commands.TYPES).alias("ts").description(`Generate types d.ts for your component schemas`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/types");
 
 const getAssetJSONSchema = (title) => ({
   $id: "#/asset",
@@ -4869,7 +4992,7 @@ const upsertDatasourceEntry = async (space, datasourceId, entry, existingId) =>
   }
 };
 const readDatasourcesFiles = async (options) => {
-  const { from, path, separateFiles = false, suffix, space } = options;
+  const { from, path, separateFiles = false, suffix } = options;
   const resolvedPath = resolvePath(path, `datasources/${from}`);
   try {
     await readdir(resolvedPath);
@@ -4880,7 +5003,7 @@ const readDatasourcesFiles = async (options) => {
    ${chalk.cyan(`storyblok datasources pull --space ${from}`)}
 
 2. Then try pushing again:
-   ${chalk.cyan(`storyblok datasources push --space ${space} --from ${from}`)}`;
+   ${chalk.cyan(`storyblok datasources push --space <target_space> --from ${from}`)}`;
     throw new FileSystemError(
       "file_not_found",
       "read",
@@ -4937,13 +5060,13 @@ async function readConsolidatedFiles(resolvedPath, suffix) {
   };
 }
 
-const program$6 = getProgram();
+const program$7 = getProgram();
 typesCommand.command("generate").description("Generate types d.ts for your component schemas").option("--sf, --separate-files", "Generate one .d.ts file per component instead of a single combined file").option(
   "--filename <name>",
   "Base file name for all component types when generating a single declarations file (e.g. components.d.ts). Ignored when using --separate-files."
 ).option("--strict", "strict mode, no loose typing").option("--type-prefix <prefix>", "prefix to be prepended to all generated component type names").option("--type-suffix <suffix>", "suffix to be appended to all generated component type names").option("--suffix <suffix>", "Components suffix").option("--custom-fields-parser <path>", "Path to the parser file for Custom Field Types").option("--compiler-options <options>", "path to the compiler options from json-schema-to-typescript").action(async (options) => {
   konsola.title(`${commands.TYPES}`, colorPalette.TYPES, "Generating types...");
-  const verbose = program$6.opts().verbose;
+  const verbose = program$7.opts().verbose;
   const { space, path } = typesCommand.opts();
   const spinner = new Spinner({
     verbose: !isVitest
@@ -4996,8 +5119,8 @@ typesCommand.command("generate").description("Generate types d.ts for your compo
   }
 });
 
-const program$5 = getProgram();
-const datasourcesCommand = program$5.command(commands.DATASOURCES).alias("ds").description(`Manage your space's datasources`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/datasources");
+const program$6 = getProgram();
+const datasourcesCommand = program$6.command(commands.DATASOURCES).alias("ds").description(`Manage your space's datasources`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/datasources");
 
 async function fetchAllPages(fetchFunction, extractDataFunction, page = 1, collectedItems = []) {
   const { data, response } = await fetchFunction(page);
@@ -5103,10 +5226,10 @@ const saveDatasourcesToFiles = async (space, datasources, options) => {
   }
 };
 
-const program$4 = getProgram();
+const program$5 = getProgram();
 datasourcesCommand.command("pull [datasourceName]").option("-f, --filename <filename>", "custom name to be used in file(s) name instead of space id").option("--sf, --separate-files", "Argument to create a single file for each datasource").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. datasources.<suffix>.json)").description("Pull datasources from your space").action(async (datasourceName, options) => {
   konsola.title(`${commands.DATASOURCES}`, colorPalette.DATASOURCES, datasourceName ? `Pulling datasource ${datasourceName}...` : "Pulling datasources...");
-  const verbose = program$4.opts().verbose;
+  const verbose = program$5.opts().verbose;
   const { space, path } = datasourcesCommand.opts();
   const { separateFiles, suffix, filename = "datasources" } = options;
   const { state, initializeSession } = session();
@@ -5175,12 +5298,13 @@ datasourcesCommand.command("pull [datasourceName]").option("-f, --filename <file
   }
 });
 
-const program$3 = getProgram();
+const program$4 = getProgram();
 datasourcesCommand.command("push [datasourceName]").description(`Push your space's datasources schema as json`).option("-f, --from <from>", "source space id").option("--fi, --filter <filter>", "glob filter to apply to the datasources before pushing").option("--sf, --separate-files", "Read from separate files instead of consolidated files").option("--su, --suffix <suffix>", "Suffix to add to the datasource name").action(async (datasourceName, options) => {
   konsola.title(`${commands.DATASOURCES}`, colorPalette.DATASOURCES, datasourceName ? `Pushing datasource ${datasourceName}...` : "Pushing datasources...");
-  const verbose = program$3.opts().verbose;
+  const verbose = program$4.opts().verbose;
   const { space, path } = datasourcesCommand.opts();
-  const { from, filter } = options;
+  const { filter } = options;
+  const fromSpace = options.from || space;
   const { state, initializeSession } = session();
   await initializeSession();
   if (!requireAuthentication(state, verbose)) {
@@ -5190,10 +5314,7 @@ datasourcesCommand.command("push [datasourceName]").description(`Push your space
     handleError(new CommandError(`Please provide the target space as argument --space TARGET_SPACE_ID.`), verbose);
     return;
   }
-  if (!from) {
-    options.from = space;
-  }
-  konsola.info(`Attempting to push datasources ${chalk.bold("from")} space ${chalk.hex(colorPalette.DATASOURCES)(options.from || space)} ${chalk.bold("to")} ${chalk.hex(colorPalette.DATASOURCES)(space)}`);
+  konsola.info(`Attempting to push datasources ${chalk.bold("from")} space ${chalk.hex(colorPalette.DATASOURCES)(fromSpace)} ${chalk.bold("to")} ${chalk.hex(colorPalette.DATASOURCES)(space)}`);
   konsola.br();
   const { password, region } = state;
   mapiClient({
@@ -5207,7 +5328,7 @@ datasourcesCommand.command("push [datasourceName]").description(`Push your space
       local: await readDatasourcesFiles({
         ...options,
         path,
-        space
+        from: fromSpace
       }),
       target: {
         datasources: /* @__PURE__ */ new Map()
@@ -5495,11 +5616,33 @@ const fetchBlueprintRepositories = async () => {
   }
 };
 
-const program$2 = getProgram();
-program$2.command(`${commands.CREATE} [project-path]`).alias("c").description(`Scaffold a new project using Storyblok`).option("-t, --template <template>", "technology starter template").option("-b, --blueprint <blueprint>", "[DEPRECATED] use --template instead").option("--skip-space", "skip space creation").action(async (projectPath, options) => {
+function showNextSteps(technologyTemplate, finalProjectPath) {
+  konsola.br();
+  konsola.ok(`Your ${chalk.hex(colorPalette.PRIMARY)(technologyTemplate)} project is ready \u{1F389} !`);
+  konsola.br();
+  konsola.info(`Next steps:
+  cd ${finalProjectPath}
+  npm install
+  npm run dev
+        `);
+  konsola.info(`Or check the dedicated guide at: ${chalk.hex(colorPalette.PRIMARY)(`https://www.storyblok.com/docs/guides/${technologyTemplate}`)}`);
+}
+async function handleEnvFileCreation(resolvedPath, token) {
+  try {
+    await createEnvFile(resolvedPath, token);
+    konsola.ok(`Created .env file with Storyblok access token`, true);
+    return true;
+  } catch (error) {
+    konsola.warn(`Failed to create .env file: ${error.message}`);
+    konsola.info(`You can manually add this token to your .env file: ${token}`);
+    return false;
+  }
+}
+const program$3 = getProgram();
+program$3.command(`${commands.CREATE} [project-path]`).alias("c").description(`Scaffold a new project using Storyblok`).option("-t, --template <template>", "technology starter template").option("-b, --blueprint <blueprint>", "[DEPRECATED] use --template instead").option("--skip-space", "skip space creation").option("--token <token>", "Storyblok access token (skip space creation and use this token)").action(async (projectPath, options) => {
   konsola.title(`${commands.CREATE}`, colorPalette.CREATE);
-  const verbose = program$2.opts().verbose;
-  const { template, blueprint } = options;
+  const verbose = program$3.opts().verbose;
+  const { template, blueprint, token } = options;
   let selectedTemplate = template;
   if (blueprint && !template) {
     konsola.warn(`The --blueprint flag is deprecated. Please use --template instead.`);
@@ -5525,18 +5668,6 @@ program$2.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
   const spinnerSpace = new Spinner({
     verbose: !isVitest
   });
-  let userData;
-  try {
-    const user = await getUser(password, region);
-    if (!user) {
-      throw new Error("User data is undefined");
-    }
-    userData = user;
-  } catch (error) {
-    konsola.error("Failed to fetch user info. Please login again.", error);
-    konsola.br();
-    return;
-  }
   try {
     spinnerBlueprints.start("Fetching starter templates...");
     const templates = await fetchBlueprintRepositories();
@@ -5592,91 +5723,96 @@ program$2.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
     await generateProject(technologyTemplate, projectName, targetDirectory);
     konsola.ok(`Project ${chalk.hex(colorPalette.PRIMARY)(projectName)} created successfully in ${chalk.hex(colorPalette.PRIMARY)(finalProjectPath)}`, true);
     let createdSpace;
-    const choices = [
-      { name: "My personal account", value: "personal" }
-    ];
-    if (userData.has_org) {
-      choices.push({ name: `Organization (${userData?.org?.name})`, value: "org" });
-    }
-    if (userData.has_partner) {
-      choices.push({ name: "Partner Portal", value: "partner" });
-    }
+    let userData;
     let whereToCreateSpace = "personal";
-    if (region === "eu" && (userData.has_partner || userData.has_org)) {
-      whereToCreateSpace = await select({
-        message: `Where would you like to create this space?`,
-        choices
-      });
-    }
-    if (region !== "eu" && userData.has_org) {
-      whereToCreateSpace = "org";
+    if (token) {
+      await handleEnvFileCreation(resolvedPath, token);
+      showNextSteps(technologyTemplate, finalProjectPath);
+      return;
     }
-    if (region !== "eu" && !userData.has_org) {
-      konsola.warn(`Space creation in this region is limited to Enterprise accounts. If you're part of an organization, please ensure you have the required permissions. For more information about Enterprise access, contact our Sales Team.`);
-      konsola.br();
+    if (options.skipSpace) {
+      showNextSteps(technologyTemplate, finalProjectPath);
       return;
     }
-    if (!options.skipSpace) {
+    try {
       try {
-        spinnerSpace.start(`Creating space "${toHumanReadable(projectName)}"`);
-        const selectedBlueprint = templates.find((bp) => bp.value === technologyTemplate);
-        const blueprintDomain = selectedBlueprint?.location || "https://localhost:3000/";
-        const spaceToCreate = {
-          name: toHumanReadable(projectName),
-          domain: blueprintDomain
-        };
-        if (whereToCreateSpace === "org") {
-          spaceToCreate.org = userData.org;
-          spaceToCreate.in_org = true;
-        } else if (whereToCreateSpace === "partner") {
-          spaceToCreate.assign_partner = true;
+        const user = await getUser(password, region);
+        if (!user) {
+          throw new Error("User data is undefined");
         }
-        createdSpace = await createSpace(spaceToCreate);
-        spinnerSpace.succeed(`Space "${chalk.hex(colorPalette.PRIMARY)(toHumanReadable(projectName))}" created successfully`);
+        userData = user;
       } catch (error) {
-        spinnerSpace.failed();
+        konsola.error("Failed to fetch user info. Please login again.", error);
         konsola.br();
-        handleError(error, verbose);
         return;
       }
-    }
-    if (createdSpace?.first_token) {
-      try {
-        await createEnvFile(resolvedPath, createdSpace.first_token);
-        konsola.ok(`Created .env file with Storyblok access token`, true);
-      } catch (error) {
-        konsola.warn(`Failed to create .env file: ${error.message}`);
-        konsola.info(`You can manually add this token to your .env file: ${createdSpace.first_token}`);
+      const choices = [
+        { name: "My personal account", value: "personal" }
+      ];
+      if (userData.has_org) {
+        choices.push({ name: `Organization (${userData?.org?.name})`, value: "org" });
       }
-    }
-    if (createdSpace?.id) {
-      try {
-        await openSpaceInBrowser(createdSpace.id, region);
-        konsola.info(`Opened space in your browser`);
-      } catch (error) {
-        konsola.warn(`Failed to open browser: ${error.message}`);
-        const spaceUrl = generateSpaceUrl(createdSpace.id, region);
-        konsola.info(`You can manually open your space at: ${chalk.hex(colorPalette.PRIMARY)(spaceUrl)}`);
+      if (userData.has_partner) {
+        choices.push({ name: "Partner Portal", value: "partner" });
       }
-    }
-    konsola.br();
-    konsola.ok(`Your ${chalk.hex(colorPalette.PRIMARY)(technologyTemplate)} project is ready \u{1F389} !`);
-    if (createdSpace?.first_token) {
+      if (region === regions.EU && (userData.has_partner || userData.has_org)) {
+        whereToCreateSpace = await select({
+          message: `Where would you like to create this space?`,
+          choices
+        });
+      }
+      if (region !== regions.EU && userData.has_org) {
+        whereToCreateSpace = "org";
+      }
+      if (region !== regions.EU && !userData.has_org) {
+        konsola.warn(`Space creation in this region is limited to Enterprise accounts. If you're part of an organization, please ensure you have the required permissions. For more information about Enterprise access, contact our Sales Team.`);
+        konsola.br();
+        return;
+      }
+      spinnerSpace.start(`Creating space "${toHumanReadable(projectName)}"`);
+      const selectedBlueprint = templates.find((bp) => bp.value === technologyTemplate);
+      const blueprintDomain = selectedBlueprint?.location || "https://localhost:3000/";
+      const spaceToCreate = {
+        name: toHumanReadable(projectName),
+        domain: blueprintDomain
+      };
       if (whereToCreateSpace === "org") {
-        konsola.ok(`Storyblok space created in organization ${chalk.hex(colorPalette.PRIMARY)(userData?.org?.name)}, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
+        spaceToCreate.org = userData.org;
+        spaceToCreate.in_org = true;
       } else if (whereToCreateSpace === "partner") {
-        konsola.ok(`Storyblok space created in partner portal, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
-      } else {
-        konsola.ok(`Storyblok space created, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
+        spaceToCreate.assign_partner = true;
+      }
+      createdSpace = await createSpace(spaceToCreate);
+      spinnerSpace.succeed(`Space "${chalk.hex(colorPalette.PRIMARY)(toHumanReadable(projectName))}" created successfully`);
+      if (createdSpace?.first_token) {
+        await handleEnvFileCreation(resolvedPath, createdSpace.first_token);
+      }
+      if (createdSpace?.id) {
+        try {
+          await openSpaceInBrowser(createdSpace.id, region);
+          konsola.info(`Opened space in your browser`);
+        } catch (error) {
+          konsola.warn(`Failed to open browser: ${error.message}`);
+          const spaceUrl = generateSpaceUrl(createdSpace.id, region);
+          konsola.info(`You can manually open your space at: ${chalk.hex(colorPalette.PRIMARY)(spaceUrl)}`);
+        }
+      }
+      showNextSteps(technologyTemplate, finalProjectPath);
+      if (createdSpace?.first_token) {
+        if (whereToCreateSpace === "org") {
+          konsola.ok(`Storyblok space created in organization ${chalk.hex(colorPalette.PRIMARY)(userData?.org?.name)}, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
+        } else if (whereToCreateSpace === "partner") {
+          konsola.ok(`Storyblok space created in partner portal, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
+        } else {
+          konsola.ok(`Storyblok space created, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
+        }
       }
+    } catch (error) {
+      spinnerSpace.failed();
+      konsola.br();
+      handleError(error, verbose);
+      return;
     }
-    konsola.br();
-    konsola.info(`Next steps:
-  cd ${finalProjectPath}
-  npm install
-  npm run dev
-        `);
-    konsola.info(`Or check the dedicated guide at: ${chalk.hex(colorPalette.PRIMARY)(`https://www.storyblok.com/docs/guides/${technologyTemplate}`)}`);
   } catch (error) {
     spinnerSpace.failed();
     spinnerBlueprints.failed();
@@ -5686,13 +5822,13 @@ program$2.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
   konsola.br();
 });
 
-const program$1 = getProgram();
-const logsCommand = program$1.command(commands.LOGS).alias("lg").description(`Inspect and manage logs.`).option("-s, --space <space>", "The space ID.").option("-p, --path <path>", "Path to the directory containing the logs directory. Defaults to '.storyblok'.");
+const program$2 = getProgram();
+const logsCommand = program$2.command(commands.LOGS).alias("lg").description(`Inspect and manage logs.`).option("-s, --space <space>", "The space ID.").option("-p, --path <path>", "Path to the directory containing the logs directory. Defaults to '.storyblok'.");
 
 logsCommand.command("list").description("List logs").action(async () => {
   const { space, path } = logsCommand.opts();
   const ui = getUI();
-  const logsPath = getLogsPath(directories.log, space, path);
+  const logsPath = resolveCommandPath(directories.log, space, path);
   const logFiles = FileTransport.listLogFiles(logsPath);
   if (logFiles.length === 0) {
     ui.info(`No logs found for space "${space}".`);
@@ -5705,23 +5841,40 @@ logsCommand.command("list").description("List logs").action(async () => {
 logsCommand.command("prune").description("Prune logs").option("--keep <number>", "Max number of log files to keep (default `0`, meaning remove all)", Number.parseInt, 0).action(async ({ keep }) => {
   const { space, path } = logsCommand.opts();
   const ui = getUI();
-  const logsPath = getLogsPath(directories.log, space, path);
+  const logsPath = resolveCommandPath(directories.log, space, path);
   const deletedFilesCount = FileTransport.pruneLogFiles(logsPath, keep);
   ui.info(`Deleted ${deletedFilesCount} log file${deletedFilesCount === 1 ? "" : "s"}`);
 });
 
-const version = "4.8.0";
-const pkg = {
-	version: version};
+const program$1 = getProgram();
+const reportsCommand = program$1.command(commands.REPORTS).alias("rp").description("Inspect and manage reports.").option("-s, --space <space>", "The space ID.").option("-p, --path <path>", "Path to the directory containing the reports directory. Defaults to '.storyblok'.");
+
+reportsCommand.command("list").description("List reports").action(async () => {
+  const { space, path } = reportsCommand.opts();
+  const ui = getUI();
+  const reportsPath = resolveCommandPath(directories.report, space, path);
+  const reportFiles = Reporter.listReportFiles(reportsPath, ".jsonl");
+  if (reportFiles.length === 0) {
+    ui.info(`No reports found for space "${space}".`);
+    return;
+  }
+  ui.info(`Found ${reportFiles.length} report file${reportFiles.length === 1 ? "" : "s"} for space "${space}":`);
+  ui.list(reportFiles);
+});
+
+reportsCommand.command("prune").description("Prune reports").option("--keep <number>", "Max number of report files to keep (default `0`, meaning remove all)", Number.parseInt, 0).action(async ({ keep }) => {
+  const { space, path } = reportsCommand.opts();
+  const ui = getUI();
+  const reportsPath = resolveCommandPath(directories.report, space, path);
+  const deletedFilesCount = Reporter.pruneReportFiles(reportsPath, keep, ".jsonl");
+  ui.info(`Deleted ${deletedFilesCount} report file${deletedFilesCount === 1 ? "" : "s"}`);
+});
 
 dotenv.config();
 const program = getProgram();
 konsola.br();
 konsola.br();
 konsola.title(` Storyblok CLI `, colorPalette.PRIMARY);
-program.option("--verbose", "Enable verbose output");
-program.version(pkg.version, "-v, --vers", "Output the current version");
-program.helpOption("-h, --help", "Display help for command");
 program.on("command:*", () => {
   console.error(`Invalid command: ${program.args.join(" ")}`);
   konsola.br();