storyblok 4.0.0-beta.3 → 4.0.0-beta.4

package/dist/index.mjs

@@ -107,7 +107,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 +319,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 +349,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");
@@ -1198,16 +1209,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",
@@ -1387,7 +1400,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 +1485,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])),
@@ -1766,11 +1783,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);
@@ -2029,11 +2041,14 @@ 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;
   try {
     let spaceData = await readComponentsFiles({
       ...options,
-      path
+      path,
+      space
     });
     if (componentName) {
       spaceData = filterSpaceDataByComponent(spaceData, componentName);
@@ -2248,16 +2263,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);
   }
@@ -3488,6 +3515,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");
@@ -3542,7 +3570,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.4";
 const pkg = {
 	version: version};
 
@@ -3559,6 +3587,19 @@ program.on("command:*", () => {
   konsola.br();
   program.help();
 });
+program.command("test").description("Test the CLI").action(async () => {
+  const { state, initializeSession } = session();
+  await initializeSession();
+  const { password, region } = state;
+  try {
+    const result = await fetchStories("85047", password, region, {
+      per_page: 100
+    });
+    console.log(result?.length);
+  } catch (error) {
+    console.error(error);
+  }
+});
 try {
   program.parse(process.argv);
 } catch (error) {