sb-mig 5.7.0-beta.3 → 5.7.0-beta.4

package/dist/api/datasources/datasource-entries.js

@@ -1,7 +1,9 @@
 import chalk from "chalk";
 import Logger from "../../utils/logger.js";
 import { isObjectEmpty } from "../../utils/object-utils.js";
+import { getAllItemsWithPagination } from "../utils/request.js";
 import { getDatasource } from "./datasources.js";
+import { formatDatasourceApiError } from "./error-formatting.js";
 const _decorateWithDimensions = async (args, config) => {
     const { currentDatasource, dimensionsData, _callback } = args;
     const { spaceId, sbApi } = config;
@@ -35,17 +37,19 @@ export const getDatasourceEntries = async (args, config) => {
     Logger.log(`Trying to get '${datasourceName}' datasource entries.`);
     const data = await getDatasource({ datasourceName }, config); // TODO: maybe this step is not needed, i think we can retrieve entries directly using slug (but using delivery api, not management)
     if (data) {
-        return sbApi
-            .get(`spaces/${spaceId}/datasource_entries/`, {
-            datasource_id: data[0].id,
-        })
-            .then(async (response) => {
-            Logger.success(`Datasource Entries for '${datasourceName}' datasource successfully retrieved.`);
-            const { data } = response;
-            return data;
-        })
-            .catch((err) => Logger.error(err));
+        const datasourceEntries = await getAllItemsWithPagination({
+            apiFn: ({ per_page, page }) => sbApi.get(`spaces/${spaceId}/datasource_entries/`, {
+                datasource_id: data[0].id,
+                per_page,
+                page,
+            }),
+            params: {},
+            itemsKey: "datasource_entries",
+        });
+        Logger.success(`Datasource Entries for '${datasourceName}' datasource successfully retrieved.`);
+        return { datasource_entries: datasourceEntries };
     }
+    return { datasource_entries: [] };
 };
 export const createDatasourceEntries = (args, config) => {
     const { datasource_entries, remoteDatasourceEntries, data, dryRun } = args;
@@ -96,7 +100,7 @@ const _createDatasourceEntry = (args, config) => {
             console.log("Full Create error: ");
             console.log(err);
         }
-        Logger.error(`Unable to create datasource entry in ${currentDatasource.datasource.name} datasource.`);
+        Logger.error(`Unable to create datasource entry '${finalDatasource_entry.name}' in ${currentDatasource.datasource.name} datasource. Value: '${finalDatasource_entry.value}'. ${formatDatasourceApiError(err)}`);
     });
 };
 export const createDatasourceEntry = (args, config) => {
@@ -137,7 +141,7 @@ const _updateDatasourceEntry = (args, config) => {
             console.log("Full update error: ");
             console.log(err);
         }
-        Logger.error(`Unable to update datasource entry in ${currentDatasource.datasource.name} datasource.`);
+        Logger.error(`Unable to update datasource entry '${finalDatasource_entry.name}' in ${currentDatasource.datasource.name} datasource. Value: '${finalDatasource_entry.value}'. ${formatDatasourceApiError(err)}`);
     });
 };
 export const updateDatasourceEntry = (args, config) => {

package/dist/api/datasources/datasources.js

@@ -1,6 +1,7 @@
 import Logger from "../../utils/logger.js";
 import { getAllItemsWithPagination } from "../utils/request.js";
 import { createDatasourceEntries, getDatasourceEntries, } from "./datasource-entries.js";
+import { formatDatasourceApiError } from "./error-formatting.js";
 // GET
 export const getAllDatasources = (config) => {
     const { sbApi, spaceId } = config;
@@ -75,7 +76,7 @@ export const createDatasource = (args, config) => {
             datasource_entries: datasource.datasource_entries,
         };
     })
