storyblok 4.6.14 → 4.8.0

package/dist/index.mjs

@@ -5,21 +5,21 @@ 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 { 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 { select, password, input, confirm } from '@inquirer/prompts';
 import { ManagementApiClient } from '@storyblok/management-api-client';
 import { RateLimit, Sema } from 'async-sema';
-import fs, { mkdir, writeFile, readFile as readFile$1, appendFile, access, readdir } from 'node:fs/promises';
-import path, { join, parse, resolve } from 'node:path';
-import filenamify from 'filenamify';
 import { exec, spawn } from 'node:child_process';
 import { promisify } from 'node:util';
 import { minimatch } from 'minimatch';
 import { Readable, pipeline, Transform, Writable } from 'node:stream';
 import { hash } from 'ohash';
-import { MultiBar, Presets } from 'cli-progress';
 import { compile } from 'json-schema-to-typescript';
-import { readFileSync } from 'node:fs';
 import open from 'open';
 import { Octokit } from 'octokit';
 
@@ -33,7 +33,8 @@ const commands = {
   MIGRATIONS: "migrations",
   TYPES: "types",
   DATASOURCES: "datasources",
-  CREATE: "create"
+  CREATE: "create",
+  LOGS: "logs"
 };
 const colorPalette = {
   PRIMARY: "#8d60ff",
@@ -49,7 +50,8 @@ const colorPalette = {
   GROUPS: "#4ade80",
   TAGS: "#fbbf24",
   PRESETS: "#a855f7",
-  DATASOURCES: "#4ade80"
+  DATASOURCES: "#4ade80",
+  LOGS: "#4ade80"
 };
 const regions = {
   EU: "eu",
@@ -89,6 +91,9 @@ const regionNames = {
 ({
   SB_Agent_Version: process.env.npm_package_version || "4.x"
 });
+const directories = {
+  log: "logs"
+};
 
 class FetchError extends Error {
   response;
@@ -279,6 +284,51 @@ class CommandError extends Error {
   }
 }
 
+class Logger {
+  transports = [];
+  context = {};
+  constructor(options) {
+    if (options?.transports) {
+      this.transports = options.transports;
+    }
+    if (options?.context) {
+      this.context = options.context;
+    }
+  }
+  log(level, message, context) {
+    const timestamp = /* @__PURE__ */ new Date();
+    const mergedContext = context ? { ...this.context, ...context } : this.context;
+    const record = {
+      timestamp,
+      level,
+      message,
+      context: Object.keys(mergedContext).length ? mergedContext : void 0
+    };
+    for (const transport of this.transports) {
+      transport.log(record);
+    }
+  }
+  error(message, context) {
+    this.log("error", message, context);
+  }
+  warn(message, context) {
+    this.log("warn", message, context);
+  }
+  info(message, context) {
+    this.log("info", message, context);
+  }
+  debug(message, context) {
+    this.log("debug", message, context);
+  }
+}
+let loggerInstance = null;
+function getLogger(options) {
+  if (!loggerInstance) {
+    loggerInstance = new Logger(options);
+  }
+  return loggerInstance;
+}
+
 const FS_ERRORS = {
   file_not_found: "The file requested was not found",
   permission_denied: "Permission denied while accessing the file",
@@ -359,6 +409,25 @@ class FileSystemError extends Error {
   }
 }
 
+function hasMessage(error) {
+  return typeof error === "object" && error !== null && "message" in error && typeof error.message === "string";
+}
+function toError(maybeError) {
+  if (maybeError instanceof Error) {
+    return maybeError;
+  }
+  if (typeof maybeError === "string") {
+    return new Error(maybeError);
+  }
+  if (hasMessage(maybeError)) {
+    return new Error(maybeError.message);
+  }
+  try {
+    return new Error(JSON.stringify(maybeError));
+  } catch {
+    return new Error(String(maybeError));
+  }
+}
 function handleVerboseError(error) {
   if (error instanceof CommandError || error instanceof APIError || error instanceof FileSystemError) {
     const errorDetails = "getInfo" in error ? error.getInfo() : {};
@@ -398,6 +467,7 @@ function handleError(error, verbose = false) {
   if (!process.env.VITEST) {
     console.log("");
   }
+  getLogger().error(error.message, { error, errorCode: "code" in error ? String(error.code) : "UNKNOWN_ERROR" });
 }
 
 function requireAuthentication(state, verbose = false) {
@@ -503,6 +573,311 @@ function isRegion(value) {
 }
 const isVitest = process.env.VITEST === "true";
 
+const noopProgressBar = {
+  increment: () => {
+  },
+  setTotal: (_n) => {
+  },
+  stop: () => {
+  }
+};
+const noopSpinner = {
+  failed: (_title) => {
+  },
+  succeed: (_title) => {
+  },
+  elapsedTime: 0
+};
+class UI {
+  console;
+  enabled;
+  multiBar;
+  constructor({ enabled }) {
+    this.console = enabled ? console : null;
+    this.enabled = enabled;
+    this.multiBar = enabled ? new MultiBar({
+      clearOnComplete: false,
+      format: `${chalk.bold(" {title} ")} ${chalk.hex(colorPalette.PRIMARY)("[{bar}]")} {percentage}% | {eta_formatted} | {value}/{total} processed`,
+      etaBuffer: 60
+    }, Presets.rect) : null;
+  }
+  title(message, color, subtitle) {
+    if (subtitle) {
+      this.console?.log(`${chalk.bgHex(color).bold(` ${capitalize(message)} `)} ${subtitle}`);
+    } else {
+      this.console?.log(chalk.bgHex(color).bold(` ${capitalize(message)} `));
+    }
+    this.br();
+    this.br();
+  }
+  br() {
+    this.console?.log("");
+  }
+  ok(message, header = false) {
+    if (header) {
+      this.br();
+      const successHeader = chalk.bgGreen.bold.white(` Success `);
+      this.console?.log(successHeader);
+      this.br();
+    }
+    this.console?.log(message ? `${chalk.green("\u2714")} ${message}` : "");
+  }
+  info(message, options = {
+    header: false,
+    margin: true
+  }) {
+    if (options.header) {
+      this.br();
+      const infoHeader = chalk.bgBlue.bold.white(` Info `);
+      this.console?.info(infoHeader);
+    }
+    this.console?.info(message ? `${chalk.blue("\u2139")} ${message}` : "");
+    if (options.margin) {
+      this.br();
+    }
+  }
+  warn(message, header = false) {
+    if (header) {
+      this.br();
+      const warnHeader = chalk.bgYellow.bold.black(` Warning `);
+      this.console?.warn(warnHeader);
+    }
+    this.console?.warn(message ? `${chalk.yellow("\u26A0\uFE0F ")} ${message}` : "");
+  }
+  error(message, info, options = {
+    header: false,
+    margin: false
+  }) {
+    if (options.header) {
+      const errorHeader = chalk.bgRed.bold.white(` Error `);
+      this.console?.error(errorHeader);
+      this.br();
+    }
+    this.console?.error(`${chalk.red.bold("\u25B2 error")} ${message}`, info || "");
+    if (options.margin) {
+      this.br();
+    }
+  }
+  list(items) {
+    for (const item of items) {
+      this.console?.log(`  ${item}`);
+    }
+  }
+  createProgressBar(options) {
+    return this.multiBar?.create(0, 0, options) || noopProgressBar;
+  }
+  stopAllProgressBars() {
+    this.multiBar?.stop();
+  }
+  createSpinner(title) {
+    return this.enabled ? new Spinner({
+      verbose: !isVitest
+    }).start(title) : noopSpinner;
+  }
+}
+let uiInstance = null;
+function getUI(options = { enabled: false }) {
+  if (!uiInstance) {
+    uiInstance = new UI(options);
+  }
+  return uiInstance;
+}
+
+const getStoryblokGlobalPath = () => {
+  const homeDirectory = process.env[process.platform.startsWith("win") ? "USERPROFILE" : "HOME"] || process.cwd();
+  return join(homeDirectory, ".storyblok");
+};
+const saveToFile = async (filePath, data, options) => {
+  const resolvedPath = parse(filePath).dir;
+  try {
+    await mkdir(resolvedPath, { recursive: true });
+  } catch (mkdirError) {
+    handleFileSystemError("mkdir", mkdirError);
+    return;
+  }
+  try {
+    await writeFile(filePath, data, options);
+  } catch (writeError) {
+    handleFileSystemError("write", writeError);
+  }
+};
+const appendToFile = async (filePath, data, options) => {
+  const resolvedPath = parse(filePath).dir;
+  try {
+    await mkdir(resolvedPath, { recursive: true });
+  } catch (mkdirError) {
+    handleFileSystemError("mkdir", mkdirError);
+    return;
+  }
+  try {
+    const dataWithNewline = data.endsWith("\n") ? data : `${data}
+`;
+    await appendFile(filePath, dataWithNewline, options);
+  } catch (writeError) {
+    handleFileSystemError("write", writeError);
+  }
+};
+const appendToFileSync = (filePath, data, options) => {
+  const resolvedPath = parse(filePath).dir;
+  try {
+    mkdirSync(resolvedPath, { recursive: true });
+  } catch (mkdirError) {
+    handleFileSystemError("mkdir", mkdirError);
+    return;
+  }
+  try {
+    const dataWithNewline = data.endsWith("\n") ? data : `${data}
+`;
+    appendFileSync(filePath, dataWithNewline, options);
+  } catch (writeError) {
+    handleFileSystemError("write", writeError);
+  }
+};
+const readFile = async (filePath) => {
+  try {
+    return await readFile$1(filePath, "utf8");
+  } catch (error) {
+    handleFileSystemError("read", error);
+    return "";
+  }
+};
+const resolvePath = (path, folder) => {
+  if (path) {
+    return resolve(process.cwd(), path, folder);
+  }
+  return resolve(resolve(process.cwd(), ".storyblok"), folder);
+};
+const getComponentNameFromFilename = (filename) => {
+  return filename.replace(/\.js$/, "");
+};
+const sanitizeFilename = (filename) => {
+  return filenamify(filename, {
+    replacement: "_"
+  });
+};
+async function readJsonFile(filePath) {
+  try {
+    const content = (await readFile(filePath)).toString();
+    if (!content) {
+      return { data: [] };
+    }
+    const parsed = JSON.parse(content);
+    return { data: Array.isArray(parsed) ? parsed : [parsed] };
+  } catch (error) {
+    return { data: [], error };
+  }
+}
+function importModule(filePath) {
+  return import(`file://${filePath}`);
+}
+function getLogsPath(logFileDir, space, baseDir) {
+  if (space) {
+    return resolvePath(baseDir, join(logFileDir, space));
+  }
+  return resolvePath(baseDir, logFileDir);
+}
+
+class FileTransport {
+  filePath;
+  level;
+  maxFiles;
+  hasPruned = false;
+  constructor(options) {
+    this.filePath = options?.filePath ?? `./${Date.now()}.jsonl`;
+    this.level = options?.level ?? "info";
+    this.maxFiles = options?.maxFiles;
+  }
+  log(record) {
+    if (!this.shouldLog(record.level)) {
+      return;
+    }
+    const line = this.format(record);
+    appendToFileSync(this.filePath, line);
+    if (!this.hasPruned && this.maxFiles !== void 0) {
+      this.hasPruned = true;
+      this.pruneOldFiles();
+    }
+  }
+  pruneOldFiles() {
+    if (this.maxFiles === void 0) {
+      return;
+    }
+    const dir = dirname$1(this.filePath);
+    const ext = extname(this.filePath);
+    FileTransport.pruneLogFiles(dir, this.maxFiles, ext);
+  }
+  static pruneLogFiles(directory, keep, extension = ".jsonl") {
+    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 listLogFiles(directory, extension = ".jsonl") {
+    if (!existsSync(directory)) {
+      return [];
+    }
+    const files = readdirSync(directory).filter((file) => extname(file) === extension).sort();
+    return files.map((f) => join(directory, f).replace(process.cwd(), "."));
+  }
+  levelRank(level) {
+    switch (level) {
+      case "error":
+        return 0;
+      case "warn":
+        return 1;
+      case "info":
+        return 2;
+      case "debug":
+        return 3;
+      default:
+        return 3;
+    }
+  }
+  shouldLog(level) {
+    return this.levelRank(level) <= this.levelRank(this.level);
+  }
+  format(record) {
+    const timestamp = (record.timestamp ?? /* @__PURE__ */ new Date()).toISOString();
+    const level = record.level.toUpperCase();
+    const message = record.message.replaceAll("\n", "\\n");
+    const contextNormalized = record.context && this.formatContext(record.context);
+    return JSON.stringify({ timestamp, level, message, context: contextNormalized });
+  }
+  formatContext(context) {
+    const contextNormalized = {};
+    for (const [key, value] of Object.entries(context)) {
+      if (value instanceof APIError) {
+        contextNormalized[key] = {
+          name: value.name,
+          message: value.message,
+          httpCode: value.code,
+          httpStatusText: value.error?.response.statusText,
+          stack: value.stack
+        };
+        continue;
+      }
+      if (value instanceof Error) {
+        contextNormalized[key] = {
+          name: value.name,
+          message: value.message,
+          stack: value.stack
+        };
+        continue;
+      }
+      contextNormalized[key] = value;
+    }
+    return contextNormalized;
+  }
+}
+
 let packageJson;
 const result = await readPackageUp({
   cwd: __dirname
@@ -521,7 +896,28 @@ let programInstance = null;
 function getProgram() {
   if (!programInstance) {
     programInstance = new Command();
-    programInstance.name(packageJson.name).description(packageJson.description || "").version(packageJson.version);
+    programInstance.name(packageJson.name).description(packageJson.description || "").version(packageJson.version).hook("preAction", (_, actionCmd) => {
+      const options = actionCmd.optsWithGlobals();
+      const commandPieces = [];
+      for (let c = actionCmd; c; c = c.parent) {
+        commandPieces.unshift(c.name());
+      }
+      const command = commandPieces.join(" ");
+      const runId = Date.now();
+      const transports = [];
+      const logsPath = getLogsPath(directories.log, options.space, options.path);
+      const logFilename = `${commandPieces.join("-")}-${runId}.jsonl`;
+      const filePath = path.join(logsPath, logFilename);
+      transports.push(new FileTransport({
+        filePath,
+        maxFiles: 10
+      }));
+      getLogger({
+        context: { runId, command, options, cliVersion: packageJson.version },
+        transports
+      });
+      getUI({ enabled: true });
+    });
     programInstance.configureOutput({
       writeErr: (str) => handleError(new Error(str))
     });
@@ -650,75 +1046,6 @@ const loginWithOtp = async (email, password, otp, region) => {
   }
 };
 
-const getStoryblokGlobalPath = () => {
-  const homeDirectory = process.env[process.platform.startsWith("win") ? "USERPROFILE" : "HOME"] || process.cwd();
-  return join(homeDirectory, ".storyblok");
-};
-const saveToFile = async (filePath, data, options) => {
-  const resolvedPath = parse(filePath).dir;
-  try {
-    await mkdir(resolvedPath, { recursive: true });
-  } catch (mkdirError) {
-    handleFileSystemError("mkdir", mkdirError);
-    return;
-  }
-  try {
-    await writeFile(filePath, data, options);
-  } catch (writeError) {
-    handleFileSystemError("write", writeError);
-  }
-};
-const appendToFile = async (filePath, data, options) => {
-  const resolvedPath = parse(filePath).dir;
-  try {
-    await mkdir(resolvedPath, { recursive: true });
-  } catch (mkdirError) {
-    handleFileSystemError("mkdir", mkdirError);
-    return;
-  }
-  try {
-    const dataWithNewline = data.endsWith("\n") ? data : `${data}
-`;
-    await appendFile(filePath, dataWithNewline, options);
-  } catch (writeError) {
-    handleFileSystemError("write", writeError);
-  }
-};
-const readFile = async (filePath) => {
-  try {
-    return await readFile$1(filePath, "utf8");
-  } catch (error) {
-    handleFileSystemError("read", error);
-    return "";
-  }
-};
-const resolvePath = (path, folder) => {
-  if (path) {
-    return resolve(process.cwd(), path, folder);
-  }
-  return resolve(resolve(process.cwd(), ".storyblok"), folder);
-};
-const getComponentNameFromFilename = (filename) => {
-  return filename.replace(/\.js$/, "");
-};
-const sanitizeFilename = (filename) => {
-  return filenamify(filename, {
-    replacement: "_"
-  });
-};
-async function readJsonFile(filePath) {
-  try {
-    const content = (await readFile(filePath)).toString();
-    if (!content) {
-      return { data: [] };
-    }
-    const parsed = JSON.parse(content);
-    return { data: Array.isArray(parsed) ? parsed : [parsed] };
-  } catch (error) {
-    return { data: [], error };
-  }
-}
-
 const getCredentials = async (filePath = join(getStoryblokGlobalPath(), "credentials.json")) => {
   try {
     await access(filePath);
@@ -845,7 +1172,7 @@ function session() {
   return sessionInstance;
 }
 
-const program$i = getProgram();
+const program$g = getProgram();
 const allRegionsText = Object.values(regions).join(",");
 const loginStrategy = {
   message: "How would you like to login?",
@@ -862,12 +1189,12 @@ const loginStrategy = {
     }
   ]
 };
-program$i.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$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(
   "-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$i.opts().verbose;
+  const verbose = program$g.opts().verbose;
   const { token, region } = options;
   const { state, updateSession, persistCredentials, initializeSession } = session();
   await initializeSession();
@@ -995,10 +1322,10 @@ program$i.command(commands.LOGIN).description("Login to the Storyblok CLI").opti
   konsola.br();
 });
 
-const program$h = getProgram();
-program$h.command(commands.LOGOUT).description("Logout from the Storyblok CLI").action(async () => {
+const program$f = getProgram();
+program$f.command(commands.LOGOUT).description("Logout from the Storyblok CLI").action(async () => {
   konsola.title(`${commands.LOGOUT}`, colorPalette.LOGOUT);
-  const verbose = program$h.opts().verbose;
+  const verbose = program$f.opts().verbose;
   try {
     const { state, initializeSession } = session();
     await initializeSession();
@@ -1046,10 +1373,10 @@ async function openSignupInBrowser(url) {
   }
 }
 
-const program$g = getProgram();
-program$g.command(commands.SIGNUP).description("Sign up for Storyblok").action(async () => {
+const program$e = getProgram();
+program$e.command(commands.SIGNUP).description("Sign up for Storyblok").action(async () => {
   konsola.title(`${commands.SIGNUP}`, colorPalette.SIGNUP);
-  const verbose = program$g.opts().verbose;
+  const verbose = program$e.opts().verbose;
   const { state, initializeSession } = session();
   await initializeSession();
   if (state.isLoggedIn && !state.envLogin) {
@@ -1071,10 +1398,10 @@ program$g.command(commands.SIGNUP).description("Sign up for Storyblok").action(a
   konsola.br();
 });
 
-const program$f = getProgram();
-program$f.command(commands.USER).description("Get the current user").action(async () => {
+const program$d = getProgram();
+program$d.command(commands.USER).description("Get the current user").action(async () => {
   konsola.title(`${commands.USER}`, colorPalette.USER);
-  const verbose = program$f.opts().verbose;
+  const verbose = program$d.opts().verbose;
   const { state, initializeSession } = session();
   await initializeSession();
   if (!requireAuthentication(state)) {
@@ -1103,8 +1430,8 @@ program$f.command(commands.USER).description("Get the current user").action(asyn
   konsola.br();
 });
 
-const program$e = getProgram();
-const componentsCommand = program$e.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$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 fetchComponents = async (spaceId) => {
   try {
@@ -1484,10 +1811,10 @@ async function readConsolidatedFiles$1(resolvedPath, suffix) {
   };
 }
 
-const program$d = getProgram();
+const program$b = 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$d.opts().verbose;
+  const verbose = program$b.opts().verbose;
   const { space, path } = componentsCommand.opts();
   const { separateFiles, suffix, filename = "components" } = options;
   const { state, initializeSession } = session();
@@ -2520,10 +2847,10 @@ async function pushWithDependencyGraph(space, spaceState, maxConcurrency = 5) {
   return results;
 }
 
-const program$c = getProgram();
+const program$a = 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$c.opts().verbose;
+  const verbose = program$a.opts().verbose;
   const { space, path } = componentsCommand.opts();
   const { from, filter } = options;
   const { state, initializeSession } = session();
@@ -2719,11 +3046,11 @@ const saveLanguagesToFile = async (space, internationalizationOptions, options)
   }
 };
 
-const program$b = getProgram();
-const languagesCommand = program$b.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$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");
 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$b.opts().verbose;
+  const verbose = program$9.opts().verbose;
   const { space, path } = languagesCommand.opts();
   const { filename = "languages", suffix = options.space } = options;
   const { state, initializeSession } = session();
@@ -2770,8 +3097,8 @@ languagesCommand.command("pull").description(`Download your space's languages sc
   konsola.br();
 });
 
-const program$a = getProgram();
-const migrationsCommand = program$a.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$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 getMigrationTemplate = () => {
   return `export default function (block) {
@@ -2799,12 +3126,19 @@ const generateMigration = async (space, path, component, suffix) => {
   }
 };
 
-const program$9 = getProgram();
 migrationsCommand.command("generate [componentName]").description("Generate a migration file").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. {component-name}.<suffix>.js)").action(async (componentName, options) => {
-  konsola.title(`${commands.MIGRATIONS}`, colorPalette.MIGRATIONS, componentName ? `Generating migration for component ${componentName}...` : "Generating migrations...");
-  const verbose = program$9.opts().verbose;
+  const program = getProgram();
+  const ui = getUI();
+  const logger = getLogger();
+  ui.title(`${commands.MIGRATIONS}`, colorPalette.MIGRATIONS, componentName ? `Generating migration for component ${componentName}...` : "Generating migrations...");
+  const verbose = program.opts().verbose;
   const { space, path } = migrationsCommand.opts();
   const { suffix } = options;
+  logger.info("Migration generation started", {
+    componentName,
+    space,
+    suffix
+  });
   if (!componentName) {
     handleError(new CommandError(`Please provide the component name as argument ${chalk.hex(colorPalette.MIGRATIONS)("storyblok migrations generate YOUR_COMPONENT_NAME.")}`), verbose);
     return;
@@ -2825,9 +3159,7 @@ migrationsCommand.command("generate [componentName]").description("Generate a mi
     },
     region
   });
-  const spinner = new Spinner({
-    verbose: !isVitest
-  }).start(`Generating migration for component ${componentName}...`);
+  const spinner = ui.createSpinner(`Generating migration for component ${componentName}...`);
   try {
     const component = await fetchComponent(space, componentName);
     if (!component) {
@@ -2839,7 +3171,13 @@ migrationsCommand.command("generate [componentName]").description("Generate a mi
     spinner.succeed(`Migration generated for component ${chalk.hex(colorPalette.MIGRATIONS)(componentName)} - Completed in ${spinner.elapsedTime.toFixed(2)}ms`);
     const fileName = suffix ? `${component.name}.${suffix}.js` : `${component.name}.js`;
     const migrationPath = path ? `${path}/migrations/${space}/${fileName}` : `.storyblok/migrations/${space}/${fileName}`;
-    konsola.ok(`You can find the migration file in ${chalk.hex(colorPalette.MIGRATIONS)(migrationPath)}`);
+    ui.ok(`You can find the migration file in ${chalk.hex(colorPalette.MIGRATIONS)(migrationPath)}`);
+    logger.info("Migration generation finished", {
+      componentName: component.name,
+      migrationPath,
+      space,
+      suffix
+    });
   } catch (error) {
     spinner.failed(`Failed to generate migration for component ${componentName}`);
     handleError(error, verbose);
@@ -2904,6 +3242,18 @@ const updateStory = async (spaceId, storyId, payload) => {
   }
 };
 
+const ERROR_CODES = {
+  MIGRATION_APPLY_TO_STORY_ERROR: "MIGRATION_APPLY_TO_STORY_ERROR",
+  MIGRATION_CREATE_STORIES_PIPELINE_ERROR: "MIGRATION_CREATE_STORIES_PIPELINE_ERROR",
+  MIGRATION_FILE_NO_DEFAULT_EXPORT: "MIGRATION_FILE_NO_DEFAULT_EXPORT",
+  MIGRATION_FILE_NOT_FOUND: "MIGRATION_FILE_NOT_FOUND",
+  MIGRATION_LOAD_ERROR: "MIGRATION_LOAD_ERROR",
+  MIGRATION_STORY_CONTENT_MISSING: "MIGRATION_STORY_CONTENT_MISSING",
+  MIGRATION_STORY_FETCH_ERROR: "MIGRATION_STORY_FETCH_ERROR",
+  MIGRATION_STORY_UPDATE_ERROR: "MIGRATION_STORY_UPDATE_ERROR",
+  MIGRATION_STORY_UPDATE_NULL: "MIGRATION_STORY_UPDATE_NULL"
+};
+
 async function* storiesIterator(spaceId, params, onTotal) {
   try {
     let perPage = 500;
@@ -2924,6 +3274,7 @@ async function* storiesIterator(spaceId, params, onTotal) {
       page: 1,
       story_only: true
     });
+    getLogger().info(`Fetched stories page 1 of ${perPage}`);
     if (!result) {
       return;
     }
@@ -2941,6 +3292,7 @@ async function* storiesIterator(spaceId, params, onTotal) {
         page,
         story_only: true
       });
+      getLogger().info(`Fetched stories page ${page} of ${perPage}`);
       if (!result2) {
         return;
       }
@@ -2965,14 +3317,20 @@ class StoriesStream extends Transform {
   }
   semaphore;
   async _transform(chunk, _encoding, callback) {
-    await this.semaphore.acquire();
-    fetchStory(this.spaceId, chunk.id.toString()).then((story) => {
+    try {
+      await this.semaphore.acquire();
+      const story = await fetchStory(this.spaceId, chunk.id.toString());
       this.push(story);
       this.onProgress?.();
-    }).finally(() => {
+      getLogger().info("Fetched story", { storyId: chunk.id });
+      callback();
+    } catch (maybeError) {
+      const error = toError(maybeError);
+      getLogger().error(error.message, { storyId: chunk.id, error, errorCode: ERROR_CODES.MIGRATION_STORY_FETCH_ERROR });
+      callback(error);
+    } finally {
       this.semaphore.release();
-    });
-    callback();
+    }
   }
   _flush(callback) {
     this.semaphore.drain().then(() => {
@@ -2992,37 +3350,14 @@ const createStoriesStream = async ({
   return pipeline(listStoriesStream, new StoriesStream(spaceId, batchSize, onProgress), (err) => {
     if (err) {
       console.error(err);
+      getLogger().error(err.message, { errorCode: ERROR_CODES.MIGRATION_CREATE_STORIES_PIPELINE_ERROR });
     }
   });
 };
 
-async function readJavascriptFile(filePath) {
-  try {
-    const content = await readFile$1(filePath, "utf-8");
-    if (!content) {
-      throw new FileSystemError("invalid_argument", "read", new Error(`File ${filePath} is empty`));
-    }
-    return content;
-  } catch (error) {
-    throw new FileSystemError("file_not_found", "read", error);
-  }
-}
 async function readMigrationFiles(options) {
   const { space, path, filter } = options;
   const resolvedPath = resolvePath(path, `migrations/${space}`);
-  try {
-    await readdir(resolvedPath);
-  } catch (error) {
-    const message = `No directory found for space "${space}". Please make sure you have pulled the migrations first by running:
-
-  storyblok migrations pull --space ${space}`;
-    throw new FileSystemError(
-      "file_not_found",
-      "read",
-      error,
-      message
-    );
-  }
   try {
     const dirFiles = await readdir(resolvedPath);
     const migrationFiles = [];
@@ -3035,20 +3370,21 @@ async function readMigrationFiles(options) {
         if (filterRegex && !filterRegex.test(file)) {
           continue;
         }
-        const filePath = join(resolvedPath, file);
-        const content = await readJavascriptFile(filePath);
         migrationFiles.push({
-          name: file,
-          content
+          name: file
         });
       }
     }
     return migrationFiles;
   } catch (error) {
+    const message = `No directory found for space "${space}". Please make sure you have generated migrations first by running:
+
+  storyblok migrations generate YOUR_COMPONENT_NAME --space ${space}`;
     throw new FileSystemError(
       "file_not_found",
       "read",
-      error
+      error,
+      message
     );
   }
 }
@@ -3056,14 +3392,24 @@ async function getMigrationFunction(fileName, space, basePath) {
   try {
     const resolvedPath = resolvePath(basePath, `migrations/${space}`);
     const filePath = join(resolvedPath, fileName);
-    const migrationModule = await import(`file://${filePath}`);
+    const migrationModule = await importModule(filePath);
     if (typeof migrationModule.default === "function") {
       return migrationModule.default;
     }
-    konsola.error(`Migration file "${fileName}" does not export a default function.`);
+    getUI().error(`Migration file "${fileName}" does not export a default function.`);
+    getLogger().error("Migration file does not export a default function", {
+      fileName,
+      errorCode: ERROR_CODES.MIGRATION_FILE_NO_DEFAULT_EXPORT
+    });
     return null;
-  } catch (error) {
-    konsola.error(`Error loading migration function from "${fileName}": ${error.message}`);
+  } catch (maybeError) {
+    const error = toError(maybeError);
+    getUI().error(`Error loading migration function from "${fileName}": ${error.message}`);
+    getLogger().error("Couldn't load migration function", {
+      fileName,
+      error,
+      errorCode: ERROR_CODES.MIGRATION_LOAD_ERROR
+    });
     return null;
   }
 }
@@ -3200,6 +3546,10 @@ class MigrationStream extends Transform {
         migrationNames: relevantMigrations.map((m) => m.name),
         error: new Error("Story content is missing")
       });
+      getLogger().error("Failed to process story: Content is missing", {
+        storyId: story.id,
+        errorCode: ERROR_CODES.MIGRATION_STORY_CONTENT_MISSING
+      });
       return [];
     }
     const successfulResults = [];
@@ -3218,10 +3568,14 @@ class MigrationStream extends Transform {
       for (const migrationFile of migrationFiles) {
         const migrationFunction = await this.getOrLoadMigrationFunction(migrationFile);
         if (!migrationFunction) {
+          const error = new Error(`Failed to load migration function from file "${migrationFile.name}"`);
           this.results.failed.push({
             storyId: story.id,
             migrationNames,
-            error: new Error(`Failed to load migration function from file "${migrationFile.name}"`)
+            error
+          });
+          getLogger().error(error.message, {
+            errorCode: ERROR_CODES.MIGRATION_FILE_NOT_FOUND
           });
           return null;
         }
@@ -3251,6 +3605,7 @@ class MigrationStream extends Transform {
           migrationNames,
           content: storyContent
         });
+        getLogger().info("Applied migration", { storyId: story.id, migrationNames });
         return {
           storyId: story.id,
           name: story.name,
@@ -3265,6 +3620,7 @@ class MigrationStream extends Transform {
           migrationNames,
           reason: "No changes detected after migration"
         });
+        getLogger().info("Skipped migration: No changes detected", { storyId: story.id, migrationNames });
         return null;
       } else {
         const reason = migrationFiles.map((migrationFile) => {
@@ -3278,14 +3634,22 @@ class MigrationStream extends Transform {
           migrationNames,
           reason
         });
+        getLogger().info(`Skipped migration: ${reason}`, { storyId: story.id, migrationNames });
         return null;
       }
-    } catch (error) {
+    } catch (maybeError) {
+      const error = toError(maybeError);
       this.results.failed.push({
         storyId: story.id,
         migrationNames,
         error
       });
+      getLogger().error(error.message, {
+        storyId: story.id,
+        migrationNames,
+        error,
+        errorCode: ERROR_CODES.MIGRATION_APPLY_TO_STORY_ERROR
+      });
       return null;
     }
   }
@@ -3385,16 +3749,23 @@ class UpdateStream extends Writable {
         this.results.successful.push({ storyId, name: storyName });
         this.results.totalProcessed++;
         this.options.onProgress?.(this.results.totalProcessed);
+        getLogger().info("Updated story", { storyId });
       } else {
+        const error = new Error("Update returned null");
         this.results.failed.push({
           storyId,
           name: storyName,
-          error: new Error("Update returned null")
+          error
         });
         this.results.totalProcessed++;
         this.options.onProgress?.(this.results.totalProcessed);
+        getLogger().error(`Failed to update story: ${error.message}`, {
+          storyId,
+          errorCode: ERROR_CODES.MIGRATION_STORY_UPDATE_NULL
+        });
       }
-    } catch (error) {
+    } catch (maybeError) {
+      const error = toError(maybeError);
       this.results.failed.push({
         storyId,
         name: storyName,
@@ -3402,6 +3773,11 @@ class UpdateStream extends Writable {
       });
       this.results.totalProcessed++;
       this.options.onProgress?.(this.results.totalProcessed);
+      getLogger().error(error.message, {
+        storyId,
+        error,
+        errorCode: ERROR_CODES.MIGRATION_STORY_UPDATE_ERROR
+      });
     }
   }
   async _destroy(error, callback) {
@@ -3437,15 +3813,18 @@ class UpdateStream extends Writable {
   }
 }
 
-const program$8 = getProgram();
 migrationsCommand.command("run [componentName]").description("Run migrations").option("--fi, --filter <filter>", "glob filter to apply to the components before pushing").option("-d, --dry-run", "Preview changes without applying them to Storyblok").option("-q, --query <query>", 'Filter stories by content attributes using Storyblok filter query syntax. Example: --query="[highlighted][in]=true"').option("--starts-with <path>", 'Filter stories by path. Example: --starts-with="/en/blog/"').option("--publish <publish>", "Options for publication mode: all | published | published-with-changes").action(async (componentName, options) => {
-  konsola.title(`${commands.MIGRATIONS}`, colorPalette.MIGRATIONS, componentName ? `Running migrations for component ${componentName}...` : "Running migrations...");
+  const program = getProgram();
+  const ui = getUI();
+  const logger = getLogger();
+  ui.title(`${commands.MIGRATIONS}`, colorPalette.MIGRATIONS, componentName ? `Running migrations for component ${componentName}...` : "Running migrations...");
+  logger.info("Migration started");
   if (options.dryRun) {
-    konsola.warn(`DRY RUN MODE ENABLED: No changes will be made.
+    ui.warn(`DRY RUN MODE ENABLED: No changes will be made.
 `);
+    logger.warn("Dry run mode enabled");
   }
-  const verbose = program$8.opts().verbose;
-  const { filter, dryRun = false, query, startsWith, publish } = options;
+  const verbose = program.opts().verbose;
   const { space, path } = migrationsCommand.opts();
   const { state, initializeSession } = session();
   await initializeSession();
@@ -3456,6 +3835,7 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
+  const { filter, dryRun = false, query, startsWith, publish } = options;
   const { password, region } = state;
   mapiClient({
     token: {
@@ -3464,40 +3844,25 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
     region
   });
   try {
-    const spinner = new Spinner({
-      verbose: !isVitest
-    }).start(`Fetching migration files and stories...`);
+    const spinner = ui.createSpinner(`Fetching migration files and stories...`);
     const migrationFiles = await readMigrationFiles({
       space,
       path,
       filter
     });
-    if (migrationFiles.length === 0) {
-      spinner.failed(`No migration files found for space "${space}"${filter ? ` matching filter "${filter}"` : ""}.`);
-      return;
-    }
     const filteredMigrations = componentName ? migrationFiles.filter((file) => {
       return file.name.match(new RegExp(`^${componentName}(\\..*)?.js$`));
     }) : migrationFiles;
     if (filteredMigrations.length === 0) {
       spinner.failed(`No migration files found${componentName ? ` for component "${componentName}"` : ""}${filter ? ` matching filter "${filter}"` : ""} in space "${space}".`);
+      logger.warn("No migration files found");
+      logger.info("Migration finished");
       return;
     }
     spinner.succeed(`Found ${filteredMigrations.length} migration files.`);
-    const multiBar = new MultiBar({
-      clearOnComplete: false,
-      format: `${chalk.bold(" {title} ")} ${chalk.hex(colorPalette.PRIMARY)("[{bar}]")} {percentage}% | {eta_formatted} | {value}/{total} processed`,
-      etaBuffer: 60
-    }, Presets.rect);
-    const storiesProgress = multiBar.create(0, 0, {
-      title: "Fetching Stories...".padEnd(19)
-    });
-    const migrationsProgress = multiBar.create(0, 0, {
-      title: "Applying Migrations".padEnd(19)
-    });
-    const updateProgress = multiBar.create(0, 0, {
-      title: "Updating Stories...".padEnd(19)
-    });
+    const storiesProgress = ui.createProgressBar({ title: "Fetching Stories...".padEnd(19) });
+    const migrationsProgress = ui.createProgressBar({ title: "Applying Migrations".padEnd(19) });
+    const updateProgress = ui.createProgressBar({ title: "Updating Stories...".padEnd(19) });
     const storiesStream = await createStoriesStream({
       spaceId: space,
       params: {
@@ -3535,7 +3900,7 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
         updateProgress.increment();
       }
     });
-    return new Promise((resolve, reject) => {
+    await new Promise((resolve, reject) => {
       pipeline(
         storiesStream,
         migrationStream,
@@ -3545,25 +3910,51 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
             reject(err);
             return;
           }
-          multiBar.stop();
-          const migrationSummary = migrationStream.getSummary();
-          konsola.info(migrationSummary);
-          const updateSummary = updateStream.getSummary();
-          konsola.info(updateSummary);
           resolve();
         }
       );
     });
+    ui.stopAllProgressBars();
+    const migrationSummary = migrationStream.getSummary();
+    ui.info(migrationSummary);
+    const updateSummary = updateStream.getSummary();
+    ui.info(updateSummary);
+    const migrationResults = migrationStream.getResults();
+    const updateResults = updateStream.getResults();
+    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
+      }
+    });
   } catch (error) {
     handleError(error, verbose);
   }
 });
 
-const program$7 = getProgram();
 migrationsCommand.command("rollback [migrationFile]").description("Rollback a migration").action(async (migrationFile) => {
-  konsola.title(`${commands.MIGRATIONS}`, colorPalette.MIGRATIONS, `Rolling back migration ${chalk.hex(colorPalette.MIGRATIONS)(migrationFile)}...`);
-  const verbose = program$7.opts().verbose;
+  const program = getProgram();
+  const ui = getUI();
+  const logger = getLogger();
+  ui.title(
+    `${commands.MIGRATIONS}`,
+    colorPalette.MIGRATIONS,
+    migrationFile ? `Rolling back migration ${chalk.hex(colorPalette.MIGRATIONS)(migrationFile)}...` : "Rolling back migration..."
+  );
+  const verbose = program.opts().verbose;
   const { space, path } = migrationsCommand.opts();
+  logger.info("Migration rollback started", {
+    migrationFile,
+    space,
+    path
+  });
   const { state, initializeSession } = session();
   await initializeSession();
   if (!requireAuthentication(state, verbose)) {
@@ -3586,8 +3977,13 @@ migrationsCommand.command("rollback [migrationFile]").description("Rollback a mi
       path,
       migrationFile
     });
+    const rollbackSummary = {
+      total: rollbackData.stories.length,
+      succeeded: 0,
+      failed: 0
+    };
     for (const story of rollbackData.stories) {
-      const spinner = new Spinner({ verbose }).start(`Restoring story ${chalk.hex(colorPalette.PRIMARY)(story.name || story.storyId)}...`);
+      const spinner = ui.createSpinner(`Restoring story ${chalk.hex(colorPalette.PRIMARY)(story.name || story.storyId)}...`);
       try {
         const payload = {
           story: {
@@ -3603,18 +3999,37 @@ migrationsCommand.command("rollback [migrationFile]").description("Rollback a mi
           }
         }
         await updateStory(space, story.storyId, payload);
-        spinner.succeed(`Restored story ${chalk.hex(colorPalette.PRIMARY)(story.name || story.storyId)}`);
-      } catch (error) {
+        rollbackSummary.succeeded += 1;
+        spinner.succeed(`Restored story ${chalk.hex(colorPalette.PRIMARY)(story.name || story.storyId)} - Completed in ${spinner.elapsedTime.toFixed(2)}ms`);
+        logger.info("Story restored", {
+          storyId: story.storyId,
+          migrationFile,
+          space
+        });
+      } catch (maybeError) {
+        const error = toError(maybeError);
+        rollbackSummary.failed += 1;
         spinner.failed(`Failed to restore story ${chalk.hex(colorPalette.PRIMARY)(story.name || story.storyId)}: ${error.message}`);
+        logger.error("Failed to restore story", {
+          storyId: story.storyId,
+          migrationFile,
+          space,
+          error
+        });
       }
     }
+    logger.info("Migration rollback finished", {
+      migrationFile,
+      space,
+      results: rollbackSummary
+    });
   } catch (error) {
     handleError(new CommandError(`Failed to rollback migration: ${error.message}`), verbose);
   }
 });
 
-const program$6 = getProgram();
-const typesCommand = program$6.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$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 getAssetJSONSchema = (title) => ({
   $id: "#/asset",
@@ -4041,6 +4456,7 @@ const DEFAULT_TYPEDEFS_HEADER = [
   "// This file was generated by the storyblok CLI.",
   "// DO NOT MODIFY THIS FILE BY HAND."
 ];
+const getDatasourceTypeTitle = (slug) => `${toPascalCase(slug)}DataSource`;
 const getPropertyTypeAnnotation = (property, prefix, suffix) => {
   if (Array.from(storyblokSchemas.keys()).includes(property.type)) {
     return { type: property.type };
@@ -4149,6 +4565,13 @@ const getComponentPropertiesTypeAnnotations = async (component, options, spaceDa
       const componentType = toPascalCase(propertyType);
       propertyTypeAnnotation[key].tsType = `Storyblok${componentType}`;
     }
+    if (spaceData.datasources.length > 0 && schema.source === "internal" && schema?.datasource_slug) {
+      const datasourceExists = spaceData.datasources.some((ds) => ds.slug === schema.datasource_slug);
+      if (datasourceExists) {
+        const type = getDatasourceTypeTitle(schema.datasource_slug);
+        propertyTypeAnnotation[key].tsType = propertyType === "options" ? `${type}[]` : type;
+      }
+    }
     if (propertyType === "multilink") {
       const excludedLinktypes = [
         ...!schema.email_link_type ? ['{ linktype?: "email" }'] : [],
@@ -4222,6 +4645,7 @@ const generateTypes = async (spaceData, options = {
   try {
     const typeDefs = [...DEFAULT_TYPEDEFS_HEADER];
     const storyblokPropertyTypes = /* @__PURE__ */ new Set();
+    const contentTypeBloks = /* @__PURE__ */ new Set();
     let customFieldsParser;
     let compilerOptions;
     if (options.customFieldsParser) {
@@ -4230,8 +4654,11 @@ const generateTypes = async (spaceData, options = {
     if (options.compilerOptions) {
       compilerOptions = await loadCompilerOptions(options.compilerOptions);
     }
-    const schemas = await Promise.all(spaceData.components.map(async (component) => {
+    const componentsSchema = spaceData.components.map(async (component) => {
       const type = getComponentType(component.name, options);
+      if (component.is_root) {
+        contentTypeBloks.add(type);
+      }
       const componentPropertiesTypeAnnotations = await getComponentPropertiesTypeAnnotations(component, options, spaceData, customFieldsParser);
       const requiredFields = Object.entries(component?.schema || {}).reduce(
         (acc, [key, value]) => {
@@ -4270,7 +4697,35 @@ const generateTypes = async (spaceData, options = {
         }
       };
       return componentSchema;
-    }));
+    });
+    const resolvedComponentsSchema = await Promise.all(componentsSchema);
+    const datasourcesSchema = spaceData.datasources.map(async (datasource) => {
+      const allComponentTypes = resolvedComponentsSchema.map((schema) => schema.title);
+      const enumValues = datasource.entries?.filter((d) => d.value).map((d) => d.value);
+      const type = getDatasourceTypeTitle(datasource.slug);
+      if (allComponentTypes.includes(type)) {
+        console.warn(`Warning: Datasource type "${type}" conflicts with existing component type`);
+      }
+      const datasourceSchema = {
+        $id: `#/${datasource.slug}`,
+        title: type,
+        type: "string",
+        enum: enumValues
+      };
+      return datasourceSchema;
+    });
+    const resolvedDatasourcesSchema = await Promise.all(datasourcesSchema);
+    const contentTypeSchema = {
+      $id: `#/ContentType`,
+      title: "ContentType",
+      type: "string",
+      tsType: contentTypeBloks.size > 0 ? `${Array.from(contentTypeBloks).join(" | ")}` : "never"
+    };
+    const schemas = [
+      ...resolvedComponentsSchema,
+      ...resolvedDatasourcesSchema,
+      contentTypeSchema
+    ];
     const result = await Promise.all(schemas.map(async (schema) => {
       return await compile(schema, schema.title || schema.$id.replace("#/", ""), {
         additionalProperties: !options.strict,
@@ -4299,61 +4754,229 @@ const generateTypes = async (spaceData, options = {
     handleError(error);
   }
 };
-const saveTypesToComponentsFile = async (space, typedefString, options) => {
-  const { filename = DEFAULT_COMPONENT_FILENAME, path } = options;
-  const resolvedPath = path ? resolve(process.cwd(), path, "types", space) : resolvePath(path, `types/${space}`);
-  try {
-    await saveToFile(join(resolvedPath, `${filename}.d.ts`), typedefString);
-  } catch (error) {
-    handleFileSystemError("write", error);
+const saveTypesToComponentsFile = async (space, typedefString, options) => {
+  const { filename = DEFAULT_COMPONENT_FILENAME, path } = options;
+  const resolvedPath = path ? resolve(process.cwd(), path, "types", space) : resolvePath(path, `types/${space}`);
+  try {
+    await saveToFile(join(resolvedPath, `${filename}.d.ts`), typedefString);
+  } catch (error) {
+    handleFileSystemError("write", error);
+  }
+};
+const generateStoryblokTypes = async (options = {}) => {
+  const { path } = options;
+  try {
+    const storyblokTypesPath = resolve(__dirname, "./index.d.ts");
+    const storyblokTypesContent = readFileSync(storyblokTypesPath, "utf-8");
+    const typeDefs = [
+      "// This file was generated by the Storyblok CLI.",
+      "// DO NOT MODIFY THIS FILE BY HAND.",
+      `import type { ${STORY_TYPE} } from '@storyblok/js';`,
+      storyblokTypesContent
+    ].join("\n");
+    const resolvedPath = path ? resolve(process.cwd(), path, "types") : resolvePath(path, "types");
+    await saveToFile(join(resolvedPath, `storyblok.d.ts`), typeDefs);
+    return true;
+  } catch (error) {
+    handleFileSystemError("read", error);
+    return false;
+  }
+};
+
+const pushDatasource = async (spaceId, datasource) => {
+  try {
+    const client = mapiClient();
+    const { data } = await client.datasources.create({
+      path: {
+        space_id: spaceId
+      },
+      body: { datasource },
+      throwOnError: true
+    });
+    return data.datasource;
+  } catch (error) {
+    handleAPIError("push_datasource", error, `Failed to push datasource ${datasource.name}`);
+  }
+};
+const updateDatasource = async (spaceId, datasourceId, datasource) => {
+  try {
+    const client = mapiClient();
+    const { data } = await client.datasources.update({
+      path: {
+        space_id: spaceId,
+        datasource_id: datasourceId
+      },
+      body: {
+        datasource
+      },
+      throwOnError: true
+    });
+    return data.datasource;
+  } catch (error) {
+    handleAPIError("update_datasource", error, `Failed to update datasource ${datasource.name}`);
+  }
+};
+const upsertDatasource = async (space, datasource, existingId) => {
+  if (existingId) {
+    return await updateDatasource(space, existingId, datasource);
+  } else {
+    return await pushDatasource(space, datasource);
+  }
+};
+const pushDatasourceEntry = async (spaceId, datasourceId, entry) => {
+  try {
+    const client = mapiClient();
+    const { data } = await client.datasourceEntries.create({
+      path: {
+        space_id: spaceId
+      },
+      body: {
+        datasource_entry: {
+          ...entry,
+          datasource_id: datasourceId
+        }
+      },
+      throwOnError: true
+    });
+    return data.datasource_entry;
+  } catch (error) {
+    handleAPIError("push_datasource", error, `Failed to push datasource entry ${entry.name}`);
+  }
+};
+const updateDatasourceEntry = async (spaceId, entryId, entry) => {
+  try {
+    const client = mapiClient();
+    await client.datasourceEntries.updateDatasourceEntry({
+      path: {
+        space_id: spaceId,
+        datasource_entry_id: entryId
+      },
+      body: {
+        datasource_entry: entry
+      },
+      throwOnError: true
+    });
+  } catch (error) {
+    handleAPIError("update_datasource", error, `Failed to update datasource entry ${entry.name}`);
+  }
+};
+const upsertDatasourceEntry = async (space, datasourceId, entry, existingId) => {
+  if (existingId) {
+    await updateDatasourceEntry(space, existingId, entry);
+    return void 0;
+  } else {
+    return await pushDatasourceEntry(space, datasourceId, entry);
+  }
+};
+const readDatasourcesFiles = async (options) => {
+  const { from, path, separateFiles = false, suffix, space } = options;
+  const resolvedPath = resolvePath(path, `datasources/${from}`);
+  try {
+    await readdir(resolvedPath);
+  } catch (error) {
+    const message = `No local datasources found for space ${chalk.bold(from)}. To push datasources, you need to pull them first:
+
+1. Pull the datasources from your source space:
+   ${chalk.cyan(`storyblok datasources pull --space ${from}`)}
+
+2. Then try pushing again:
+   ${chalk.cyan(`storyblok datasources push --space ${space} --from ${from}`)}`;
+    throw new FileSystemError(
+      "file_not_found",
+      "read",
+      error,
+      message
+    );
+  }
+  if (separateFiles) {
+    return await readSeparateFiles(resolvedPath, suffix);
+  }
+  return await readConsolidatedFiles(resolvedPath, suffix);
+};
+async function readSeparateFiles(resolvedPath, suffix) {
+  const files = await readdir(resolvedPath);
+  const datasources = [];
+  const filteredFiles = files.filter((file) => {
+    if (suffix) {
+      return file.endsWith(`.${suffix}.json`);
+    } else {
+      return !/\.\w+\.json$/.test(file);
+    }
+  });
+  for (const file of filteredFiles) {
+    const filePath = join(resolvedPath, file);
+    if (file.endsWith(".json") || file.endsWith(`${suffix}.json`)) {
+      if (file === "datasources.json" || /^datasources\.\w+\.json$/.test(file)) {
+        continue;
+      }
+      const result = await readJsonFile(filePath);
+      if (result.error) {
+        handleFileSystemError("read", result.error);
+        continue;
+      }
+      datasources.push(...result.data);
+    }
   }
-};
-const generateStoryblokTypes = async (options = {}) => {
-  const { path } = options;
-  try {
-    const storyblokTypesPath = resolve(__dirname, "./index.d.ts");
-    const storyblokTypesContent = readFileSync(storyblokTypesPath, "utf-8");
-    const typeDefs = [
-      "// This file was generated by the Storyblok CLI.",
-      "// DO NOT MODIFY THIS FILE BY HAND.",
-      `import type { ${STORY_TYPE} } from '@storyblok/js';`,
-      storyblokTypesContent
-    ].join("\n");
-    const resolvedPath = path ? resolve(process.cwd(), path, "types") : resolvePath(path, "types");
-    await saveToFile(join(resolvedPath, `storyblok.d.ts`), typeDefs);
-    return true;
-  } catch (error) {
-    handleFileSystemError("read", error);
-    return false;
+  return {
+    datasources
+  };
+}
+async function readConsolidatedFiles(resolvedPath, suffix) {
+  const datasourcesPath = join(resolvedPath, suffix ? `datasources.${suffix}.json` : "datasources.json");
+  const datasourcesResult = await readJsonFile(datasourcesPath);
+  if (datasourcesResult.error || !datasourcesResult.data.length) {
+    throw new FileSystemError(
+      "file_not_found",
+      "read",
+      datasourcesResult.error || new Error("Datasources file is empty"),
+      `No datasources found in ${datasourcesPath}. Please make sure you have pulled the datasources first.`
+    );
   }
-};
+  return {
+    datasources: datasourcesResult.data
+  };
+}
 
-const program$5 = getProgram();
+const program$6 = 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$5.opts().verbose;
+  const verbose = program$6.opts().verbose;
   const { space, path } = typesCommand.opts();
   const spinner = new Spinner({
     verbose: !isVitest
   });
   try {
     spinner.start(`Generating types...`);
-    const spaceData = await readComponentsFiles({
+    const componentsData = await readComponentsFiles({
       ...options,
       from: space,
       path
     });
+    let dataSourceData;
+    try {
+      dataSourceData = await readDatasourcesFiles({
+        ...options,
+        from: space,
+        path
+      });
+    } catch (error) {
+      if (error instanceof FileSystemError && error.errorId === "file_not_found") {
+        dataSourceData = { datasources: [] };
+      } else {
+        throw error;
+      }
+    }
     await generateStoryblokTypes({
       path
     });
-    const spaceDataWithDatasources = {
-      ...spaceData,
-      datasources: []
+    const spaceDataWithComponentsAndDatasources = {
+      ...componentsData,
+      ...dataSourceData
     };
-    const typedefString = await generateTypes(spaceDataWithDatasources, {
+    const typedefString = await generateTypes(spaceDataWithComponentsAndDatasources, {
       ...options,
       path
     });
@@ -4373,8 +4996,8 @@ typesCommand.command("generate").description("Generate types d.ts for your compo
   }
 });
 
-const program$4 = getProgram();
-const datasourcesCommand = program$4.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$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");
 
 async function fetchAllPages(fetchFunction, extractDataFunction, page = 1, collectedItems = []) {
   const { data, response } = await fetchFunction(page);
@@ -4480,10 +5103,10 @@ const saveDatasourcesToFiles = async (space, datasources, options) => {
   }
 };
 
-const program$3 = getProgram();
+const program$4 = 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$3.opts().verbose;
+  const verbose = program$4.opts().verbose;
   const { space, path } = datasourcesCommand.opts();
   const { separateFiles, suffix, filename = "datasources" } = options;
   const { state, initializeSession } = session();
@@ -4552,164 +5175,10 @@ datasourcesCommand.command("pull [datasourceName]").option("-f, --filename <file
   }
 });
 
-const pushDatasource = async (spaceId, datasource) => {
-  try {
-    const client = mapiClient();
-    const { data } = await client.datasources.create({
-      path: {
-        space_id: spaceId
-      },
-      body: { datasource },
-      throwOnError: true
-    });
-    return data.datasource;
-  } catch (error) {
-    handleAPIError("push_datasource", error, `Failed to push datasource ${datasource.name}`);
-  }
-};
-const updateDatasource = async (spaceId, datasourceId, datasource) => {
-  try {
-    const client = mapiClient();
-    const { data } = await client.datasources.update({
-      path: {
-        space_id: spaceId,
-        datasource_id: datasourceId
-      },
-      body: {
-        datasource
-      },
-      throwOnError: true
-    });
-    return data.datasource;
-  } catch (error) {
-    handleAPIError("update_datasource", error, `Failed to update datasource ${datasource.name}`);
-  }
-};
-const upsertDatasource = async (space, datasource, existingId) => {
-  if (existingId) {
-    return await updateDatasource(space, existingId, datasource);
-  } else {
-    return await pushDatasource(space, datasource);
-  }
-};
-const pushDatasourceEntry = async (spaceId, datasourceId, entry) => {
-  try {
-    const client = mapiClient();
-    const { data } = await client.datasourceEntries.create({
-      path: {
-        space_id: spaceId
-      },
-      body: {
-        datasource_entry: {
-          ...entry,
-          datasource_id: datasourceId
-        }
-      },
-      throwOnError: true
-    });
-    return data.datasource_entry;
-  } catch (error) {
-    handleAPIError("push_datasource", error, `Failed to push datasource entry ${entry.name}`);
-  }
-};
-const updateDatasourceEntry = async (spaceId, entryId, entry) => {
-  try {
-    const client = mapiClient();
-    await client.datasourceEntries.updateDatasourceEntry({
-      path: {
-        space_id: spaceId,
-        datasource_entry_id: entryId
-      },
-      body: {
-        datasource_entry: entry
-      },
-      throwOnError: true
-    });
-  } catch (error) {
-    handleAPIError("update_datasource", error, `Failed to update datasource entry ${entry.name}`);
-  }
-};
-const upsertDatasourceEntry = async (space, datasourceId, entry, existingId) => {
-  if (existingId) {
-    await updateDatasourceEntry(space, existingId, entry);
-    return void 0;
-  } else {
-    return await pushDatasourceEntry(space, datasourceId, entry);
-  }
-};
-const readDatasourcesFiles = async (options) => {
-  const { from, path, separateFiles = false, suffix, space } = options;
-  const resolvedPath = resolvePath(path, `datasources/${from}`);
-  try {
-    await readdir(resolvedPath);
-  } catch (error) {
-    const message = `No local datasources found for space ${chalk.bold(from)}. To push datasources, you need to pull them first:
-
-1. Pull the datasources from your source space:
-   ${chalk.cyan(`storyblok datasources pull --space ${from}`)}
-
-2. Then try pushing again:
-   ${chalk.cyan(`storyblok datasources push --space ${space} --from ${from}`)}`;
-    throw new FileSystemError(
-      "file_not_found",
-      "read",
-      error,
-      message
-    );
-  }
-  if (separateFiles) {
-    return await readSeparateFiles(resolvedPath, suffix);
-  }
-  return await readConsolidatedFiles(resolvedPath, suffix);
-};
-async function readSeparateFiles(resolvedPath, suffix) {
-  const files = await readdir(resolvedPath);
-  const datasources = [];
-  const filteredFiles = files.filter((file) => {
-    if (suffix) {
-      return file.endsWith(`.${suffix}.json`);
-    } else {
-      return !/\.\w+\.json$/.test(file);
-    }
-  });
-  for (const file of filteredFiles) {
-    const filePath = join(resolvedPath, file);
-    if (file.endsWith(".json") || file.endsWith(`${suffix}.json`)) {
-      if (file === "datasources.json" || /^datasources\.\w+\.json$/.test(file)) {
-        continue;
-      }
-      const result = await readJsonFile(filePath);
-      if (result.error) {
-        handleFileSystemError("read", result.error);
-        continue;
-      }
-      datasources.push(...result.data);
-    }
-  }
-  return {
-    datasources
-  };
-}
-async function readConsolidatedFiles(resolvedPath, suffix) {
-  const datasourcesPath = join(resolvedPath, suffix ? `datasources.${suffix}.json` : "datasources.json");
-  const datasourcesResult = await readJsonFile(datasourcesPath);
-  if (datasourcesResult.error || !datasourcesResult.data.length) {
-    throw new FileSystemError(
-      "file_not_found",
-      "read",
-      datasourcesResult.error || new Error("Datasources file is empty"),
-      `No datasources found in ${datasourcesPath}. Please make sure you have pulled the datasources first.`
-    );
-  }
-  return {
-    datasources: datasourcesResult.data
-  };
-}
-
-const program$2 = getProgram();
+const program$3 = 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$2.opts().verbose;
+  const verbose = program$3.opts().verbose;
   const { space, path } = datasourcesCommand.opts();
   const { from, filter } = options;
   const { state, initializeSession } = session();
@@ -5026,10 +5495,10 @@ const fetchBlueprintRepositories = async () => {
   }
 };
 
-const program$1 = getProgram();
-program$1.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) => {
+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) => {
   konsola.title(`${commands.CREATE}`, colorPalette.CREATE);
-  const verbose = program$1.opts().verbose;
+  const verbose = program$2.opts().verbose;
   const { template, blueprint } = options;
   let selectedTemplate = template;
   if (blueprint && !template) {
@@ -5217,7 +5686,31 @@ program$1.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
   konsola.br();
 });
 
-const version = "4.6.14";
+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'.");
+
+logsCommand.command("list").description("List logs").action(async () => {
+  const { space, path } = logsCommand.opts();
+  const ui = getUI();
+  const logsPath = getLogsPath(directories.log, space, path);
+  const logFiles = FileTransport.listLogFiles(logsPath);
+  if (logFiles.length === 0) {
+    ui.info(`No logs found for space "${space}".`);
+    return;
+  }
+  ui.info(`Found ${logFiles.length} log file${logFiles.length === 1 ? "" : "s"} for space "${space}":`);
+  ui.list(logFiles);
+});
+
+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 deletedFilesCount = FileTransport.pruneLogFiles(logsPath, keep);
+  ui.info(`Deleted ${deletedFilesCount} log file${deletedFilesCount === 1 ? "" : "s"}`);
+});
+
+const version = "4.8.0";
 const pkg = {
 	version: version};