storyblok 3.32.3 → 3.33.1

package/dist/cli.mjs

@@ -1888,7 +1888,7 @@ const pullComponents = async (api, options) => {
       return;
     }
     const file = `components.${fileName}.json`;
-    const data = JSON.stringify({ components }, null, 2);
+    const data = JSON.stringify({ components, component_groups: componentGroups }, null, 2);
     console.log(`${chalk.green("\u2713")} We've saved your components in the file: ${file}`);
     saveFileFactory(file, data, path);
     if (presets.length === 0)
@@ -1929,6 +1929,7 @@ const pullLanguages = async (api, options) => {
 
 const { isEmpty: isEmpty$3 } = lodash;
 const isUrl$1 = (source) => source.indexOf("http") === 0;
+const listOfGroups = [];
 const getGroupByName = (groups, name) => {
   return groups.find((group) => group.name === name) || {};
 };
@@ -1972,41 +1973,62 @@ const pushComponents = async (api, { source, presetsSource }) => {
     const components = createContentList$1(rawComponents, "components");
     const rawPresets = await getDataFromPath$1(presetsSource);
     const presets = createContentList$1(rawPresets, "presets");
-    return push(api, components, presets);
+    const componentGroups = createContentList$1(rawComponents, "component_groups");
+    return push(api, components, componentGroups, presets);
   } catch (err) {
     console.error(`${chalk.red("X")} Can not push invalid json - please provide a valid json file`);
     return Promise.reject(new Error("Can not push invalid json - please provide a valid json file"));
   }
 };
-const push = async (api, components, presets = []) => {
-  const presetsLib = new PresetsLib({ oauthToken: api.accessToken, targetSpaceId: api.spaceId });
+const buildComponentsGroupsTree = (groups) => {
+  const map = /* @__PURE__ */ new Map();
+  const roots = [];
+  groups.forEach((component) => {
+    map.set(component.id, { ...component, children: [] });
+  });
+  groups.forEach((component) => {
+    if (component.parent_id === null) {
+      roots.push(map.get(component.id));
+    } else {
+      const parent = map.get(component.parent_id);
+      if (parent) {
+        parent.children.push(map.get(component.id));
+      }
+    }
+  });
+  return roots;
+};
+const pushComponentsGroups = async (api, group) => {
+  const groupName = group.name;
   try {
-    const componentsGroups = await api.getComponentGroups();
-    for (let i = 0; i < components.length; i++) {
-      const groupName = components[i].component_group_name;
-      if (components[i].component_group_name) {
-        const currentGroup = getGroupByName(componentsGroups, groupName);
-        if (!currentGroup.name) {
-          try {
-            console.log(`${chalk.blue("-")} Creating the ${groupName} component group...`);
-            const newGroup = await api.post("component_groups", {
-              component_group: {
-                name: groupName
-              }
-            });
-            componentsGroups.push({
-              ...newGroup.data.component_group,
-              source_uuid: components[i].component_group_uuid
-            });
-          } catch (err) {
-            console.log(
-              `${chalk.yellow("-")} Components group ${groupName} already exists...`
-            );
-          }
-        } else {
-          currentGroup.source_uuid = components[i].component_group_uuid;
-        }
+    console.log(`${chalk.blue("-")} Creating the ${groupName} component group...`);
+    const newGroup = await api.post("component_groups", {
+      component_group: {
+        name: groupName,
+        parent_id: group.parent_id
       }
+    });
+    listOfGroups.push(newGroup.data.component_group);
+    for (const child of group.children) {
+      const children = {
+        ...child,
+        parent_id: newGroup.data.component_group.id
+      };
+      await pushComponentsGroups(api, children);
+    }
+  } catch (err) {
+    console.log(err);
+    console.log(
+      `${chalk.yellow("-")} Components group ${groupName} already exists...`
+    );
+  }
+};
+const push = async (api, components, componentsGroups = [], presets = []) => {
+  const presetsLib = new PresetsLib({ oauthToken: api.accessToken, targetSpaceId: api.spaceId });
+  try {
+    const componentGroupsTree = buildComponentsGroupsTree(componentsGroups);
+    for (const rootComponent of componentGroupsTree) {
+      await pushComponentsGroups(api, rootComponent);
     }
     const apiComponents = await api.getComponents();
     for (let i = 0; i < components.length; i++) {
@@ -2015,7 +2037,7 @@ const push = async (api, components, presets = []) => {
       delete components[i].id;
       delete components[i].created_at;
       const groupName = components[i].component_group_name;
-      const groupData = getGroupByName(componentsGroups, groupName);
+      const groupData = getGroupByName(listOfGroups, groupName);
       if (groupName) {
         components[i].component_group_uuid = groupData.uuid;
         delete components[i].component_group_name;
@@ -2025,7 +2047,7 @@ const push = async (api, components, presets = []) => {
         Object.keys(schema).forEach((field) => {
           if (schema[field].component_group_whitelist) {
             schema[field].component_group_whitelist = schema[field].component_group_whitelist.map(
-              (uuid) => getGroupByUuid(componentsGroups, uuid) ? getGroupByUuid(componentsGroups, uuid).uuid : uuid
+              (uuid) => getGroupByUuid(listOfGroups, uuid) ? getGroupByUuid(listOfGroups, uuid).uuid : uuid
             );
           }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storyblok",
-  "version": "3.32.3",
+  "version": "3.33.1",
   "description": "A simple CLI to start Storyblok from your command line.",
   "repository": {
     "type": "git",
@@ -50,7 +50,7 @@
     "p-series": "^2.1.0",
     "path": "^0.12.7",
     "simple-uuid": "^0.0.1",
-    "storyblok-js-client": "^6.7.1",
+    "storyblok-js-client": "^6.9.1",
     "update-notifier": "^5.1.0",
     "xml-js": "^1.6.11"
   },