-        .catch((err) => Logger.error(err));
+        .catch((err) => Logger.error(`Unable to create datasource '${datasource.name}' with slug '${datasource.slug}'. ${formatDatasourceApiError(err)}`));
 };
 export const updateDatasource = (args, config) => {
     const { datasource, datasourceToBeUpdated } = args;
@@ -107,7 +108,7 @@ export const updateDatasource = (args, config) => {
             datasource_entries: datasource.datasource_entries,
         };
     })
-        .catch((err) => Logger.error(err));
+        .catch((err) => Logger.error(`Unable to update datasource '${datasource.name}' with id '${datasourceToBeUpdated.id}'. ${formatDatasourceApiError(err)}`));
 };
 // File-based sync wrapper lives in `datasources.sync.ts` to keep this module CJS-safe.
 export const syncDatasourcesData = async ({ datasources, dryRun }, config) => {

package/dist/api/datasources/error-formatting.d.ts

@@ -0,0 +1 @@
+export declare const formatDatasourceApiError: (err: any) => string;

package/dist/api/datasources/error-formatting.js

@@ -0,0 +1,24 @@
+export const formatDatasourceApiError = (err) => {
+    const details = [];
+    const status = err?.response?.status;
+    const statusText = err?.response?.statusText;
+    const responseData = err?.response?.data;
+    if (status || statusText) {
+        details.push(`status: ${[status, statusText].filter(Boolean).join(" ")}`);
+    }
+    if (responseData?.message) {
+        details.push(`message: ${responseData.message}`);
+    }
+    if (responseData?.error) {
+        details.push(`error: ${responseData.error}`);
+    }
+    if (responseData?.errors) {
+        details.push(`errors: ${typeof responseData.errors === "string"
+            ? responseData.errors
+            : JSON.stringify(responseData.errors)}`);
+    }
+    if (!details.length && err?.message) {
+        details.push(`message: ${err.message}`);
+    }
+    return details.length ? details.join("; ") : String(err);
+};

package/dist-cjs/api/datasources/datasource-entries.js

@@ -7,7 +7,9 @@ exports.updateDatasourceEntry = exports.createDatasourceEntry = exports.createDa
 const chalk_1 = __importDefault(require("chalk"));
 const logger_js_1 = __importDefault(require("../../utils/logger.js"));
 const object_utils_js_1 = require("../../utils/object-utils.js");
+const request_js_1 = require("../utils/request.js");
 const datasources_js_1 = require("./datasources.js");
+const error_formatting_js_1 = require("./error-formatting.js");
 const _decorateWithDimensions = async (args, config) => {
     const { currentDatasource, dimensionsData, _callback } = args;
     const { spaceId, sbApi } = config;
@@ -41,17 +43,19 @@ const getDatasourceEntries = async (args, config) => {
     logger_js_1.default.log(`Trying to get '${datasourceName}' datasource entries.`);
     const data = await (0, datasources_js_1.getDatasource)({ datasourceName }, config); // TODO: maybe this step is not needed, i think we can retrieve entries directly using slug (but using delivery api, not management)
     if (data) {
-        return sbApi
-            .get(`spaces/${spaceId}/datasource_entries/`, {
-            datasource_id: data[0].id,
-        })
-            .then(async (response) => {
-            logger_js_1.default.success(`Datasource Entries for '${datasourceName}' datasource successfully retrieved.`);
-            const { data } = response;
-            return data;
-        })
-            .catch((err) => logger_js_1.default.error(err));
+        const datasourceEntries = await (0, request_js_1.getAllItemsWithPagination)({
+            apiFn: ({ per_page, page }) => sbApi.get(`spaces/${spaceId}/datasource_entries/`, {
+                datasource_id: data[0].id,
+                per_page,
+                page,
+            }),
+            params: {},
+            itemsKey: "datasource_entries",
+        });
+        logger_js_1.default.success(`Datasource Entries for '${datasourceName}' datasource successfully retrieved.`);
+        return { datasource_entries: datasourceEntries };
     }
+    return { datasource_entries: [] };
 };
 exports.getDatasourceEntries = getDatasourceEntries;
 const createDatasourceEntries = (args, config) => {
@@ -104,7 +108,7 @@ const _createDatasourceEntry = (args, config) => {
             console.log("Full Create error: ");
             console.log(err);
         }
-        logger_js_1.default.error(`Unable to create datasource entry in ${currentDatasource.datasource.name} datasource.`);
+        logger_js_1.default.error(`Unable to create datasource entry '${finalDatasource_entry.name}' in ${currentDatasource.datasource.name} datasource. Value: '${finalDatasource_entry.value}'. ${(0, error_formatting_js_1.formatDatasourceApiError)(err)}`);
     });
 };
 const createDatasourceEntry = (args, config) => {
@@ -146,7 +150,7 @@ const _updateDatasourceEntry = (args, config) => {
             console.log("Full update error: ");
             console.log(err);
         }
-        logger_js_1.default.error(`Unable to update datasource entry in ${currentDatasource.datasource.name} datasource.`);
+        logger_js_1.default.error(`Unable to update datasource entry '${finalDatasource_entry.name}' in ${currentDatasource.datasource.name} datasource. Value: '${finalDatasource_entry.value}'. ${(0, error_formatting_js_1.formatDatasourceApiError)(err)}`);
     });
 };
 const updateDatasourceEntry = (args, config) => {

package/dist-cjs/api/datasources/datasources.js

@@ -7,6 +7,7 @@ exports.syncDatasourcesData = exports.updateDatasource = exports.createDatasourc
 const logger_js_1 = __importDefault(require("../../utils/logger.js"));
 const request_js_1 = require("../utils/request.js");
 const datasource_entries_js_1 = require("./datasource-entries.js");
+const error_formatting_js_1 = require("./error-formatting.js");
 // GET
 const getAllDatasources = (config) => {
     const { sbApi, spaceId } = config;
@@ -83,7 +84,7 @@ const createDatasource = (args, config) => {
             datasource_entries: datasource.datasource_entries,
         };
     })
