storyblok 4.8.0 → 4.9.0

package/dist/index.mjs

@@ -1952,7 +1952,7 @@ function buildDependencyGraph(context) {
     graph.nodes.set(nodeId, node);
   });
   spaceState.local.groups.forEach((group) => {
-    if (group.parent_uuid) {
+    if (group.parent_uuid && group.parent_id && group.parent_uuid !== group.uuid) {
       const childId = `group:${group.uuid}`;
       const parentId = `group:${group.parent_uuid}`;
       addDependency(childId, parentId);
@@ -2852,7 +2852,8 @@ componentsCommand.command("push [componentName]").description(`Push your space's
   konsola.title(`${commands.COMPONENTS}`, colorPalette.COMPONENTS, componentName ? `Pushing component ${componentName}...` : "Pushing components...");
   const verbose = program$a.opts().verbose;
   const { space, path } = componentsCommand.opts();
-  const { from, filter } = options;
+  const { filter } = options;
+  const fromSpace = options.from || space;
   const { state, initializeSession } = session();
   await initializeSession();
   if (!requireAuthentication(state, verbose)) {
@@ -2862,10 +2863,7 @@ componentsCommand.command("push [componentName]").description(`Push your space's
     handleError(new CommandError(`Please provide the target space as argument --space TARGET_SPACE_ID.`), verbose);
     return;
   }
-  if (!from) {
-    options.from = space;
-  }
-  konsola.info(`Attempting to push components ${chalk.bold("from")} space ${chalk.hex(colorPalette.COMPONENTS)(options.from)} ${chalk.bold("to")} ${chalk.hex(colorPalette.COMPONENTS)(space)}`);
+  konsola.info(`Attempting to push components ${chalk.bold("from")} space ${chalk.hex(colorPalette.COMPONENTS)(fromSpace)} ${chalk.bold("to")} ${chalk.hex(colorPalette.COMPONENTS)(space)}`);
   konsola.br();
   const { password, region } = state;
   let requestCount = 0;
@@ -2883,7 +2881,7 @@ componentsCommand.command("push [componentName]").description(`Push your space's
     const componentsData = await readComponentsFiles({
       ...options,
       path,
-      space
+      from: fromSpace
     });
     const localData = {
       ...componentsData,
@@ -4869,7 +4867,7 @@ const upsertDatasourceEntry = async (space, datasourceId, entry, existingId) =>
   }
 };
 const readDatasourcesFiles = async (options) => {
-  const { from, path, separateFiles = false, suffix, space } = options;
+  const { from, path, separateFiles = false, suffix } = options;
   const resolvedPath = resolvePath(path, `datasources/${from}`);
   try {
     await readdir(resolvedPath);
@@ -4880,7 +4878,7 @@ const readDatasourcesFiles = async (options) => {
    ${chalk.cyan(`storyblok datasources pull --space ${from}`)}
 
 2. Then try pushing again:
-   ${chalk.cyan(`storyblok datasources push --space ${space} --from ${from}`)}`;
+   ${chalk.cyan(`storyblok datasources push --space <target_space> --from ${from}`)}`;
     throw new FileSystemError(
       "file_not_found",
       "read",
@@ -5180,7 +5178,8 @@ datasourcesCommand.command("push [datasourceName]").description(`Push your space
   konsola.title(`${commands.DATASOURCES}`, colorPalette.DATASOURCES, datasourceName ? `Pushing datasource ${datasourceName}...` : "Pushing datasources...");
   const verbose = program$3.opts().verbose;
   const { space, path } = datasourcesCommand.opts();
-  const { from, filter } = options;
+  const { filter } = options;
+  const fromSpace = options.from || space;
   const { state, initializeSession } = session();
   await initializeSession();
   if (!requireAuthentication(state, verbose)) {
@@ -5190,10 +5189,7 @@ datasourcesCommand.command("push [datasourceName]").description(`Push your space
     handleError(new CommandError(`Please provide the target space as argument --space TARGET_SPACE_ID.`), verbose);
     return;
   }
-  if (!from) {
-    options.from = space;
-  }
-  konsola.info(`Attempting to push datasources ${chalk.bold("from")} space ${chalk.hex(colorPalette.DATASOURCES)(options.from || space)} ${chalk.bold("to")} ${chalk.hex(colorPalette.DATASOURCES)(space)}`);
+  konsola.info(`Attempting to push datasources ${chalk.bold("from")} space ${chalk.hex(colorPalette.DATASOURCES)(fromSpace)} ${chalk.bold("to")} ${chalk.hex(colorPalette.DATASOURCES)(space)}`);
   konsola.br();
   const { password, region } = state;
   mapiClient({
@@ -5207,7 +5203,7 @@ datasourcesCommand.command("push [datasourceName]").description(`Push your space
       local: await readDatasourcesFiles({
         ...options,
         path,
-        space
+        from: fromSpace
       }),
       target: {
         datasources: /* @__PURE__ */ new Map()
@@ -5495,11 +5491,33 @@ const fetchBlueprintRepositories = async () => {
   }
 };
 
+function showNextSteps(technologyTemplate, finalProjectPath) {
+  konsola.br();
+  konsola.ok(`Your ${chalk.hex(colorPalette.PRIMARY)(technologyTemplate)} project is ready \u{1F389} !`);
+  konsola.br();
+  konsola.info(`Next steps:
+  cd ${finalProjectPath}
+  npm install
+  npm run dev
+        `);
+  konsola.info(`Or check the dedicated guide at: ${chalk.hex(colorPalette.PRIMARY)(`https://www.storyblok.com/docs/guides/${technologyTemplate}`)}`);
+}
+async function handleEnvFileCreation(resolvedPath, token) {
+  try {
+    await createEnvFile(resolvedPath, token);
+    konsola.ok(`Created .env file with Storyblok access token`, true);
+    return true;
+  } catch (error) {
+    konsola.warn(`Failed to create .env file: ${error.message}`);
+    konsola.info(`You can manually add this token to your .env file: ${token}`);
+    return false;
+  }
+}
 const program$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) => {
+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").option("--token <token>", "Storyblok access token (skip space creation and use this token)").action(async (projectPath, options) => {
   konsola.title(`${commands.CREATE}`, colorPalette.CREATE);
   const verbose = program$2.opts().verbose;
-  const { template, blueprint } = options;
+  const { template, blueprint, token } = options;
   let selectedTemplate = template;
   if (blueprint && !template) {
     konsola.warn(`The --blueprint flag is deprecated. Please use --template instead.`);
@@ -5525,18 +5543,6 @@ program$2.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
   const spinnerSpace = new Spinner({
     verbose: !isVitest
   });
-  let userData;
-  try {
-    const user = await getUser(password, region);
-    if (!user) {
-      throw new Error("User data is undefined");
-    }
-    userData = user;
-  } catch (error) {
-    konsola.error("Failed to fetch user info. Please login again.", error);
-    konsola.br();
-    return;
-  }
   try {
     spinnerBlueprints.start("Fetching starter templates...");
     const templates = await fetchBlueprintRepositories();
@@ -5592,91 +5598,96 @@ program$2.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
     await generateProject(technologyTemplate, projectName, targetDirectory);
     konsola.ok(`Project ${chalk.hex(colorPalette.PRIMARY)(projectName)} created successfully in ${chalk.hex(colorPalette.PRIMARY)(finalProjectPath)}`, true);
     let createdSpace;
-    const choices = [
-      { name: "My personal account", value: "personal" }
-    ];
-    if (userData.has_org) {
-      choices.push({ name: `Organization (${userData?.org?.name})`, value: "org" });
-    }
-    if (userData.has_partner) {
-      choices.push({ name: "Partner Portal", value: "partner" });
-    }
+    let userData;
     let whereToCreateSpace = "personal";
-    if (region === "eu" && (userData.has_partner || userData.has_org)) {
-      whereToCreateSpace = await select({
-        message: `Where would you like to create this space?`,
-        choices
-      });
-    }
-    if (region !== "eu" && userData.has_org) {
-      whereToCreateSpace = "org";
+    if (token) {
+      await handleEnvFileCreation(resolvedPath, token);
+      showNextSteps(technologyTemplate, finalProjectPath);
+      return;
     }
-    if (region !== "eu" && !userData.has_org) {
-      konsola.warn(`Space creation in this region is limited to Enterprise accounts. If you're part of an organization, please ensure you have the required permissions. For more information about Enterprise access, contact our Sales Team.`);
-      konsola.br();
+    if (options.skipSpace) {
+      showNextSteps(technologyTemplate, finalProjectPath);
       return;
     }
-    if (!options.skipSpace) {
+    try {
       try {
-        spinnerSpace.start(`Creating space "${toHumanReadable(projectName)}"`);
-        const selectedBlueprint = templates.find((bp) => bp.value === technologyTemplate);
-        const blueprintDomain = selectedBlueprint?.location || "https://localhost:3000/";
-        const spaceToCreate = {
-          name: toHumanReadable(projectName),
-          domain: blueprintDomain
-        };
-        if (whereToCreateSpace === "org") {
-          spaceToCreate.org = userData.org;
-          spaceToCreate.in_org = true;
-        } else if (whereToCreateSpace === "partner") {
-          spaceToCreate.assign_partner = true;
+        const user = await getUser(password, region);
+        if (!user) {
+          throw new Error("User data is undefined");
         }
-        createdSpace = await createSpace(spaceToCreate);
-        spinnerSpace.succeed(`Space "${chalk.hex(colorPalette.PRIMARY)(toHumanReadable(projectName))}" created successfully`);
+        userData = user;
       } catch (error) {
-        spinnerSpace.failed();
+        konsola.error("Failed to fetch user info. Please login again.", error);
         konsola.br();
-        handleError(error, verbose);
         return;
       }
-    }
-    if (createdSpace?.first_token) {
-      try {
-        await createEnvFile(resolvedPath, createdSpace.first_token);
-        konsola.ok(`Created .env file with Storyblok access token`, true);
-      } catch (error) {
-        konsola.warn(`Failed to create .env file: ${error.message}`);
-        konsola.info(`You can manually add this token to your .env file: ${createdSpace.first_token}`);
+      const choices = [
+        { name: "My personal account", value: "personal" }
+      ];
+      if (userData.has_org) {
+        choices.push({ name: `Organization (${userData?.org?.name})`, value: "org" });
       }
-    }
-    if (createdSpace?.id) {
-      try {
-        await openSpaceInBrowser(createdSpace.id, region);
-        konsola.info(`Opened space in your browser`);
-      } catch (error) {
-        konsola.warn(`Failed to open browser: ${error.message}`);
-        const spaceUrl = generateSpaceUrl(createdSpace.id, region);
-        konsola.info(`You can manually open your space at: ${chalk.hex(colorPalette.PRIMARY)(spaceUrl)}`);
+      if (userData.has_partner) {
+        choices.push({ name: "Partner Portal", value: "partner" });
       }
-    }
-    konsola.br();
-    konsola.ok(`Your ${chalk.hex(colorPalette.PRIMARY)(technologyTemplate)} project is ready \u{1F389} !`);
-    if (createdSpace?.first_token) {
+      if (region === regions.EU && (userData.has_partner || userData.has_org)) {
+        whereToCreateSpace = await select({
+          message: `Where would you like to create this space?`,
+          choices
+        });
+      }
+      if (region !== regions.EU && userData.has_org) {
+        whereToCreateSpace = "org";
+      }
+      if (region !== regions.EU && !userData.has_org) {
+        konsola.warn(`Space creation in this region is limited to Enterprise accounts. If you're part of an organization, please ensure you have the required permissions. For more information about Enterprise access, contact our Sales Team.`);
+        konsola.br();
+        return;
+      }
+      spinnerSpace.start(`Creating space "${toHumanReadable(projectName)}"`);
+      const selectedBlueprint = templates.find((bp) => bp.value === technologyTemplate);
+      const blueprintDomain = selectedBlueprint?.location || "https://localhost:3000/";
+      const spaceToCreate = {
+        name: toHumanReadable(projectName),
+        domain: blueprintDomain
+      };
       if (whereToCreateSpace === "org") {
-        konsola.ok(`Storyblok space created in organization ${chalk.hex(colorPalette.PRIMARY)(userData?.org?.name)}, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
+        spaceToCreate.org = userData.org;
+        spaceToCreate.in_org = true;
       } else if (whereToCreateSpace === "partner") {
-        konsola.ok(`Storyblok space created in partner portal, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
-      } else {
-        konsola.ok(`Storyblok space created, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
+        spaceToCreate.assign_partner = true;
       }
+      createdSpace = await createSpace(spaceToCreate);
+      spinnerSpace.succeed(`Space "${chalk.hex(colorPalette.PRIMARY)(toHumanReadable(projectName))}" created successfully`);
+      if (createdSpace?.first_token) {
+        await handleEnvFileCreation(resolvedPath, createdSpace.first_token);
+      }
+      if (createdSpace?.id) {
+        try {
+          await openSpaceInBrowser(createdSpace.id, region);
+          konsola.info(`Opened space in your browser`);
+        } catch (error) {
+          konsola.warn(`Failed to open browser: ${error.message}`);
+          const spaceUrl = generateSpaceUrl(createdSpace.id, region);
+          konsola.info(`You can manually open your space at: ${chalk.hex(colorPalette.PRIMARY)(spaceUrl)}`);
+        }
+      }
+      showNextSteps(technologyTemplate, finalProjectPath);
+      if (createdSpace?.first_token) {
+        if (whereToCreateSpace === "org") {
+          konsola.ok(`Storyblok space created in organization ${chalk.hex(colorPalette.PRIMARY)(userData?.org?.name)}, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
+        } else if (whereToCreateSpace === "partner") {
+          konsola.ok(`Storyblok space created in partner portal, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
+        } else {
+          konsola.ok(`Storyblok space created, preview url and .env configured automatically. You can now open your space in the browser at ${chalk.hex(colorPalette.PRIMARY)(generateSpaceUrl(createdSpace.id, region))}`);
+        }
+      }
+    } catch (error) {
+      spinnerSpace.failed();
+      konsola.br();
+      handleError(error, verbose);
+      return;
     }
-    konsola.br();
-    konsola.info(`Next steps:
-  cd ${finalProjectPath}
-  npm install
-  npm run dev
-        `);
-    konsola.info(`Or check the dedicated guide at: ${chalk.hex(colorPalette.PRIMARY)(`https://www.storyblok.com/docs/guides/${technologyTemplate}`)}`);
   } catch (error) {
     spinnerSpace.failed();
     spinnerBlueprints.failed();
@@ -5710,7 +5721,7 @@ logsCommand.command("prune").description("Prune logs").option("--keep <number>",
   ui.info(`Deleted ${deletedFilesCount} log file${deletedFilesCount === 1 ? "" : "s"}`);
 });
 
-const version = "4.8.0";
+const version = "4.9.0";
 const pkg = {
 	version: version};