storyblok 4.0.0-beta.3 → 4.0.0-beta.5

package/dist/index.mjs

@@ -9,6 +9,8 @@ import { Spinner } from '@topcli/spinner';
 import { select, password, input } from '@inquirer/prompts';
 import { mkdir, writeFile, readFile as readFile$1, access, readdir } from 'node:fs/promises';
 import { join, parse, resolve } from 'node:path';
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
 import { hash } from 'ohash';
 import { compile } from 'json-schema-to-typescript';
 import { readFileSync } from 'node:fs';
@@ -16,6 +18,7 @@ import { readFileSync } from 'node:fs';
 const commands = {
   LOGIN: "login",
   LOGOUT: "logout",
+  SIGNUP: "signup",
   USER: "user",
   COMPONENTS: "Components",
   LANGUAGES: "languages",
@@ -26,6 +29,7 @@ const colorPalette = {
   PRIMARY: "#8d60ff",
   LOGIN: "#dad4ff",
   LOGOUT: "#6d6d6d",
+  SIGNUP: "#b6ff6d",
   USER: "#71d300",
   COMPONENTS: "#a185ff",
   LANGUAGES: "#f5c003",
@@ -107,7 +111,11 @@ async function customFetch(url, options = {}) {
           data
         });
       }
-      return data;
+      return {
+        ...data,
+        perPage: Number(response.headers.get("Per-Page")),
+        total: Number(response.headers.get("Total"))
+      };
     } catch (error) {
       if (error instanceof FetchError) {
         throw error;
@@ -315,6 +323,22 @@ class FileSystemError extends Error {
   }
 }
 
+function handleVerboseError(error) {
+  if (error instanceof CommandError || error instanceof APIError || error instanceof FileSystemError) {
+    const errorDetails = "getInfo" in error ? error.getInfo() : {};
+    if (error instanceof CommandError) {
+      konsola.error(`Command Error: ${error.getInfo().message}`, errorDetails);
+    } else if (error instanceof APIError) {
+      konsola.error(`API Error: ${error.getInfo().cause}`, errorDetails);
+    } else if (error instanceof FileSystemError) {
+      konsola.error(`File System Error: ${error.getInfo().cause}`, errorDetails);
+    } else {
+      konsola.error(`Unexpected Error: ${error}`, errorDetails);
+    }
+  } else {
+    konsola.error(`Unexpected Error`, error);
+  }
+}
 function handleError(error, verbose = false) {
   if (error instanceof APIError || error instanceof FileSystemError) {
     const messageStack = error.messageStack;
@@ -329,17 +353,8 @@ function handleError(error, verbose = false) {
       header: true
     });
   }
-  if (verbose && (error instanceof CommandError || error instanceof APIError || error instanceof FileSystemError)) {
-    const errorDetails = "getInfo" in error ? error.getInfo() : {};
-    if (error instanceof CommandError) {
-      konsola.error(`Command Error: ${error.getInfo().message}`, errorDetails);
-    } else if (error instanceof APIError) {
-      konsola.error(`API Error: ${error.getInfo().cause}`, errorDetails);
-    } else if (error instanceof FileSystemError) {
-      konsola.error(`File System Error: ${error.getInfo().cause}`, errorDetails);
-    } else {
-      konsola.error(`Unexpected Error: ${error}`, errorDetails);
-    }
+  if (verbose) {
+    handleVerboseError(error);
   } else {
     konsola.br();
     konsola.info("For more information about the error, run the command with the `--verbose` flag");
@@ -349,6 +364,17 @@ function handleError(error, verbose = false) {
   }
 }
 
+function requireAuthentication(state, verbose = false) {
+  if (!state.isLoggedIn || !state.password || !state.region) {
+    handleError(
+      new CommandError(`You are currently not logged in. Please run ${chalk.hex(colorPalette.PRIMARY)("storyblok login")} to authenticate, or ${chalk.hex(colorPalette.PRIMARY)("storyblok signup")} to sign up.`),
+      verbose
+    );
+    return false;
+  }
+  return true;
+}
+
 const toPascalCase = (str) => {
   return str.replace(/(?:^|_)(\w)/g, (_, char) => char.toUpperCase());
 };
@@ -688,7 +714,7 @@ function session() {
   return sessionInstance;
 }
 
-const program$d = getProgram();
+const program$e = getProgram();
 const allRegionsText = Object.values(regions).join(",");
 const loginStrategy = {
   message: "How would you like to login?",
@@ -705,12 +731,12 @@ const loginStrategy = {
     }
   ]
 };
-program$d.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$e.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$d.opts().verbose;
+  const verbose = program$e.opts().verbose;
   const { token, region } = options;
   const { state, updateSession, persistCredentials, initializeSession } = session();
   await initializeSession();
@@ -818,10 +844,10 @@ program$d.command(commands.LOGIN).description("Login to the Storyblok CLI").opti
   konsola.br();
 });
 
