storyblok 4.16.2 → 4.16.3

package/dist/index.mjs

@@ -681,6 +681,7 @@ const API_ACTIONS = {
   push_datasource: "Failed to push datasource",
   update_datasource: "Failed to update datasource",
   delete_datasource: "Failed to delete datasource",
+  delete_datasource_entry: "Failed to delete datasource entry",
   create_space: "Failed to create space",
   pull_spaces: "Failed to pull spaces",
   fetch_blueprints: "Failed to fetch blueprints from GitHub"
@@ -5882,7 +5883,7 @@ const upsertDatasource = async (space, datasource, existingId) => {
     return await pushDatasource(space, datasource);
   }
 };
-const pushDatasourceEntry = async (spaceId, datasourceId, entry) => {
+const pushDatasourceEntry = async (spaceId, datasourceId, entry, position) => {
   try {
     const client = getMapiClient();
     const { data } = await client.datasourceEntries.create({
@@ -5892,7 +5893,8 @@ const pushDatasourceEntry = async (spaceId, datasourceId, entry) => {
       body: {
         datasource_entry: {
           ...entry,
-          datasource_id: datasourceId
+          datasource_id: datasourceId,
+          ...position != null && { position }
         }
       },
       throwOnError: true
@@ -5902,7 +5904,7 @@ const pushDatasourceEntry = async (spaceId, datasourceId, entry) => {
     handleAPIError("push_datasource", error, `Failed to push datasource entry ${entry.name}`);
   }
 };
-const updateDatasourceEntry = async (spaceId, entryId, entry) => {
+const updateDatasourceEntry = async (spaceId, entryId, entry, position) => {
   try {
     const client = getMapiClient();
     await client.datasourceEntries.updateDatasourceEntry({
@@ -5911,7 +5913,10 @@ const updateDatasourceEntry = async (spaceId, entryId, entry) => {
         datasource_entry_id: entryId
       },
       body: {
-        datasource_entry: entry
+        datasource_entry: {
+          ...entry,
+          ...position != null && { position }
+        }
       },
       throwOnError: true
     });
@@ -5919,12 +5924,26 @@ const updateDatasourceEntry = async (spaceId, entryId, entry) => {
     handleAPIError("update_datasource", error, `Failed to update datasource entry ${entry.name}`);
   }
 };
-const upsertDatasourceEntry = async (space, datasourceId, entry, existingId) => {
+const upsertDatasourceEntry = async (space, datasourceId, entry, existingId, position) => {
   if (existingId) {
-    await updateDatasourceEntry(space, existingId, entry);
+    await updateDatasourceEntry(space, existingId, entry, position);
     return void 0;
   } else {
-    return await pushDatasourceEntry(space, datasourceId, entry);
+    return await pushDatasourceEntry(space, datasourceId, entry, position);
+  }
+};
+const deleteDatasourceEntry = async (spaceId, entryId) => {
+  try {
+    const client = getMapiClient();
+    await client.datasourceEntries.delete({
+      path: {
+        space_id: spaceId,
+        datasource_entry_id: entryId
+      },
+      throwOnError: true
+    });
+  } catch (error) {
+    handleAPIError("delete_datasource_entry", error, `Failed to delete datasource entry ${entryId}`);
   }
 };
 const readDatasourcesFiles = async (options) => {
@@ -6187,23 +6206,23 @@ pullCmd$2.action(async (datasourceName, options, command) => {
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
-  const spinnerDatasources = new Spinner({
-    verbose: !isVitest
-  });
+  const ui = getUI();
+  const logger = getLogger();
+  logger.info("Pulling datasources started", { space, datasourceName });
+  const spinnerDatasources = ui.createSpinner(`Fetching ${chalk.hex(colorPalette.DATASOURCES)("datasources")}`);
   try {
-    spinnerDatasources.start(`Fetching ${chalk.hex(colorPalette.DATASOURCES)("datasources")}`);
     let datasources;
     if (datasourceName) {
       const datasource = await fetchDatasource(space, datasourceName);
       if (!datasource) {
-        konsola.warn(`No datasource found with name "${datasourceName}"`);
+        spinnerDatasources.failed(`No datasource found with name "${datasourceName}"`);
         return;
       }
       datasources = [datasource];
     } else {
       datasources = await fetchDatasources(space);
       if (!datasources || datasources.length === 0) {
-        konsola.warn(`No datasources found in the space ${space}`);
+        spinnerDatasources.failed(`No datasources found in the space ${space}`);
         return;
       }
     }
@@ -6237,6 +6256,8 @@ pullCmd$2.action(async (datasourceName, options, command) => {
     spinnerDatasources.failed(`Fetching ${chalk.hex(colorPalette.DATASOURCES)("Datasources")} - Failed`);
     konsola.br();
     handleError(error, verbose);
+  } finally {
+    logger.info("Pulling datasources finished", { space, datasourceName });
   }
 });
 
@@ -6254,6 +6275,8 @@ pushCmd$2.action(async (datasourceName, options, command) => {
     handleError(new CommandError(`Please provide the target space as argument --space TARGET_SPACE_ID.`), verbose);
     return;
   }
+  const logger = getLogger();
+  logger.info("Pushing datasources started", { space, fromSpace, datasourceName, filter });
   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();
   try {
@@ -6297,26 +6320,44 @@ pushCmd$2.action(async (datasourceName, options, command) => {
       successful: [],
       failed: []
     };
+    const ui = getUI();
     for (const datasource of spaceState.local.datasources) {
-      const spinner = new Spinner({
-        verbose: !isVitest
-      });
-      spinner.start(`Pushing ${chalk.hex(colorPalette.DATASOURCES)(datasource.name)}`);
+      const spinner = ui.createSpinner(`Pushing ${chalk.hex(colorPalette.DATASOURCES)(datasource.name)}`);
       const existingDatasource = spaceState.target.datasources.get(datasource.name);
       const existingId = existingDatasource?.id;
       const { entries, ...datasourceDefinition } = datasource;
       const result = await upsertDatasource(space, datasourceDefinition, existingId);
       if (result) {
         results.successful.push(datasource.name);
-        if (entries && entries.length > 0) {
-          for (const entry of entries) {
-            const existingEntryId = existingDatasource?.entries?.find((e) => e.name === entry.name)?.id;
-            try {
-              await upsertDatasourceEntry(space, result.id, entry, existingEntryId);
-            } catch (entryError) {
-              results.failed.push({ name: datasource.name, error: entryError });
-              spinner.failed(`${chalk.hex(colorPalette.DATASOURCES)(datasource.name)} - Failed in ${spinner.elapsedTime.toFixed(2)}ms`);
-            }
+        const localEntries = entries ?? [];
+        const existingEntries = existingDatasource?.entries ?? [];
+        const existingEntryMap = new Map(existingEntries.map((e, idx) => [e.name, { entry: e, position: idx + 1 }]));
+        for (let i = 0; i < localEntries.length; i++) {
+          const entry = localEntries[i];
+          const existing = existingEntryMap.get(entry.name);
+          const existingEntryId = existing?.entry.id;
+          const targetPosition = i + 1;
+          if (existing && existing.entry.value === entry.value && existing.entry.dimension_value === entry.dimension_value && existing.position === targetPosition) {
+            logger.info("Skipped datasource entry (unchanged)", { datasource: datasource.name, entry: entry.name, position: targetPosition });
+            continue;
+          }
+          try {
+            await upsertDatasourceEntry(space, result.id, entry, existingEntryId, i + 1);
+            logger.info(existingEntryId ? "Updated datasource entry" : "Created datasource entry", { datasource: datasource.name, entry: entry.name, position: i + 1 });
+          } catch (entryError) {
+            results.failed.push({ name: datasource.name, error: entryError });
+            spinner.failed(`${chalk.hex(colorPalette.DATASOURCES)(datasource.name)} - Failed in ${spinner.elapsedTime.toFixed(2)}ms`);
+          }
+        }
+        const localEntryNames = new Set(localEntries.map((e) => e.name));
+        const staleEntries = existingEntries.filter((e) => !localEntryNames.has(e.name));
+        for (const stale of staleEntries) {
+          try {
+            await deleteDatasourceEntry(space, stale.id);
+            logger.info("Deleted datasource entry", { datasource: datasource.name, entry: stale.name, entryId: stale.id });
+          } catch (entryError) {
+            results.failed.push({ name: datasource.name, error: entryError });
+            spinner.failed(`${chalk.hex(colorPalette.DATASOURCES)(datasource.name)} - Failed in ${spinner.elapsedTime.toFixed(2)}ms`);
           }
         }
         spinner.succeed(`${chalk.hex(colorPalette.DATASOURCES)(datasource.name)} - Completed in ${spinner.elapsedTime.toFixed(2)}ms`);
@@ -6337,6 +6378,8 @@ pushCmd$2.action(async (datasourceName, options, command) => {
     }
   } catch (error) {
     handleError(error, verbose);
+  } finally {
+    logger.info("Pushing datasources finished", { space, fromSpace });
   }
 });
 
@@ -6376,14 +6419,14 @@ deleteCmd.action(async (name, options, command) => {
     handleError(new CommandError("Please provide the space as argument --space YOUR_SPACE_ID."), verbose);
     return;
   }
-  const spinner = new Spinner({
-    verbose: !isVitest
-  });
+  const ui = getUI();
+  const logger = getLogger();
+  logger.info("Deleting datasource started", { space, name, id: options.id });
   try {
     if (options.id) {
-      spinner.start(`Deleting datasource...`);
+      const spinner = ui.createSpinner(`Deleting datasource...`);
       await deleteDatasource(space, options.id);
-      spinner.succeed();
+      spinner.succeed(`Datasource deleted`);
       konsola.ok(`Datasource ${chalk.hex(colorPalette.DATASOURCES)(options.id)} deleted successfully from space ${space}.`);
     } else {
       const datasource = await fetchDatasource(space, name);
@@ -6404,21 +6447,19 @@ deleteCmd.action(async (name, options, command) => {
           default: false
         });
         if (!confirmed) {
-          spinner.failed("Deletion aborted by user.");
           konsola.warn("Deletion aborted by user.");
           return;
         }
       }
-      spinner.start(`Deleting datasource...`);
+      const spinner = ui.createSpinner(`Deleting datasource...`);
       await deleteDatasource(space, datasource.id.toString());
-      spinner.succeed();
+      spinner.succeed(`Datasource deleted`);
       konsola.ok(`Datasource ${chalk.hex(colorPalette.DATASOURCES)(name)} deleted successfully from space ${space}.`);
     }
   } catch (error) {
-    spinner.failed(
-      `Failed to delete datasource ${chalk.hex(colorPalette.DATASOURCES)(options.id ? options.id : name)}`
-    );
     handleError(error, verbose);
+  } finally {
+    logger.info("Deleting datasource finished", { space, name, id: options.id });
   }
 });
 
@@ -9164,7 +9205,7 @@ pushCmd.action(async (options, command) => {
       })
     );
   } catch (maybeError) {
-    handleError(toError(maybeError));
+    handleError(toError(maybeError), verbose);
   } finally {
     logger.info("Pushing stories finished", summary);
     ui.stopAllProgressBars();