sb-mig 5.2.2 → 5.3.0-beta.2

package/dist/api/components/components.js

@@ -13,7 +13,15 @@ export const getAllComponents = (config) => {
         apiFn: ({ per_page, page }) => sbApi
             .get(`spaces/${spaceId}/components/`, { per_page, page })
             .then((res) => {
-            Logger.log(`Amount of components: ${res.total}`);
+            /**
+             *
+             * Not every endpoint in storyblok give us pagination...
+             * so only for this who paginate we want to console log amount found.
+             *
+             * */
+            if (res.total) {
+                Logger.log(`Amount of components: ${res.total}`);
+            }
             return res;
         })
             .catch((err) => console.error(err)),
@@ -116,7 +124,15 @@ export const getAllComponentsGroups = async (config) => {
         apiFn: ({ per_page, page }) => sbApi
             .get(`spaces/${spaceId}/component_groups/`, { per_page, page })
             .then((res) => {
-            Logger.log(`Amount of component groups: ${res.total}`);
+            /**
+             *
+             * Not every endpoint in storyblok give us pagination...
+             * so only for this who paginate we want to console log amount found.
+             *
+             * */
+            if (res.total) {
+                Logger.log(`Amount of component groups: ${res.total}`);
+            }
             return res;
         })
             .catch((err) => console.error(err)),

package/dist/api/datasources/datasources.js

@@ -7,22 +7,27 @@ export const getAllDatasources = (config) => {
     const { sbApi, spaceId } = config;
     Logger.log("Trying to get all Datasources.");
     return getAllItemsWithPagination({
-        apiFn: ({ per_page, page }) => sbApi
-            .get(`spaces/${spaceId}/datasources/`, { per_page, page })
-            .then((res) => {
-            Logger.log(`Amount of datasources: ${res.total}`);
-            return res;
-        })
-            .catch((err) => {
-            if (err.response.status === 404) {
-                Logger.error(`There is no datasources in your Storyblok ${spaceId} space.`);
-                return true;
-            }
-            else {
-                Logger.error(err);
-                return false;
-            }
-        }),
+        // @ts-ignore
+        apiFn: ({ per_page, page }) => {
+            return sbApi
+                .get(`spaces/${spaceId}/datasources/`)
+                .then((res) => {
+                if (res.total) {
+                    Logger.log(`Amount of datasources: ${res.total}`);
+                }
+                return res;
+            })
+                .catch((err) => {
+                if (err.response.status === 404) {
+                    Logger.error(`There is no datasources in your Storyblok ${spaceId} space.`);
+                    return true;
+                }
+                else {
+                    Logger.error(err);
+                    return false;
+                }
+            });
+        },
         params: {
             spaceId,
         },

package/dist/api/migrate.js

@@ -1,5 +1,5 @@
 import { apiConfig } from "../cli/api-config.js";
-import { compare, discover, discoverMany, discoverManyByPackageName, discoverStories, LOOKUP_TYPE, SCOPE, } from "../cli/utils/discover.js";
+import { compare, discover, discoverMany, discoverManyByPackageName, discoverResolvers, discoverStories, LOOKUP_TYPE, SCOPE, } from "../cli/utils/discover.js";
 import { dumpToFile } from "../utils/files.js";
 import Logger from "../utils/logger.js";
 import { getFileContentWithRequire, getFilesContentWithRequire, isObjectEmpty, } from "../utils/main.js";
@@ -10,11 +10,9 @@ import { backupStories } from "./stories/backup.js";
 import { getAllStories } from "./stories/stories.js";
 import { createTree, traverseAndCreate } from "./stories/tree.js";
 import { _uniqueValuesFrom } from "./utils/helper-functions.js";
+import { resolverTransformations } from "./utils/resolverTransformations.js";
 const _checkAndPrepareGroups = async (groupsToCheck, config) => {
     const componentsGroups = await managementApi.components.getAllComponentsGroups(config);
-    console.log("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
-    console.log(componentsGroups);
-    console.log("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
     const groupExist = (groupName) => componentsGroups.find((group) => group.name === groupName);
     groupsToCheck.forEach(async (groupName) => {
         if (!groupExist(groupName)) {
@@ -59,9 +57,22 @@ const _resolveGroups = async (component, existedGroups, remoteComponentsGroups)
 };
 export const syncComponents = async (specifiedComponents, presets, config) => {
     Logger.log("sync2Components: ");
-    const specifiedComponentsContent = await Promise.all(specifiedComponents.map((component) => {
+    let specifiedComponentsContent = await Promise.all(specifiedComponents.map((component) => {
         return getFileContentWithRequire({ file: component.p });
     }));
+    const resolversFilenames = await discoverResolvers({
+        scope: SCOPE.local,
+        type: LOOKUP_TYPE.fileName,
+    });
+    /*
+     * if resolversFilenames exist, then do stuff if not, than follow with the old approach
+     * */
+    if (resolversFilenames.length !== 0) {
+        const resolverFilesContent = await Promise.all(resolversFilenames.map((filename) => {
+            return getFileContentWithRequire({ file: filename });
+        }));
+        specifiedComponentsContent = resolverTransformations(specifiedComponentsContent, resolverFilesContent);
+    }
     const groupsToCheck = _uniqueValuesFrom(specifiedComponentsContent
         .filter((component) => component.component_group_name)
         .map((component) => component.component_group_name));

package/dist/api/utils/request.js

@@ -10,11 +10,21 @@ export const getAllItemsWithPagination = async ({ apiFn, params, itemsKey, }) =>
         if (!totalPages) {
             totalPages = Math.ceil(response.total / response.perPage);
         }
-        amountOfFetchedItems +=
-            response.total - amountOfFetchedItems > per_page
-                ? per_page
-                : response.total - amountOfFetchedItems;
-        Logger.success(`${amountOfFetchedItems} of ${response.total} items fetched.`);
+        /**
+         *
+         * Not every endpoint in storyblok give us pagination...
+         * so only for this who paginate we want to calculate values to show
+         *
+         * */
+        if (response.total) {
+            amountOfFetchedItems +=
+                response.total - amountOfFetchedItems > per_page
+                    ? per_page
+                    : response.total - amountOfFetchedItems;
+            if (amountOfFetchedItems && !Number.isNaN(amountOfFetchedItems)) {
+                Logger.success(`${amountOfFetchedItems} of ${response.total} items fetched.`);
+            }
+        }
         allItems.push(...response.data[itemsKey]);
         page++;
     } while (page <= totalPages);

package/dist/api/utils/resolverTransformations.d.ts

@@ -0,0 +1 @@
+export declare const resolverTransformations: (specifiedComponentsContent: any, resolverFilesContent: any) => any[];

package/dist/api/utils/resolverTransformations.js

@@ -0,0 +1,67 @@
+const extendField = (obj, targetField, newValue) => {
+    if (typeof obj !== "object" || obj === null) {
+        return false;
+    }
+    if (obj.hasOwnProperty(targetField)) {
+        if (Array.isArray(obj[targetField])) {
+            for (const element of newValue) {
+                if (!obj[targetField].includes(element)) {
+                    obj[targetField] = [...obj[targetField], element];
+                }
+            }
+        }
+        else if (typeof obj[targetField] === "object") {
+            // this is something i have to fix, comparing to object is stupid
+            obj[targetField] = { ...obj[targetField], ...newValue };
+        }
+        return true;
+    }
+    for (const key in obj) {
+        if (extendField(obj[key], targetField, newValue)) {
+            return true;
+        }
+    }
+    return false;
+};
+const resolveAll = (resolver, componentsContent) => {
+    if (!resolver.all)
+        return componentsContent;
+    return componentsContent;
+};
+const resolveComponentGroupNames = (resolver, componentsContent) => {
+    if (!resolver.componentGroupNames)
+        return componentsContent;
+    return componentsContent;
+};
+const resolveComponentNames = (resolver, componentsContent) => {
+    if (!resolver.componentNames)
+        return componentsContent;
+    const componentNamesResolver = resolver.componentNames;
+    componentsContent.map((component) => {
+        if (componentNamesResolver.names.includes(component.name)) {
+            const targetField = Object.keys(componentNamesResolver.methods.extend)[0];
+            console.log("This is target field ?");
+            console.log(targetField);
+            extendField(component, targetField, componentNamesResolver.methods.extend[targetField]);
+        }
+        return component;
+    });
+    return componentsContent;
+};
+export const resolverTransformations = (specifiedComponentsContent, resolverFilesContent) => {
+    let resolvedComponents = [];
+    console.log("#### Specified Components Content to Resolve ####");
+    console.log(specifiedComponentsContent);
+    console.log("#### Resolver Files Content ####");
+    console.log(resolverFilesContent);
+    const resolver = resolverFilesContent[0];
+    console.log("kjashdkjhaskjdh");
+    console.log(resolver);
+    // resolvedComponents = resolveAll(resolver, specifiedComponentsContent)
+    // resolvedComponents = resolveComponentGroupNames(resolver, resolvedComponents)
+    resolvedComponents = resolveComponentNames(resolver, specifiedComponentsContent);
+    console.log("@@@@@@@@");
+    console.log(resolvedComponents[0].schema);
+    console.log("@@@@@@@@");
+    return resolvedComponents;
+};

package/dist/cli/cli-descriptions.d.ts

@@ -7,4 +7,5 @@ export declare const migrationsDescription = "\n    Usage\n        $ sb-mig migr
 export declare const removeDescription = "\n    Usage\n        $ sb-mig remove [components|roles|datasources] [space separated file names] or --all \n        \n    Description\n        Remove components or roles with Storyblok space.\n        \n    COMMANDS\n        components     - remove components\n        roles          - remove roles\n        datasources    - remove datasources\n     \n    FLAGS\n        --all          - Remove all components \n    \n    EXAMPLES\n        $ sb-mig remove components --all\n        $ sb-mig remove components accordion accordion-item\n        $ sb-mig remove roles --all\n        $ sb-mig remove datasources --all\n";
 export declare const backupDescription = "\n    Usage\n        $ sb-mig backup [components|component-groups|roles|datasources|presets|component-presets] component-name or --all\n    Description\n        Command for backing up anything related to Storyblok\n        \n    COMMANDS\n        components        - backup components\n        component-groups  - backup component-groups\n        roles             - backup components\n        datasources       - backup components\n        presets           - backup presets\n        component-presets - backup component presets\n        plugins           - backup plugins\n        stories           - backup stories (only --all)\n\n     \n    FLAGS\n        --all   - Backup all \n    \n    EXAMPLES\n        $ sb-mig backup components --all\n        $ sb-mig backup components accordion  \n        $ sb-mig backup datasources --all\n        $ sb-mig backup roles admin\n        $ sb-mig backup plugins --all\n        $ sb-mig backup plugins my-awesome-plugin\n        $ sb-mig backup stories --all\n";
 export declare const debugDescription = "\n    Usage\n        $ sb-mig debug\n    Description\n        Output extra debugging information\n";
+export declare const askDescription = "\n    !! ALPHA !!!\n    Usage\n        $ sb-mig ask \"What sb-mig version am I using?\"\n        $ sb-mig ask \"What is the schema type i should write?\"\n        $ sb-mig ask \"Is debug mode turned on ?\"\n        $ sb-mig ask \"What storyblok api urls I am using?\"\n    Description\n        Ask sb-mig about anything, especially stuff related to sb-mig and storyblok components.\n        \n        Needs OPENAI_API_KEY= environment set in your project. (Config will pick it up automatically, no need to modify\n        storyblok.config.[c|m]js file\n        \n        Also, right now, you need to install @mrck-labs/anton-sdk in your project, since its not bundled.\n";
 export declare const initDescription = "\n    Usage\n        $ sb-mig init\n    Description\n        Init and update your project\n";

package/dist/cli/cli-descriptions.js

@@ -185,6 +185,21 @@ export const debugDescription = `
     Description
         Output extra debugging information
 `;
+export const askDescription = `
+    !! ALPHA !!!
+    Usage
+        $ sb-mig ask "What sb-mig version am I using?"
+        $ sb-mig ask "What is the schema type i should write?"
+        $ sb-mig ask "Is debug mode turned on ?"
+        $ sb-mig ask "What storyblok api urls I am using?"
+    Description
+        Ask sb-mig about anything, especially stuff related to sb-mig and storyblok components.
+        
+        Needs OPENAI_API_KEY= environment set in your project. (Config will pick it up automatically, no need to modify
+        storyblok.config.[c|m]js file
+        
+        Also, right now, you need to install @mrck-labs/anton-sdk in your project, since its not bundled.
+`;
 export const initDescription = `
     Usage
         $ sb-mig init

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

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

package/dist/cli/commands/ask.js

@@ -0,0 +1,49 @@
+import path from "path";
+import { Anton } from "@mrck-labs/anton-sdk";
+import config from "../../config/config.js";
+import Logger from "../../utils/logger.js";
+import { getFileContentWithRequire } from "../../utils/main.js";
+export const ask = async (props) => {
+    const { input, flags } = props;
+    try {
+        const fileContent = await getFileContentWithRequire({
+            file: path.join("..", "..", "package.json"),
+        });
+        const anton = new Anton(config.openaiToken);
+        const question = input[1];
+        const cleanPackageJSON = {
+            ...fileContent,
+        };
+        const cleanStoryblokConfig = {
+            ...config,
+            oauthToken: "hidden",
+            openaiToken: "hidden",
+        };
+        Logger.warning("Got it! Thinking...");
+        const data = await anton.chatCompletion({
+            body: {
+                messages: [
+                    {
+                        role: "system",
+                        content: `Giving below context which is json object, answer the question asked with ONLY on using the CONTEXT.
+            If u dont know the answet to question, simply say don't know. DO NOT try to generate answers at all cost if the context
+            doesnt give you the answer.
+            ### context start ###
+            ${JSON.stringify(cleanStoryblokConfig, null, 2)}
+            ${JSON.stringify(cleanPackageJSON, null, 2)}
+            ### context end ###
+            `,
+                    },
+                    {
+                        role: "user",
+                        content: question,
+                    },
+                ],
+            },
+        });
+        Logger.success(data?.choices[0]?.message?.content);
+    }
+    catch (e) {
+        Logger.warning("Can't find package.json");
+    }
+};

package/dist/cli/index.js

@@ -1,7 +1,8 @@
 #! /usr/bin/env node
 import meow from "meow";
 import { pipe, prop } from "../utils/main.js";
-import { backupDescription, debugDescription, mainDescription, syncDescription, removeDescription, initDescription, discoverDescription, migrateDescription, revertDescription, migrationsDescription, } from "./cli-descriptions.js";
+import { backupDescription, debugDescription, mainDescription, syncDescription, removeDescription, initDescription, discoverDescription, migrateDescription, revertDescription, migrationsDescription, askDescription, } from "./cli-descriptions.js";
+import { ask } from "./commands/ask.js";
 import { backup } from "./commands/backup.js";
 import { debug } from "./commands/debug.js";
 import { discover } from "./commands/discover.js";
@@ -104,6 +105,15 @@ app.debug = () => ({
         debug();
     },
 });
+app.ask = () => ({
+    cli: meow(askDescription, {
+        importMeta: import.meta,
+        booleanDefault: undefined,
+    }),
+    action: (cli) => {
+        ask(cli);
+    },
+});
 app.init = () => ({
     cli: meow(initDescription, {
         importMeta: import.meta,

package/dist/cli/utils/discover.d.ts

@@ -56,6 +56,7 @@ export declare const filesPattern: ({ mainDirectory, componentDirectories, ext,
     ext: string;
 }) => string;
 export declare const discover: (request: DiscoverRequest) => Promise<DiscoverResult>;
+export declare const discoverResolvers: (request: DiscoverRequest) => Promise<DiscoverResult>;
 export declare const discoverRoles: (request: DiscoverRequest) => Promise<DiscoverResult>;
 export declare const discoverManyRoles: (request: DiscoverManyRequest) => Promise<DiscoverResult>;
 export declare const discoverAllComponents: () => Promise<{

package/dist/cli/utils/discover.js

@@ -525,6 +525,46 @@ export const discover = async (request) => {
     }
     return listOfFiles;
 };
+export const discoverResolvers = async (request) => {
+    const rootDirectory = ".";
+    const directory = path.resolve(process.cwd(), rootDirectory);
+    let pattern;
+    let listOfFiles = [""];
+    switch (request.scope) {
+        case SCOPE.local:
+            // ### ALL - LOCAL - fileName ###
+            let listOFSchemaTSFilesCompiled = [];
+            const onlyLocalComponentsDirectories = storyblokConfig.componentsDirectories.filter((p) => !p.includes("node_modules"));
+            if (storyblokConfig.schemaType === SCHEMA.TS) {
+                pattern = filesPattern({
+                    mainDirectory: directory,
+                    componentDirectories: onlyLocalComponentsDirectories,
+                    ext: "resolvers.schema.sb.ts",
+                });
+                const listOfFilesToCompile = glob.sync(pattern.replace(/\\/g, "/"), {
+                    follow: true,
+                });
+                await buildOnTheFly({ files: listOfFilesToCompile });
+                pattern = path.join(directory, ".next", "cache", "sb-mig", "**", `[^_]*.resolvers.schema.sb.cjs`);
+                listOFSchemaTSFilesCompiled = glob.sync(pattern.replace(/\\/g, "/"), {
+                    follow: true,
+                });
+            }
+            pattern = filesPattern({
+                mainDirectory: directory,
+                componentDirectories: onlyLocalComponentsDirectories,
+                ext: "resolvers.schema.sb.cjs",
+            });
+            listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
+                follow: true,
+            });
+            listOfFiles = [...listOfFiles, ...listOFSchemaTSFilesCompiled];
+            break;
+        default:
+            break;
+    }
+    return listOfFiles;
+};
 export const discoverRoles = async (request) => {
     const rootDirectory = ".";
     const directory = path.resolve(process.cwd(), rootDirectory);

package/dist/config/config.d.ts

@@ -25,6 +25,7 @@ export interface IStoryblokConfig {
     storyblokDeliveryApiUrl: string;
     storyblokGraphqlApiUrl: string;
     oauthToken: string;
+    openaiToken: string;
     spaceId: string;
     accessToken: string;
     boilerplateSpaceId: string;

package/dist/config/constants.d.ts

@@ -2,20 +2,21 @@ export declare const SCHEMA: {
     readonly TS: "ts";
     readonly JS: "js";
 };
-export declare const storyblokApiMapping: {
+export interface StoryblokApiMapping {
     eu: {
-        managementApi: string;
-        deliveryApi: string;
-        graphql: string;
+        managementApi: "https://mapi.storyblok.com/v1";
+        deliveryApi: "https://api.storyblok.com/v2";
+        graphql: "https://gapi.storyblok.com/v1/api";
     };
     us: {
-        managementApi: string;
-        deliveryApi: string;
-        graphql: string;
+        managementApi: "https://api-us.storyblok.com/v1";
+        deliveryApi: "https://api-us.storyblok.com/v2";
+        graphql: "https://gapi-us.storyblok.com/v1/api";
     };
     cn: {
-        managementApi: string;
-        deliveryApi: string;
-        graphql: string;
+        managementApi: "https://app.storyblokchina.cn";
+        deliveryApi: "https://app.storyblokchina.cn";
+        graphql: "";
     };
-};
+}
+export declare const storyblokApiMapping: StoryblokApiMapping;

package/dist/config/defaultConfig.js

@@ -41,6 +41,7 @@ export const defaultConfig = (pkg, path, env) => {
         storyblokGraphqlApiUrl: env["NEXT_PUBLIC_STORYBLOK_GRAPHQL_API_URL"] ||
             "https://gapi.storyblok.com/v1/api",
         oauthToken: env["STORYBLOK_OAUTH_TOKEN"] ?? "",
+        openaiToken: env["OPENAI_API_KEY"] ?? "",
         spaceId: env["STORYBLOK_SPACE_ID"] ?? "",
         accessToken: env["GATSBY_STORYBLOK_ACCESS_TOKEN"] ||
             env["NEXT_PUBLIC_STORYBLOK_ACCESS_TOKEN"] ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sb-mig",
-  "version": "5.2.2",
+  "version": "5.3.0-beta.2",
   "description": "CLI to rule the world. (and handle stuff related to Storyblok CMS)",
   "author": "Marcin Krawczyk <marckraw@icloud.com>",
   "license": "MIT",
@@ -48,9 +48,11 @@
     "start": "yarn build && ./dist/cli/index.js",
     "debug": "yarn build && ./dist/cli/index.js sync components accordion accordion-item",
     "semantic-release": "semantic-release",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "build:yalc": "yarn build && yalc push"
   },
   "dependencies": {
+    "@mrck-labs/anton-sdk": "^0.0.10",
     "@swc/core": "1.3.41",
     "@swc/helpers": "0.4.14",
     "chalk": "^5.3.0",
@@ -71,23 +73,23 @@
   "devDependencies": {
     "@commitlint/cli": "^17.7.1",
     "@commitlint/config-conventional": "^17.7.0",
-    "@rollup/plugin-node-resolve": "^15.2.0",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "@ryansonshine/commitizen": "^4.2.8",
     "@ryansonshine/cz-conventional-changelog": "^3.3.4",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@sindresorhus/tsconfig": "^3.0.1",
-    "@types/chai": "^4.3.5",
-    "@types/fs-extra": "^11.0.1",
+    "@types/chai": "^4.3.10",
+    "@types/fs-extra": "^11.0.4",
     "@types/glob": "^8.1.0",
-    "@types/mocha": "^10.0.1",
-    "@types/ncp": "^2.0.5",
+    "@types/mocha": "^10.0.4",
+    "@types/ncp": "^2.0.8",
     "@types/node": "18.16.18",
     "@types/sinon": "^10.0.16",
-    "@types/uuid": "^9.0.2",
+    "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^6.4.1",
     "@typescript-eslint/parser": "^6.4.1",
-    "chai": "^4.3.7",
+    "chai": "^4.3.10",
     "chokidar-cli": "^3.0.0",
     "eslint": "^8.47.0",
     "eslint-config-prettier": "^9.0.0",
@@ -96,7 +98,7 @@
     "husky": "^8.0.3",
     "lint-staged": "^13.2.3",
     "mocha": "^10.2.0",
-    "prettier": "^3.0.2",
+    "prettier": "^3.0.3",
     "semantic-release": "^21.0.9",
     "semantic-release-slack-bot": "^4.0.1",
     "sinon": "^15.2.0",