-const program$c = getProgram();
-program$c.command(commands.LOGOUT).description("Logout from the Storyblok CLI").action(async () => {
+const program$d = getProgram();
+program$d.command(commands.LOGOUT).description("Logout from the Storyblok CLI").action(async () => {
   konsola.title(` ${commands.LOGOUT} `, colorPalette.LOGOUT);
-  const verbose = program$c.opts().verbose;
+  const verbose = program$d.opts().verbose;
   try {
     const { state, initializeSession } = session();
     await initializeSession();
@@ -839,6 +865,61 @@ program$c.command(commands.LOGOUT).description("Logout from the Storyblok CLI").
   konsola.br();
 });
 
+const execAsync = promisify(exec);
+function buildSignupUrl() {
+  const baseUrl = "https://app.storyblok.com";
+  const utmParams = new URLSearchParams({
+    utm_source: "storyblok-cli",
+    utm_medium: "cli",
+    utm_campaign: "signup"
+  });
+  return `${baseUrl}/#/signup?${utmParams.toString()}`;
+}
+async function openSignupInBrowser(url) {
+  let command;
+  switch (process.platform) {
+    case "darwin":
+      command = `open "${url}"`;
+      break;
+    case "win32":
+      command = `start "" "${url}"`;
+      break;
+    default:
+      command = `xdg-open "${url}"`;
+      break;
+  }
+  try {
+    await execAsync(command);
+  } catch (error) {
+    throw new Error(`Failed to open browser: ${error}`);
+  }
+}
+
+const program$c = getProgram();
+program$c.command(commands.SIGNUP).description("Sign up for Storyblok").action(async () => {
+  konsola.title(` ${commands.SIGNUP} `, colorPalette.SIGNUP);
+  const verbose = program$c.opts().verbose;
+  const { state, initializeSession } = session();
+  await initializeSession();
+  if (state.isLoggedIn && !state.envLogin) {
+    konsola.ok(`You are already logged in. If you want to signup with a different account, please logout first.`);
+    return;
+  }
+  try {
+    const signupUrl = buildSignupUrl();
+    konsola.info(`Opening Storyblok signup page...`);
+    konsola.info(`URL: ${chalk.dim(signupUrl)}`);
+    await openSignupInBrowser(signupUrl);
+    konsola.ok(`Browser opened! Please complete the signup process.`);
+    konsola.br();
+    konsola.info(`Once you've completed signup, run ${chalk.hex(colorPalette.PRIMARY)("storyblok login")} to authenticate with the CLI.`);
+  } catch (error) {
+    konsola.br();
+    handleError(error, verbose);
+  }
+  konsola.br();
+});
+
 const getUser = async (token, region) => {
   try {
     const url = getStoryblokUrl(region);
@@ -868,8 +949,7 @@ program$b.command(commands.USER).description("Get the current user").action(asyn
   konsola.title(` ${commands.USER} `, colorPalette.USER);
   const { state, initializeSession } = session();
   await initializeSession();
-  if (!state.isLoggedIn) {
-    handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`));
+  if (!requireAuthentication(state)) {
     return;
   }
   const spinner = new Spinner({
@@ -893,67 +973,174 @@ program$b.command(commands.USER).description("Get the current user").action(asyn
 const program$a = getProgram();
 const componentsCommand = program$a.command("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 (space, token, region) => {
-  try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/components`, {
-      headers: {
-        Authorization: token
+let instance = null;
+const createMapiClient = (options) => {
+  const baseHeaders = {
+    "Content-Type": "application/json",
+    "Authorization": options.token
+  };
+  const state = {
+    uuid: `mapi-client-${Math.random().toString(36).substring(2, 15)}`,
+    baseHeaders,
+    url: options.url || getStoryblokUrl(options.region),
+    maxRetries: options.maxRetries ?? 6,
+    baseDelay: options.baseDelay ?? 500,
+    freeze: false
+  };
+  const request = async (path, fetchOptions, attempt = 0, isRateLimitOwner = false) => {
+    if (state.freeze && !isRateLimitOwner) {
+      if (options?.verbose) {
+        console.log(`\u23F3 ${path} - Waiting for rate limit to be resolved`);
+      }
+      await new Promise((resolve) => {
+        const checkFreeze = setInterval(() => {
+          if (!state.freeze) {
+            clearInterval(checkFreeze);
+            resolve();
+          }
+        }, 50);
+      });
+      await delay(100 + Math.random() * 400);
+      return request(path, fetchOptions, attempt);
+    }
+    try {
+      if (options?.verbose) {
+        console.log(`${state.url}/${path} - Attempt ${attempt}`);
       }
-    });
-    return response.components;
+      const res = await fetch(`${state.url}/${path}`, {
+        headers: {
+          ...state.baseHeaders,
+          ...fetchOptions?.headers
+        },
+        ...fetchOptions
+      });
+      let data;
+      try {
+        data = await res.json();
+      } catch {
+        throw new FetchError("Non-JSON response", {
+          status: res.status,
+          statusText: res.statusText,
+          data: null
+        });
+      }
+      if (res.ok) {
+        if (options?.verbose) {
+          console.log(`\u2705 ${path}`);
+        }
+        return {
+          data,
+          attempt
+        };
+      } else {
+        throw new FetchError("Request failed", {
+          status: res.status,
+          statusText: res.statusText,
+          data
+        });
+      }
+    } catch (error) {
+      if (error instanceof FetchError) {
+        if (error.response.status === 429 && attempt < state.maxRetries) {
+          if (options?.verbose) {
+            console.log(`\u274C ${path} - Rate limit exceeded`);
+          }
+          let isOwner = isRateLimitOwner;
+          if (!state.freeze) {
+            state.freeze = true;
+            isOwner = true;
+          }
+          const waitTime = state.baseDelay * 2 ** attempt + Math.random() * 100;
+          await delay(waitTime);
+          try {
+            const result = await request(path, fetchOptions, attempt + 1, isOwner);
+            return result;
+          } finally {
+            if (isOwner && state.freeze) {
+              state.freeze = false;
+            }
+          }
+        }
+        throw error;
+      }
+      if (state.freeze && isRateLimitOwner) {
+        state.freeze = false;
+      }
+      throw new FetchError(error instanceof Error ? error.message : String(error), {
+        status: 0,
+        statusText: "Network Error",
+        data: null
+      });
+    }
+  };
+  const get = async (path, fetchOptions) => {
+    return request(path, fetchOptions);
+  };
+  const post = async (path, fetchOptions) => {
+    return request(path, { ...fetchOptions, method: "POST" });
+  };
+  const put = async (path, fetchOptions) => {
+    return request(path, { ...fetchOptions, method: "PUT" });
+  };
+  instance = {
+    uuid: state.uuid,
+    get,
+    post,
+    put,
+    dispose: () => {
+      instance = null;
+    }
+  };
+  return instance;
+};
+function mapiClient(options) {
+  if (!instance) {
+    instance = createMapiClient(options ?? {});
+  }
+  return instance;
+}
+
+const fetchComponents = async (space) => {
+  try {
+    const client = mapiClient();
+    const { data } = await client.get(`spaces/${space}/components`, {});
+    return data.components;
   } catch (error) {
     handleAPIError("pull_components", error);
   }
 };
-const fetchComponent = async (space, componentName, token, region) => {
+const fetchComponent = async (space, componentName) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/components?search=${encodeURIComponent(componentName)}`, {
-      headers: {
-        Authorization: token
-      }
-    });
-    return response.components?.find((c) => c.name === componentName);
+    const client = mapiClient();
+    const { data } = await client.get(`spaces/${space}/components?search=${encodeURIComponent(componentName)}`, {});
+    return data.components?.find((c) => c.name === componentName);
   } catch (error) {
     handleAPIError("pull_components", error, `Failed to fetch component ${componentName}`);
   }
 };
-const fetchComponentGroups = async (space, token, region) => {
+const fetchComponentGroups = async (space) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/component_groups`, {
-      headers: {
-        Authorization: token
-      }
-    });
-    return response.component_groups;
+    const client = mapiClient();
+    const { data } = await client.get(`spaces/${space}/component_groups`);
+    return data.component_groups;
   } catch (error) {
     handleAPIError("pull_component_groups", error);
   }
 };
-const fetchComponentPresets = async (space, token, region) => {
+const fetchComponentPresets = async (space) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/presets`, {
-      headers: {
-        Authorization: token
-      }
-    });
-    return response.presets;
+    const client = mapiClient();
+    const { data } = await client.get(`spaces/${space}/presets`);
+    return data.presets;
   } catch (error) {
     handleAPIError("pull_component_presets", error);
   }
 };
-const fetchComponentInternalTags = async (space, token, region) => {
+const fetchComponentInternalTags = async (space) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/internal_tags`, {
-      headers: {
-        Authorization: token
-      }
-    });
-    return response.internal_tags.filter((tag) => tag.object_type === "component");
+    const client = mapiClient();
+    const { data } = await client.get(`spaces/${space}/internal_tags`, {});
+    return data.internal_tags.filter((tag) => tag.object_type === "component");
   } catch (error) {
     handleAPIError("pull_component_internal_tags", error);
   }
@@ -998,187 +1185,157 @@ const saveComponentsToFiles = async (space, spaceData, options) => {
   }
 };
 
-const pushComponent = async (space, component, token, region) => {
+const pushComponent = async (space, component) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/components`, {
-      method: "POST",
-      headers: {
-        Authorization: token
-      },
+    const client = mapiClient();
+    const { data } = await client.post(`spaces/${space}/components`, {
       body: JSON.stringify(component)
     });
-    return response.component;
+    return data.component;
   } catch (error) {
     handleAPIError("push_component", error, `Failed to push component ${component.name}`);
   }
 };
-const updateComponent = async (space, componentId, component, token, region) => {
+const updateComponent = async (space, componentId, component) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/components/${componentId}`, {
-      method: "PUT",
-      headers: {
-        Authorization: token
-      },
+    const client = mapiClient();
+    const { data } = await client.put(`spaces/${space}/components/${componentId}`, {
       body: JSON.stringify(component)
     });
-    return response.component;
+    return data.component;
   } catch (error) {
     handleAPIError("update_component", error, `Failed to update component ${component.name}`);
   }
 };
-const upsertComponent = async (space, component, token, region) => {
+const upsertComponent = async (space, component) => {
   try {
-    return await pushComponent(space, component, token, region);
+    return await pushComponent(space, component);
   } catch (error) {
     if (error instanceof APIError && error.code === 422) {
       const responseData = error.response?.data;
       if (responseData?.name?.[0] === "has already been taken") {
-        const existingComponent = await fetchComponent(space, component.name, token, region);
+        const existingComponent = await fetchComponent(space, component.name);
         if (existingComponent) {
-          return await updateComponent(space, existingComponent.id, component, token, region);
+          return await updateComponent(space, existingComponent.id, component);
         }
       }
     }
     throw error;
   }
 };
-const pushComponentGroup = async (space, componentGroup, token, region) => {
+const pushComponentGroup = async (space, componentGroup) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/component_groups`, {
-      method: "POST",
-      headers: {
-        Authorization: token
-      },
+    const client = mapiClient();
+    const { data } = await client.post(`spaces/${space}/component_groups`, {
       body: JSON.stringify(componentGroup)
     });
-    return response.component_group;
+    return data.component_group;
   } catch (error) {
     handleAPIError("push_component_group", error, `Failed to push component group ${componentGroup.name}`);
   }
 };
-const updateComponentGroup = async (space, groupId, componentGroup, token, region) => {
+const updateComponentGroup = async (space, groupId, componentGroup) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/component_groups/${groupId}`, {
-      method: "PUT",
-      headers: {
-        Authorization: token
-      },
+    const client = mapiClient();
+    const { data } = await client.put(`spaces/${space}/component_groups/${groupId}`, {
       body: JSON.stringify(componentGroup)
     });
-    return response.component_group;
+    return data.component_group;
   } catch (error) {
     handleAPIError("update_component_group", error, `Failed to update component group ${componentGroup.name}`);
   }
 };
-const upsertComponentGroup = async (space, group, token, region) => {
+const upsertComponentGroup = async (space, group) => {
   try {
-    return await pushComponentGroup(space, group, token, region);
+    return await pushComponentGroup(space, group);
   } catch (error) {
     if (error instanceof APIError && error.code === 422) {
       const responseData = error.response?.data;
       if (responseData?.name?.[0] === "has already been taken") {
-        const existingGroups = await fetchComponentGroups(space, token, region);
+        const existingGroups = await fetchComponentGroups(space);
         const existingGroup = existingGroups?.find((g) => g.name === group.name);
         if (existingGroup) {
-          return await updateComponentGroup(space, existingGroup.id, group, token, region);
+          return await updateComponentGroup(space, existingGroup.id, group);
         }
       }
     }
     throw error;
   }
 };
-const pushComponentPreset = async (space, componentPreset, token, region) => {
+const pushComponentPreset = async (space, componentPreset) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/presets`, {
-      method: "POST",
-      headers: {
-        Authorization: token
-      },
+    const client = mapiClient();
+    const { data } = await client.post(`spaces/${space}/presets`, {
       body: JSON.stringify(componentPreset)
     });
-    return response.preset;
+    return data.preset;
   } catch (error) {
     handleAPIError("push_component_preset", error, `Failed to push component preset ${componentPreset.preset.name}`);
   }
 };
-const updateComponentPreset = async (space, presetId, componentPreset, token, region) => {
+const updateComponentPreset = async (space, presetId, componentPreset) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/presets/${presetId}`, {
-      method: "PUT",
-      headers: {
-        Authorization: token
-      },
+    const client = mapiClient();
+    const { data } = await client.put(`spaces/${space}/presets/${presetId}`, {
       body: JSON.stringify(componentPreset)
     });
-    return response.preset;
+    return data.preset;
   } catch (error) {
     handleAPIError("update_component_preset", error, `Failed to update component preset ${componentPreset.preset.name}`);
   }
 };
-const upsertComponentPreset = async (space, preset, token, region) => {
+const upsertComponentPreset = async (space, preset) => {
   try {
-    return await pushComponentPreset(space, { preset }, token, region);
+    return await pushComponentPreset(space, { preset });
   } catch (error) {
     if (error instanceof APIError && error.code === 422) {
       const responseData = error.response?.data;
       if (responseData?.name?.[0] === "has already been taken") {
-        const existingPresets = await fetchComponentPresets(space, token, region);
+        const existingPresets = await fetchComponentPresets(space);
         const existingPreset = existingPresets?.find((p) => p.name === preset.name && p.component_id === preset.component_id);
         if (existingPreset) {
-          return await updateComponentPreset(space, existingPreset.id, { preset }, token, region);
+          return await updateComponentPreset(space, existingPreset.id, { preset });
         }
       }
     }
     throw error;
   }
 };
-const pushComponentInternalTag = async (space, componentInternalTag, token, region) => {
+const pushComponentInternalTag = async (space, componentInternalTag) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/internal_tags`, {
+    const client = mapiClient();
+    const { data } = await client.post(`spaces/${space}/internal_tags`, {
       method: "POST",
-      headers: {
-        Authorization: token
-      },
       body: JSON.stringify(componentInternalTag)
     });
-    return response.internal_tag;
+    return data.internal_tag;
   } catch (error) {
     handleAPIError("push_component_internal_tag", error, `Failed to push component internal tag ${componentInternalTag.name}`);
   }
 };
-const updateComponentInternalTag = async (space, tagId, componentInternalTag, token, region) => {
+const updateComponentInternalTag = async (space, tagId, componentInternalTag) => {
   try {
-    const url = getStoryblokUrl(region);
-    const response = await customFetch(`${url}/spaces/${space}/internal_tags/${tagId}`, {
+    const client = mapiClient();
+    const { data } = await client.put(`spaces/${space}/internal_tags/${tagId}`, {
       method: "PUT",
-      headers: {
-        Authorization: token
-      },
       body: JSON.stringify(componentInternalTag)
     });
-    return response.internal_tag;
+    return data.internal_tag;
   } catch (error) {
     handleAPIError("update_component_internal_tag", error, `Failed to update component internal tag ${componentInternalTag.name}`);
   }
 };
-const upsertComponentInternalTag = async (space, tag, token, region) => {
+const upsertComponentInternalTag = async (space, tag) => {
   try {
-    return await pushComponentInternalTag(space, tag, token, region);
+    return await pushComponentInternalTag(space, tag);
   } catch (error) {
     if (error instanceof APIError && error.code === 422) {
       const responseData = error.response?.data;
       if (responseData?.name?.[0] === "has already been taken") {
-        const existingTags = await fetchComponentInternalTags(space, token, region);
+        const existingTags = await fetchComponentInternalTags(space);
         const existingTag = existingTags?.find((t) => t.name === tag.name);
         if (existingTag) {
-          return await updateComponentInternalTag(space, existingTag.id, tag, token, region);
+          return await updateComponentInternalTag(space, existingTag.id, tag);
         }
       }
     }
@@ -1198,16 +1355,18 @@ async function readJsonFile(filePath) {
   }
 }
 const readComponentsFiles = async (options) => {
-  const { from, path, separateFiles = false, suffix } = options;
+  const { from, path, separateFiles = false, suffix, space } = options;
   const resolvedPath = resolvePath(path, `components/${from}`);
   try {
     await readdir(resolvedPath);
   } catch (error) {
-    const message = `No directory found for space "${from}". Please make sure you have pulled the components first by running:
+    const message = `No local components found for space ${chalk.bold(from)}. To push components, you need to pull them first:
 
-  storyblok components pull --space ${from} 
+1. Pull the components from your source space:
+   ${chalk.cyan(`storyblok components pull --space ${from}`)}
 
-`;
+2. Then try pushing again:
+   ${chalk.cyan(`storyblok components push --space ${space} --from ${from}`)}`;
     throw new FileSystemError(
       "file_not_found",
       "read",
@@ -1307,8 +1466,7 @@ componentsCommand.command("pull [componentName]").option("-f, --filename <filena
   const { separateFiles, suffix, filename = "components" } = options;
   const { state, initializeSession } = session();
   await initializeSession();
-  if (!state.isLoggedIn || !state.password || !state.region) {
-    handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+  if (!requireAuthentication(state, verbose)) {
     return;
   }
   if (!space) {
@@ -1316,6 +1474,10 @@ componentsCommand.command("pull [componentName]").option("-f, --filename <filena
     return;
   }
   const { password, region } = state;
+  mapiClient({
+    token: password,
+    region
+  });
   const spinnerGroups = new Spinner({
     verbose: !isVitest
   });
@@ -1330,25 +1492,25 @@ componentsCommand.command("pull [componentName]").option("-f, --filename <filena
   });
   try {
     spinnerGroups.start(`Fetching ${chalk.hex(colorPalette.COMPONENTS)("components groups")}`);
-    const groups = await fetchComponentGroups(space, password, region);
+    const groups = await fetchComponentGroups(space);
     spinnerGroups.succeed(`${chalk.hex(colorPalette.COMPONENTS)("Groups")} - Completed in ${spinnerGroups.elapsedTime.toFixed(2)}ms`);
     spinnerPresets.start(`Fetching ${chalk.hex(colorPalette.COMPONENTS)("components presets")}`);
-    const presets = await fetchComponentPresets(space, password, region);
+    const presets = await fetchComponentPresets(space);
     spinnerPresets.succeed(`${chalk.hex(colorPalette.COMPONENTS)("Presets")} - Completed in ${spinnerPresets.elapsedTime.toFixed(2)}ms`);
     spinnerInternalTags.start(`Fetching ${chalk.hex(colorPalette.COMPONENTS)("components internal tags")}`);
-    const internalTags = await fetchComponentInternalTags(space, password, region);
+    const internalTags = await fetchComponentInternalTags(space);
     spinnerInternalTags.succeed(`${chalk.hex(colorPalette.COMPONENTS)("Tags")} - Completed in ${spinnerInternalTags.elapsedTime.toFixed(2)}ms`);
     let components;
     spinnerComponents.start(`Fetching ${chalk.hex(colorPalette.COMPONENTS)("components")}`);
     if (componentName) {
-      const component = await fetchComponent(space, componentName, password, region);
+      const component = await fetchComponent(space, componentName);
       if (!component) {
         konsola.warn(`No component found with name "${componentName}"`);
         return;
       }
       components = [component];
     } else {
-      components = await fetchComponents(space, password, region);
+      components = await fetchComponents(space);
       if (!components || components.length === 0) {
         konsola.warn(`No components found in the space ${space}`);
         return;
@@ -1387,7 +1549,7 @@ componentsCommand.command("pull [componentName]").option("-f, --filename <filena
   }
 });
 
-function findRelatedResources(components, spaceData) {
+function findRelatedResources(components, spaceData, visitedComponents = /* @__PURE__ */ new Set()) {
   const componentIds = new Set(components.map((c) => c.id));
   const whitelistedComponentNames = /* @__PURE__ */ new Set();
   const componentGroupUuids = /* @__PURE__ */ new Set();
@@ -1472,7 +1634,11 @@ function findRelatedResources(components, spaceData) {
     whitelistedComponents: []
   };
   if (whitelistedComponents.length > 0) {
-    additionalResources = findRelatedResources(whitelistedComponents, spaceData);
+    const newComponents = whitelistedComponents.filter((component) => !visitedComponents.has(component.name));
+    if (newComponents.length > 0) {
+      components.forEach((component) => visitedComponents.add(component.name));
+      additionalResources = findRelatedResources(newComponents, spaceData, visitedComponents);
+    }
   }
   const result = {
     groups: Array.from(/* @__PURE__ */ new Set([...Array.from(relatedGroups), ...additionalResources.groups])),
@@ -1519,7 +1685,7 @@ function filterSpaceDataByComponent(spaceData, componentName) {
     internalTags: relatedResources.internalTags
   };
 }
-async function handleTags(space, password, region, spaceData, skipIds) {
+async function handleTags(space, spaceData, skipIds) {
   const results = {
     successful: [],
     failed: [],
@@ -1532,7 +1698,7 @@ async function handleTags(space, password, region, spaceData, skipIds) {
     });
     consolidatedSpinner.start("Upserting tags...");
     try {
-      const updatedTag = await upsertComponentInternalTag(space, tag, password, region);
+      const updatedTag = await upsertComponentInternalTag(space, tag);
       if (updatedTag) {
         results.idMap.set(tag.id, updatedTag.id);
         results.successful.push(tag.name);
@@ -1545,7 +1711,7 @@ async function handleTags(space, password, region, spaceData, skipIds) {
   }));
   return results;
 }
-async function handleComponentGroups(space, password, region, spaceData, skipUuids) {
+async function handleComponentGroups(space, spaceData, skipUuids) {
   const results = {
     successful: [],
     failed: [],
@@ -1562,7 +1728,7 @@ async function handleComponentGroups(space, password, region, spaceData, skipUui
     });
     spinner.start(`Upserting root group ${group.name}...`);
     try {
-      const updatedGroup = await upsertComponentGroup(space, group, password, region);
+      const updatedGroup = await upsertComponentGroup(space, group);
       if (updatedGroup) {
         results.uuidMap.set(group.uuid, updatedGroup.uuid);
         results.idMap.set(group.id, updatedGroup.id);
@@ -1598,7 +1764,7 @@ async function handleComponentGroups(space, password, region, spaceData, skipUui
           parent_uuid: newParentUuid,
           parent_id: newParentId
         };
-        const updatedGroup = await upsertComponentGroup(space, groupToUpdate, password, region);
+        const updatedGroup = await upsertComponentGroup(space, groupToUpdate);
         if (updatedGroup) {
           results.uuidMap.set(group.uuid, updatedGroup.uuid);
           results.idMap.set(group.id, updatedGroup.id);
@@ -1693,7 +1859,7 @@ function getGroupHierarchy(group, allGroups) {
   }
   return hierarchy;
 }
-async function handleWhitelists(space, password, region, spaceData) {
+async function handleWhitelists(space, spaceData) {
   const results = {
     successful: [],
     failed: [],
@@ -1723,7 +1889,7 @@ async function handleWhitelists(space, password, region, spaceData) {
       verbose: !isVitest
     });
     spinner.start("Processing whitelist tags...");
-    const tagResults = await handleTags(space, password, region, whitelistTags);
+    const tagResults = await handleTags(space, whitelistTags);
     results.successful.push(...tagResults.successful);
     results.failed.push(...tagResults.failed);
     tagResults.idMap.forEach((newId, oldId) => {
@@ -1744,7 +1910,7 @@ async function handleWhitelists(space, password, region, spaceData) {
       verbose: !isVitest
     });
     spinner.start("Processing whitelist groups...");
-    const groupResults = await handleComponentGroups(space, password, region, whitelistGroups);
+    const groupResults = await handleComponentGroups(space, whitelistGroups);
     results.successful.push(...groupResults.successful);
     results.failed.push(...groupResults.failed);
     groupResults.uuidMap.forEach((newUuid, oldUuid) => {
@@ -1766,11 +1932,6 @@ async function handleWhitelists(space, password, region, spaceData) {
         return;
       }
       if (visited.has(componentName)) {
-        failedComponents.add(componentName);
-        results.failed.push({
-          name: componentName,
-          error: new Error(`Circular dependency detected for component ${componentName}`)
-        });
         return;
       }
       visited.add(componentName);
@@ -1834,7 +1995,7 @@ async function handleWhitelists(space, password, region, spaceData) {
             results.componentNameMap
           );
         }
-        const updatedComponent = await upsertComponent(space, componentToUpdate, password, region);
+        const updatedComponent = await upsertComponent(space, componentToUpdate);
         if (updatedComponent) {
           results.successful.push(component.name);
           results.componentNameMap.set(component.name, updatedComponent.name);
@@ -1858,8 +2019,6 @@ async function handleWhitelists(space, password, region, spaceData) {
 async function handleComponents(options) {
   const {
     space,
-    password,
-    region,
     spaceData: { components, internalTags, presets },
     groupsUuidMap,
     tagsIdMaps,
@@ -1938,7 +2097,7 @@ async function handleComponents(options) {
           componentNameMap
         );
       }
-      const updatedComponent = await upsertComponent(space, componentToUpdate, password, region);
+      const updatedComponent = await upsertComponent(space, componentToUpdate);
       if (updatedComponent) {
         results.successful.push(component.name);
         results.componentIdMap.set(component.id, updatedComponent.id);
@@ -1972,7 +2131,7 @@ async function handleComponents(options) {
           tagsIdMaps,
           componentNameMap
         );
-        await upsertComponent(space, componentToUpdate, password, region);
+        await upsertComponent(space, componentToUpdate);
         spinner.succeed(`Component whitelists-> ${chalk.hex(colorPalette.COMPONENTS)(component.name)} - Completed in ${spinner.elapsedTime.toFixed(2)}ms`);
       } catch (error) {
         spinner.failed(`Component whitelists-> ${chalk.hex(colorPalette.COMPONENTS)(component.name)} - Failed`);
@@ -1998,7 +2157,7 @@ async function handleComponents(options) {
             preset: preset.preset,
             component_id: newComponentId
           };
-          await upsertComponentPreset(space, presetToUpdate, password, region);
+          await upsertComponentPreset(space, presetToUpdate);
           presetSpinner.succeed(`Preset-> ${chalk.hex(colorPalette.COMPONENTS)(preset.name)} - Completed in ${presetSpinner.elapsedTime.toFixed(2)}ms`);
         } catch (error) {
           presetSpinner.failed(`Preset-> ${chalk.hex(colorPalette.COMPONENTS)(preset.name)} - Failed`);
@@ -2018,8 +2177,7 @@ componentsCommand.command("push [componentName]").description(`Push your space's
   const { from, filter } = options;
   const { state, initializeSession } = session();
   await initializeSession();
-  if (!state.isLoggedIn || !state.password || !state.region) {
-    handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+  if (!requireAuthentication(state, verbose)) {
     return;
   }
   if (!space) {
@@ -2029,11 +2187,18 @@ componentsCommand.command("push [componentName]").description(`Push your space's
   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.br();
   const { password, region } = state;
+  mapiClient({
+    token: password,
+    region
+  });
   try {
     let spaceData = await readComponentsFiles({
       ...options,
-      path
+      path,
+      space
     });
     if (componentName) {
       spaceData = filterSpaceDataByComponent(spaceData, componentName);
@@ -2057,13 +2222,13 @@ componentsCommand.command("push [componentName]").description(`Push your space's
       successful: [],
       failed: []
     };
-    const whitelistResults = await handleWhitelists(space, password, region, spaceData);
+    const whitelistResults = await handleWhitelists(space, spaceData);
     results.successful.push(...whitelistResults.successful);
     results.failed.push(...whitelistResults.failed);
-    const tagsResults = await handleTags(space, password, region, spaceData.internalTags, whitelistResults.processedTagIds);
+    const tagsResults = await handleTags(space, spaceData.internalTags, whitelistResults.processedTagIds);
     results.successful.push(...tagsResults.successful);
     results.failed.push(...tagsResults.failed);
-    const groupsResults = await handleComponentGroups(space, password, region, spaceData.groups, whitelistResults.processedGroupUuids);
+    const groupsResults = await handleComponentGroups(space, spaceData.groups, whitelistResults.processedGroupUuids);
     results.successful.push(...groupsResults.successful);
     results.failed.push(...groupsResults.failed);
     const remainingComponents = spaceData.components.filter(
@@ -2071,8 +2236,6 @@ componentsCommand.command("push [componentName]").description(`Push your space's
     );
     const componentsResults = await handleComponents({
       space,
-      password,
-      region,
       spaceData: {
         ...spaceData,
         components: remainingComponents
@@ -2138,20 +2301,20 @@ languagesCommand.command("pull").description(`Download your space's languages sc
   const { filename = "languages", suffix = options.space } = options;
   const { state, initializeSession } = session();
   await initializeSession();
-  if (!state.isLoggedIn || !state.password || !state.region) {
-    handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+  if (!requireAuthentication(state, verbose)) {
     return;
   }
   if (!space) {
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
+  const { password, region } = state;
   const spinner = new Spinner({
     verbose: !isVitest
   });
   try {
     spinner.start(`Fetching ${chalk.hex(colorPalette.LANGUAGES)("languages")}`);
-    const internationalization = await fetchLanguages(space, state.password, state.region);
+    const internationalization = await fetchLanguages(space, password, region);
     if (!internationalization || internationalization.languages?.length === 0) {
       spinner.failed();
       konsola.warn(`No languages found in the space ${space}`, true);
@@ -2215,8 +2378,7 @@ migrationsCommand.command("generate [componentName]").description("Generate a mi
   }
   const { state, initializeSession } = session();
   await initializeSession();
-  if (!state.isLoggedIn || !state.password || !state.region) {
-    handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+  if (!requireAuthentication(state, verbose)) {
     return;
   }
   if (!space) {
@@ -2224,11 +2386,15 @@ migrationsCommand.command("generate [componentName]").description("Generate a mi
     return;
   }
   const { password, region } = state;
+  mapiClient({
+    token: password,
+    region
+  });
   const spinner = new Spinner({
     verbose: !isVitest
   }).start(`Generating migration for component ${componentName}...`);
   try {
-    const component = await fetchComponent(space, componentName, password, region);
+    const component = await fetchComponent(space, componentName);
     if (!component) {
       spinner.failed(`Failed to fetch component ${componentName}. Make sure the component exists in your space.`);
       handleError(new CommandError(`No component found with name "${componentName}"`), verbose);
@@ -2248,16 +2414,28 @@ migrationsCommand.command("generate [componentName]").description("Generate a mi
 const fetchStories = async (space, token, region, params) => {
   try {
     const url = getStoryblokUrl(region);
-    const { filter_query, ...restParams } = params || {};
-    const regularParams = new URLSearchParams(objectToStringParams(restParams)).toString();
-    const queryString = filter_query ? `${regularParams ? `${regularParams}&` : ""}${filter_query}` : regularParams;
-    const endpoint = `${url}/spaces/${space}/stories${queryString ? `?${queryString}` : ""}`;
-    const response = await customFetch(endpoint, {
-      headers: {
-        Authorization: token
-      }
-    });
-    return response.stories;
+    const allStories = [];
+    let currentPage = 1;
+    let hasMorePages = true;
+    while (hasMorePages) {
+      const { filter_query, ...restParams } = params || {};
+      const regularParams = new URLSearchParams({
+        ...objectToStringParams({ ...restParams, per_page: 100 }),
+        ...currentPage > 1 && { page: currentPage.toString() }
+      }).toString();
+      const queryString = filter_query ? `${regularParams ? `${regularParams}&` : ""}${filter_query}` : regularParams;
+      const endpoint = `${url}/spaces/${space}/stories${queryString ? `?${queryString}` : ""}`;
+      const response = await customFetch(endpoint, {
+        headers: {
+          Authorization: token
+        }
+      });
+      allStories.push(...response.stories);
+      const totalPages = Math.ceil(response.total / response.perPage);
+      hasMorePages = currentPage < totalPages;
+      currentPage++;
+    }
+    return allStories;
   } catch (error) {
     handleAPIError("pull_stories", error);
   }
@@ -2615,8 +2793,7 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
   const { space, path } = migrationsCommand.opts();
   const { state, initializeSession } = session();
   await initializeSession();
-  if (!state.isLoggedIn || !state.password || !state.region) {
-    handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+  if (!requireAuthentication(state, verbose)) {
     return;
   }
   if (!space) {
@@ -2772,8 +2949,7 @@ migrationsCommand.command("rollback [migrationFile]").description("Rollback a mi
   const { space, path } = migrationsCommand.opts();
   const { state, initializeSession } = session();
   await initializeSession();
-  if (!state.isLoggedIn || !state.password || !state.region) {
-    handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+  if (!requireAuthentication(state, verbose)) {
     return;
   }
   if (!space) {
@@ -3386,7 +3562,7 @@ const loadCustomFieldsParser = async (path) => {
     return customFieldsParser.default;
   } catch (error) {
     handleError(error);
-    return null;
+    return void 0;
   }
 };
 async function loadCompilerOptions(path) {
@@ -3427,6 +3603,9 @@ const generateTypes = async (spaceData, options = {
           if (property.type && Array.from(storyblokSchemas.keys()).includes(property.type)) {
             storyblokPropertyTypes.add(property.type);
           }
+          if (property.tsType && property.tsType.includes(STORY_TYPE)) {
+            storyblokPropertyTypes.add(STORY_TYPE);
+          }
         });
       }
       const componentSchema = {
@@ -3456,6 +3635,11 @@ const generateTypes = async (spaceData, options = {
       });
     }));
     const imports = [];
+    const needsISbStoryData = storyblokPropertyTypes.has(STORY_TYPE);
+    if (needsISbStoryData) {
+      imports.push(`import type { ${STORY_TYPE} } from '@storyblok/js';`);
+      storyblokPropertyTypes.delete(STORY_TYPE);
+    }
     if (storyblokPropertyTypes.size > 0) {
       const typeImports = Array.from(storyblokPropertyTypes).map((type) => {
         const pascalType = toPascalCase(type);
@@ -3488,6 +3672,7 @@ const generateStoryblokTypes = async (options = {}) => {
     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");
@@ -3506,8 +3691,7 @@ typesCommand.command("generate").description("Generate types d.ts for your compo
   const { space, path } = typesCommand.opts();
   const { state, initializeSession } = session();
   await initializeSession();
-  if (!state.isLoggedIn || !state.password || !state.region) {
-    handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+  if (!requireAuthentication(state, verbose)) {
     return;
   }
   if (!space) {
@@ -3542,7 +3726,7 @@ typesCommand.command("generate").description("Generate types d.ts for your compo
   }
 });
 
-const version = "4.0.0-beta.3";
+const version = "4.0.0-beta.5";
 const pkg = {
 	version: version};