sb-mig 5.0.8-beta.2 → 5.0.8-beta.4

package/dist/api/data-migration/component-data-migration.js

@@ -239,7 +239,7 @@ export const migrateProvidedComponentsDataInStories = async ({ itemType, migrati
         // Get all stories to be migrated from storyblok space
         let itemsToMigrate = [];
         if (itemType === "story") {
-            itemsToMigrate = await managementApi.stories.getAllStories({
+            itemsToMigrate = await managementApi.stories.getAllStories({}, {
                 ...config,
                 spaceId: from,
             });

package/dist/api/managementApi.d.ts

@@ -60,6 +60,7 @@ export declare const managementApi: {
         updateStories: import("./stories/stories.types.js").UpdateStories;
         getAllStories: import("./stories/stories.types.js").GetAllStories;
         removeAllStories: import("./stories/stories.types.js").RemoveAllStories;
+        upsertStory: import("./stories/stories.types.js").UpsertStory;
         backupStories: import("./stories/stories.types.js").BackupStories;
     };
     spaces: {

package/dist/api/migrate.js

@@ -207,7 +207,7 @@ export const syncContent = async ({ type, transmission, syncDirection, filename
             }, config);
         }
         if (syncDirection === "fromSpaceToSpace") {
-            const stories = await getAllStories({
+            const stories = await getAllStories({}, {
                 ...config,
                 spaceId: transmission.from,
                 sbApi: config.sbApi,

package/dist/api/spaces/spaces.types.d.ts

@@ -14,10 +14,10 @@ export interface Space {
     created_at: string;
 }
 export type GetSpace = (args: {
-    spaceId: number;
+    spaceId: string;
 }, config: RequestBaseConfig) => Promise<any>;
 export type GetAllSpaces = (config: RequestBaseConfig) => Promise<Space[]>;
 export type UpdateSpace = (args: {
-    spaceId: number;
+    spaceId: string;
     params: any;
 }, config: RequestBaseConfig) => Promise<any>;

package/dist/api/stories/backup.js

@@ -3,7 +3,7 @@ import Logger from "../../utils/logger.js";
 import { getAllStories } from "./stories.js";
 export const backupStories = async ({ suffix, spaceId, filename }, config) => {
     Logger.log(`Making backup of your stories.`);
-    await getAllStories({ ...config, spaceId })
+    await getAllStories({}, { ...config, spaceId })
         .then(async (res) => {
         await createAndSaveToFile({
             ext: "json",

package/dist/api/stories/index.d.ts

@@ -1,2 +1,2 @@
-export { createStory, updateStory, getStoryById, removeStory, getStoryBySlug, updateStories, getAllStories, removeAllStories, } from "./stories.js";
+export { createStory, updateStory, getStoryById, removeStory, getStoryBySlug, updateStories, getAllStories, removeAllStories, upsertStory, } from "./stories.js";
 export { backupStories } from "./backup.js";

package/dist/api/stories/index.js

@@ -1,2 +1,2 @@
-export { createStory, updateStory, getStoryById, removeStory, getStoryBySlug, updateStories, getAllStories, removeAllStories, } from "./stories.js";
+export { createStory, updateStory, getStoryById, removeStory, getStoryBySlug, updateStories, getAllStories, removeAllStories, upsertStory, } from "./stories.js";
 export { backupStories } from "./backup.js";

package/dist/api/stories/stories.d.ts

@@ -1,5 +1,4 @@
-import type { GetAllStories, GetStoryById, RemoveStory, CreateStory, UpdateStory, UpdateStories, RemoveAllStories } from "./stories.types.js";
-import type { GetStoryBySlug } from "./stories.types.js";
+import type { GetAllStories, GetStoryById, RemoveStory, CreateStory, UpdateStory, UpdateStories, RemoveAllStories, UpsertStory, DeepUpsertStory, GetStoryBySlug } from "./stories.types.js";
 export declare const removeStory: RemoveStory;
 export declare const removeAllStories: RemoveAllStories;
 export declare const getAllStories: GetAllStories;
@@ -8,3 +7,5 @@ export declare const getStoryBySlug: GetStoryBySlug;
 export declare const createStory: CreateStory;
 export declare const updateStory: UpdateStory;
 export declare const updateStories: UpdateStories;
+export declare const upsertStory: UpsertStory;
+export declare const deepUpsertStory: DeepUpsertStory;

package/dist/api/stories/stories.js

@@ -1,6 +1,15 @@
 import chalk from "chalk";
 import Logger from "../../utils/logger.js";
+import { managementApi } from "../managementApi.js";
 import { getAllItemsWithPagination } from "../utils/request.js";
+const notNullish = (params) => {
+    return Object.keys(params).reduce((acc, key) => {
+        if (params[key] !== null && params[key] !== undefined) {
+            acc[key] = params[key];
+        }
+        return acc;
+    }, {});
+};
 export const removeStory = (args, config) => {
     const { storyId } = args;
     const { spaceId, sbApi } = config;
@@ -18,7 +27,7 @@ export const removeStory = (args, config) => {
 export const removeAllStories = async (config) => {
     const { spaceId } = config;
     Logger.warning(`Trying to remove all stories from space with spaceId: ${spaceId}`);
-    const stories = await getAllStories(config);
+    const stories = await getAllStories({}, config);
     const onlyRootStories = (story) => story.story.parent_id === 0 || story.story.parent_id === null;
     const allResponses = Promise.all(stories
         .filter(onlyRootStories)
@@ -26,11 +35,20 @@ export const removeAllStories = async (config) => {
     return allResponses;
 };
 // GET
-export const getAllStories = async (config) => {
+export const getAllStories = async (args, config) => {
+    const { options } = args;
     const { spaceId, sbApi } = config;
     Logger.log(`Trying to get all Stories from: ${spaceId}`);
+    const params = notNullish({
+        with_slug: options?.with_slug,
+        starts_with: options?.starts_with,
+        language: options?.language,
+    });
+    console.log("These are params i will use: ");
+    console.log(params);
     const allStoriesWithoutContent = await getAllItemsWithPagination({
         apiFn: ({ per_page, page }) => sbApi.get(`spaces/${spaceId}/stories/`, {
+            ...params,
             per_page,
             page,
         }),
@@ -98,10 +116,13 @@ export const updateStory = (content, storyId, options, config) => {
     const { spaceId, sbApi } = config;
     Logger.warning("Trying to update Story...");
     Logger.log(`Updating story with name: ${content.name} in space: ${spaceId}`);
+    console.log("THis is content to update: ");
+    console.log(JSON.stringify(content, null, 2));
     return sbApi
         .put(`spaces/${spaceId}/stories/${storyId}`, {
         story: content,
         publish: options.publish ? 1 : 0,
+        force_update: options.force_update ? 1 : 0,
     })
         .then((res) => {
         console.log(`${chalk.green(res.data.story.full_slug)} updated.`);
@@ -117,3 +138,69 @@ export const updateStories = (args, config) => {
         return updateStory(stories.story, stories.story.id, { publish: options.publish }, { ...config, spaceId });
     }));
 };
+export const upsertStory = async (args, config) => {
+    console.log("Modifying story... in space with id:");
+    console.log(config.spaceId);
+    const { storyId, storySlug, content } = args;
+    console.log("This are args passed: ");
+    console.log(args);
+    if (storyId) {
+        // if this exist than we update story with this id
+        console.log("You've selected storyid!");
+    }
+    else if (storySlug) {
+        // if this exist than we update story with this slug (probably when we try to add story from one space to another,
+        console.log("You've selected slug!");
+        const foundStory = await managementApi.stories.getStoryBySlug(storySlug, config);
+        console.log("This is story");
+        console.log(foundStory);
+        if (foundStory) {
+            // then update the story
+        }
+        else {
+            const { story: { parent_id, id, parent, ...rest }, } = content;
+            console.log("We are going to create story");
+            const response = await managementApi.stories.createStory(rest, config);
+            console.log("This is response");
+            console.log(response);
+        }
+    }
+    else {
+        // if this exist than we create new story
+        console.log("Nothing passed, creating story...");
+    }
+};
+export const deepUpsertStory = async (args, config) => {
+    console.log("Modifying story... in space with id:");
+    console.log(config.spaceId);
+    const { storyId, storySlug, content } = args;
+    console.log("This are args passed: ");
+    console.log(args);
+    if (storyId) {
+        // if this exist than we update story with this id
+        console.log("You've selected storyid!");
+    }
+    else if (storySlug) {
+        // if this exist than we update story with this slug (probably when we try to add story from one space to another,
+        console.log("You've selected slug!");
+        const slugs = storySlug.split("/");
+        console.log("Slugs for which we need to check for existence of stories");
+        console.log(slugs);
+        // const foundStory = await managementApi.stories.getStoryBySlug(storySlug, config)
+        // console.log("This is story")
+        // console.log(foundStory)
+        // if(foundStory) {
+        //     // then update the story
+        // } else {
+        //     const {story: {parent_id, id, parent,...rest}} = content
+        //     console.log("We are going to create story")
+        //     const response = await managementApi.stories.createStory(rest, config)
+        //     console.log("This is response")
+        //     console.log(response)
+        // }
+    }
+    else {
+        // if this exist than we create new story
+        console.log("Nothing passed, creating story...");
+    }
+};

package/dist/api/stories/stories.types.d.ts

@@ -1,24 +1,41 @@
 import type { RequestBaseConfig } from "../utils/request.js";
+import type { ISbStoriesParams } from "storyblok-js-client";
+export interface ExtendedISbStoriesParams extends ISbStoriesParams {
+    with_slug?: string;
+}
+interface ModifyStoryOptions {
+    publish?: boolean;
+    force_update?: boolean;
+}
 export type RemoveStory = (args: {
     storyId: string;
 }, config: RequestBaseConfig) => Promise<any>;
 export type RemoveAllStories = (config: RequestBaseConfig) => Promise<any>;
 export type GetStoryById = (storyId: string, config: RequestBaseConfig) => Promise<any>;
 export type GetStoryBySlug = (slug: string, config: RequestBaseConfig) => Promise<any>;
-export type GetAllStories = (config: RequestBaseConfig) => Promise<any>;
-export type CreateStory = (content: any, config: RequestBaseConfig) => Promise<any>;
-export type UpdateStory = (content: any, storyId: string, options: {
-    publish?: boolean;
+export type GetAllStories = (args: {
+    options?: ExtendedISbStoriesParams;
 }, config: RequestBaseConfig) => Promise<any>;
+export type CreateStory = (content: any, config: RequestBaseConfig) => Promise<any>;
+export type UpdateStory = (content: any, storyId: string, options: ModifyStoryOptions, config: RequestBaseConfig) => Promise<any>;
 export type UpdateStories = (args: {
     stories: any;
-    options: {
-        publish?: boolean;
-    };
+    options: ModifyStoryOptions;
     spaceId: string;
 }, config: RequestBaseConfig) => Promise<any>;
+export type UpsertStory = (args: {
+    content: any;
+    storyId?: string;
+    storySlug?: string;
+}, config: RequestBaseConfig) => void;
+export type DeepUpsertStory = (args: {
+    content: any;
+    storyId?: string;
+    storySlug?: string;
+}, config: RequestBaseConfig) => void;
 export type BackupStories = (args: {
     filename: string;
     spaceId: string;
     suffix?: string;
 }, config: RequestBaseConfig) => void;
+export {};

package/dist/api/stories/tree.d.ts

@@ -1,3 +1,3 @@
 import type { TraverseAndCreate, TreeNode } from "./tree.types.js";
-export declare const createTree: (stories: any[]) => TreeNode[];
+export declare const createTree: (stories: any[], storiesToUpdate?: string[]) => TreeNode[];
 export declare const traverseAndCreate: TraverseAndCreate;

package/dist/api/stories/tree.js

@@ -1,12 +1,17 @@
 import Logger from "../../utils/logger.js";
-import { createStory } from "./stories.js";
-export const createTree = (stories) => buildTree(stories, null);
-const buildTree = (nodes, parentId = null) => {
+import { createStory, updateStory } from "./stories.js";
+export const createTree = (stories, storiesToUpdate = []) => {
+    return buildTree(stories, null, storiesToUpdate);
+};
+const buildTree = (nodes, parentId = null, storiesToUpdate = []) => {
     const tree = [];
     nodes.forEach((node) => {
         if (node.parent_id === parentId) {
-            const children = buildTree(nodes, node.id);
+            const children = buildTree(nodes, node.id, storiesToUpdate);
             tree.push({
+                action: storiesToUpdate.includes(node?.full_slug)
+                    ? "update"
+                    : "create",
                 id: node.id,
                 parent_id: node.parent_id,
                 story: node,
@@ -20,9 +25,17 @@ export const traverseAndCreate = (input, config) => {
     const { tree, realParentId, spaceId } = input;
     tree.forEach(async (node) => {
         try {
-            const { parent, ...content } = node.story;
-            const result = await createStory({ ...content, parent_id: realParentId }, { ...config, spaceId });
-            const storyId = result.story.id;
+            const { action, story } = node;
+            const { parent, ...content } = story;
+            let storyId = story.id;
+            if (action === "create") {
+                const result = await createStory({ ...content, parent_id: realParentId }, { ...config, spaceId });
+                storyId = result.story.id;
+            }
+            else if (action === "update") {
+                const result = await updateStory({ ...content, parent_id: realParentId }, `${storyId}`, { force_update: true }, { ...config, spaceId });
+                storyId = result.story.id;
+            }
             if (node.children) {
                 traverseAndCreate({
                     tree: node.children,

package/dist/api/stories/tree.types.d.ts

@@ -1,5 +1,6 @@
 import type { RequestBaseConfig } from "../utils/request.js";
 export interface TreeNode {
+    action: "update" | "create";
     id: number;
     parent_id: number | null;
     children?: TreeNode[];

package/dist/api/testApi.d.ts

@@ -60,6 +60,7 @@ export declare const testApi: {
         updateStories: import("./stories/stories.types.js").UpdateStories;
         getAllStories: import("./stories/stories.types.js").GetAllStories;
         removeAllStories: import("./stories/stories.types.js").RemoveAllStories;
+        upsertStory: import("./stories/stories.types.js").UpsertStory;
         backupStories: import("./stories/stories.types.js").BackupStories;
     };
     spaces: {

package/dist/cli/commands/init.js

@@ -23,7 +23,9 @@ export const init = async (props) => {
                 gtmToken,
             });
             const localSbApi = new StoryblokClient({ oauthToken }, storyblokApiUrl);
-            const spaceData = await managementApi.spaces.getSpace(spaceId, apiConfig);
+            console.log("This is api config: ");
+            console.log({ ...apiConfig, oauthToken });
+            const spaceData = await managementApi.spaces.getSpace({ spaceId }, { ...apiConfig, sbApi: localSbApi });
             const STORYBLOK_SPACE_ID = spaceId;
             const STORYBLOK_OAUTH_TOKEN = oauthToken;
             const NEXT_PUBLIC_GTM_ID = gtmToken ?? "put-your-gtm-token-here";
@@ -51,7 +53,7 @@ export const init = async (props) => {
                     params: {
                         domain: `https://localhost:3000/api/preview/preview?secret=${STORYBLOK_PREVIEW_SECRET}&slug=`,
                     },
-                }, apiConfig);
+                }, { ...apiConfig, sbApi: localSbApi });
                 Logger.success("Successfully updated space domain");
             }
             catch (e) {

package/dist/cli/commands/test.d.ts

@@ -0,0 +1,2 @@
+import type { CLIOptions } from "../../utils/interfaces.js";
+export declare const testCommand: (props: CLIOptions) => Promise<void>;

package/dist/cli/commands/test.js

@@ -0,0 +1,26 @@
+import { managementApi } from "../../api/managementApi.js";
+import Logger from "../../utils/logger.js";
+import { apiConfig } from "../api-config.js";
+const INIT_COMMANDS = {
+    stories: "stories",
+};
+export const testCommand = async (props) => {
+    const { input, flags } = props;
+    const command = input[1];
+    switch (command) {
+        case INIT_COMMANDS.stories:
+            Logger.warning(`test sb-mig... with command: ${command}`);
+            console.log("This is api config");
+            console.log(apiConfig);
+            const allStories = await managementApi.stories.getAllStories({
+                options: {
+                    language: "de-de",
+                },
+            }, apiConfig);
+            console.log("these are all stories");
+            console.log(JSON.stringify(allStories[0].story.content.body, null, 2));
+            break;
+        default:
+            console.log(`no command like that: ${command}`);
+    }
+};

package/dist/cli/index.js

@@ -11,6 +11,7 @@ import { migrations } from "./commands/migrations.js";
 import { remove } from "./commands/remove.js";
 import { revert } from "./commands/revert.js";
 import { sync } from "./commands/sync.js";
+import { testCommand } from "./commands/test.js";
 const app = () => ({
     cli: meow(mainDescription, {
         importMeta: import.meta,
@@ -112,6 +113,15 @@ app.init = () => ({
         init(cli);
     },
 });
+app.test = () => ({
+    cli: meow("nothing", {
+        importMeta: import.meta,
+        booleanDefault: undefined,
+    }),
+    action: (cli) => {
+        testCommand(cli);
+    },
+});
 const getSubcommand = (cliObject, level) => pipe(prop("input"), prop(level), (name) => prop(name)(cliObject))(prop("cli")(cliObject()));
 const cli = (cliObject, level = 0) => {
     const { cli: nextCli, action } = cliObject();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sb-mig",
-  "version": "5.0.8-beta.2",
+  "version": "5.0.8-beta.4",
   "description": "CLI to rule the world. (and handle stuff related to Storyblok CMS)",
   "author": "Marcin Krawczyk <marckraw@icloud.com>",
   "license": "MIT",