-        .catch((err) => logger_js_1.default.error(err));
+        .catch((err) => logger_js_1.default.error(`Unable to create datasource '${datasource.name}' with slug '${datasource.slug}'. ${(0, error_formatting_js_1.formatDatasourceApiError)(err)}`));
 };
 exports.createDatasource = createDatasource;
 const updateDatasource = (args, config) => {
@@ -116,7 +117,7 @@ const updateDatasource = (args, config) => {
             datasource_entries: datasource.datasource_entries,
         };
     })
-        .catch((err) => logger_js_1.default.error(err));
+        .catch((err) => logger_js_1.default.error(`Unable to update datasource '${datasource.name}' with id '${datasourceToBeUpdated.id}'. ${(0, error_formatting_js_1.formatDatasourceApiError)(err)}`));
 };
 exports.updateDatasource = updateDatasource;
 // File-based sync wrapper lives in `datasources.sync.ts` to keep this module CJS-safe.

package/dist-cjs/api/datasources/error-formatting.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatDatasourceApiError = void 0;
+const formatDatasourceApiError = (err) => {
+    const details = [];
+    const status = err?.response?.status;
+    const statusText = err?.response?.statusText;
+    const responseData = err?.response?.data;
+    if (status || statusText) {
+        details.push(`status: ${[status, statusText].filter(Boolean).join(" ")}`);
+    }
+    if (responseData?.message) {
+        details.push(`message: ${responseData.message}`);
+    }
+    if (responseData?.error) {
+        details.push(`error: ${responseData.error}`);
+    }
+    if (responseData?.errors) {
+        details.push(`errors: ${typeof responseData.errors === "string"
+            ? responseData.errors
+            : JSON.stringify(responseData.errors)}`);
+    }
+    if (!details.length && err?.message) {
+        details.push(`message: ${err.message}`);
+    }
+    return details.length ? details.join("; ") : String(err);
+};
+exports.formatDatasourceApiError = formatDatasourceApiError;

package/package.json

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