storyblok 4.2.2 → 4.3.2

package/dist/index.mjs

@@ -9,8 +9,10 @@ import { Spinner } from '@topcli/spinner';
 import { select, password, input, confirm } from '@inquirer/prompts';
 import fs, { mkdir, writeFile, readFile as readFile$1, access, readdir } from 'node:fs/promises';
 import path, { join, parse, resolve } from 'node:path';
+import filenamify from 'filenamify';
 import { exec, spawn } from 'node:child_process';
 import { promisify } from 'node:util';
+import { getRegion } from '@storyblok/region-helper';
 import { minimatch } from 'minimatch';
 import { hash } from 'ohash';
 import { compile } from 'json-schema-to-typescript';
@@ -613,6 +615,11 @@ const resolvePath = (path, folder) => {
 const getComponentNameFromFilename = (filename) => {
   return filename.replace(/\.js$/, "");
 };
+const sanitizeFilename = (filename) => {
+  return filenamify(filename, {
+    replacement: "_"
+  });
+};
 async function readJsonFile(filePath) {
   try {
     const content = (await readFile(filePath)).toString();
@@ -1019,8 +1026,30 @@ program$f.command(commands.USER).description("Get the current user").action(asyn
   konsola.br();
 });
 
+function getRegionFromSpaceId(spaceId) {
+  try {
+    const region = getRegion(spaceId);
+    return region;
+  } catch (error) {
+    console.warn(`Failed to determine region from space ID: ${error}`);
+    return void 0;
+  }
+}
+const resolveRegion = async (thisCommand) => {
+  const options = thisCommand.opts();
+  const spaceId = options.space;
+  if (spaceId) {
+    const { state, initializeSession } = session();
+    await initializeSession();
+    const detectedRegion = getRegionFromSpaceId(spaceId);
+    if (detectedRegion) {
+      state.region = detectedRegion;
+    }
+  }
+};
+
 const program$e = getProgram();
-const componentsCommand = program$e.command(commands.COMPONENTS).alias("comp").description(`Manage your space's block schema`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/components");
+const componentsCommand = program$e.command(commands.COMPONENTS).alias("comp").description(`Manage your space's block schema`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/components").hook("preAction", resolveRegion);
 
 let instance = null;
 const createMapiClient = (options) => {
@@ -1223,11 +1252,12 @@ const saveComponentsToFiles = async (space, spaceData, options) => {
   try {
     if (separateFiles) {
       for (const component of components) {
-        const componentFilePath = join(resolvedPath, suffix ? `${component.name}.${suffix}.json` : `${component.name}.json`);
+        const sanitizedName = sanitizeFilename(component.name);
+        const componentFilePath = join(resolvedPath, suffix ? `${sanitizedName}.${suffix}.json` : `${sanitizedName}.json`);
         await saveToFile(componentFilePath, JSON.stringify(component, null, 2));
         const componentPresets = presets.filter((preset) => preset.component_id === component.id);
         if (componentPresets.length > 0) {
-          const presetsFilePath = join(resolvedPath, suffix ? `${component.name}.presets.${suffix}.json` : `${component.name}.presets.json`);
+          const presetsFilePath = join(resolvedPath, suffix ? `${sanitizedName}.presets.${suffix}.json` : `${sanitizedName}.presets.json`);
           await saveToFile(presetsFilePath, JSON.stringify(componentPresets, null, 2));
         }
         const groupsFilePath = join(resolvedPath, suffix ? `groups.${suffix}.json` : `groups.json`);
@@ -1569,153 +1599,6 @@ componentsCommand.command("pull [componentName]").option("-f, --filename <filena
   }
 });
 
-const pushDatasource = async (space, datasource) => {
-  try {
-    const client = mapiClient();
-    const { data } = await client.post(`spaces/${space}/datasources`, {
-      body: JSON.stringify(datasource)
-    });
-    return data.datasource;
-  } catch (error) {
-    handleAPIError("push_datasource", error, `Failed to push datasource ${datasource.name}`);
-  }
-};
-const updateDatasource = async (space, datasourceId, datasource) => {
-  try {
-    const client = mapiClient();
-    const { data } = await client.put(`spaces/${space}/datasources/${datasourceId}`, {
-      body: JSON.stringify(datasource)
-    });
-    return data.datasource;
-  } catch (error) {
-    handleAPIError("update_datasource", error, `Failed to update datasource ${datasource.name}`);
-  }
-};
-const upsertDatasource = async (space, datasource, existingId) => {
-  if (existingId) {
-    return await updateDatasource(space, existingId, datasource);
-  } else {
-    return await pushDatasource(space, datasource);
-  }
-};
-const pushDatasourceEntry = async (space, datasourceId, entry) => {
-  try {
-    const client = mapiClient();
-    const { data } = await client.post(`spaces/${space}/datasource_entries`, {
-      body: JSON.stringify({
-        datasource_entry: {
-          ...entry,
-          datasource_id: datasourceId
-        }
-      })
-    });
-    return data.datasource_entry;
-  } catch (error) {
-    handleAPIError("push_datasource", error, `Failed to push datasource entry ${entry.name}`);
-  }
-};
-const updateDatasourceEntry = async (space, entryId, entry) => {
-  try {
-    const client = mapiClient();
-    await client.put(`spaces/${space}/datasource_entries/${entryId}`, {
-      body: JSON.stringify({
-        datasource_entry: entry
-      })
-    });
-  } catch (error) {
-    handleAPIError("update_datasource", error, `Failed to update datasource entry ${entry.name}`);
-  }
-};
-const upsertDatasourceEntry = async (space, datasourceId, entry, existingId) => {
-  if (existingId) {
-    await updateDatasourceEntry(space, existingId, entry);
-    return void 0;
-  } else {
-    return await pushDatasourceEntry(space, datasourceId, entry);
-  }
-};
-const readDatasourcesFiles = async (options) => {
-  const { from, path, separateFiles = false, suffix, space } = options;
-  const resolvedPath = resolvePath(path, `datasources/${from}`);
-  try {
-    await readdir(resolvedPath);
-  } catch (error) {
-    const message = `No local datasources found for space ${chalk.bold(from)}. To push datasources, you need to pull them first:
-
-1. Pull the datasources from your source space:
-   ${chalk.cyan(`storyblok datasources pull --space ${from}`)}
-
-2. Then try pushing again:
-   ${chalk.cyan(`storyblok datasources push --space ${space} --from ${from}`)}`;
-    throw new FileSystemError(
-      "file_not_found",
-      "read",
-      error,
-      message
-    );
-  }
-  if (separateFiles) {
-    return await readSeparateFiles(resolvedPath, suffix);
-  }
-  return await readConsolidatedFiles(resolvedPath, suffix);
-};
-async function readSeparateFiles(resolvedPath, suffix) {
-  const files = await readdir(resolvedPath);
-  const datasources = [];
-  const filteredFiles = files.filter((file) => {
-    if (suffix) {
-      return file.endsWith(`.${suffix}.json`);
-    } else {
-      return !/\.\w+\.json$/.test(file);
-    }
-  });
-  for (const file of filteredFiles) {
-    const filePath = join(resolvedPath, file);
-    if (file.endsWith(".json") || file.endsWith(`${suffix}.json`)) {
-      if (file === "datasources.json" || /^datasources\.\w+\.json$/.test(file)) {
-        continue;
-      }
-      const result = await readJsonFile(filePath);
-      if (result.error) {
-        handleFileSystemError("read", result.error);
-        continue;
-      }
-      datasources.push(...result.data);
-    }
-  }
-  return {
-    datasources
-  };
-}
-async function readConsolidatedFiles(resolvedPath, suffix) {
-  const datasourcesPath = join(resolvedPath, suffix ? `datasources.${suffix}.json` : "datasources.json");
-  const datasourcesResult = await readJsonFile(datasourcesPath);
-  if (datasourcesResult.error || !datasourcesResult.data.length) {
-    throw new FileSystemError(
-      "file_not_found",
-      "read",
-      datasourcesResult.error || new Error("Datasources file is empty"),
-      `No datasources found in ${datasourcesPath}. Please make sure you have pulled the datasources first.`
-    );
-  }
-  return {
-    datasources: datasourcesResult.data
-  };
-}
-
-function createStubDatasource(name) {
-  return {
-    id: 0,
-    // Will be set by API
-    name,
-    slug: name,
-    dimensions: [],
-    entries: [],
-    // Empty entries for stub
-    created_at: (/* @__PURE__ */ new Date()).toISOString(),
-    updated_at: (/* @__PURE__ */ new Date()).toISOString()
-  };
-}
 function buildDependencyGraph(context) {
   const { spaceState } = context;
   const graph = { nodes: /* @__PURE__ */ new Map() };
@@ -1727,22 +1610,6 @@ function buildDependencyGraph(context) {
       dependency.dependents.add(dependentId);
     }
   }
-  const referencedDatasources = /* @__PURE__ */ new Set();
-  spaceState.local.components.forEach((component) => {
-    if (component.schema) {
-      const dependencies = collectWhitelistDependencies(component.schema);
-      dependencies.datasourceNames.forEach((datasourceName) => {
-        referencedDatasources.add(datasourceName);
-      });
-    }
-  });
-  referencedDatasources.forEach((datasourceName) => {
-    const nodeId = `datasource:${datasourceName}`;
-    const targetDatasource = spaceState.target.datasources?.get(datasourceName);
-    const stubDatasource = createStubDatasource(datasourceName);
-    const node = new DatasourceNode(nodeId, stubDatasource, targetDatasource);
-    graph.nodes.set(nodeId, node);
-  });
   spaceState.local.internalTags.forEach((tag) => {
     const nodeId = `tag:${tag.id}`;
     const targetTag = spaceState.target.tags.get(tag.name);
@@ -1818,10 +1685,6 @@ function buildDependencyGraph(context) {
         const dependencyId = `component:${componentName}`;
         addDependency(componentId, dependencyId);
       });
-      dependencies.datasourceNames.forEach((datasourceName) => {
-        const datasourceId = `datasource:${datasourceName}`;
-        addDependency(componentId, datasourceId);
-      });
     }
   });
   spaceState.local.presets.forEach((preset) => {
@@ -2204,15 +2067,6 @@ class ComponentNode extends GraphNode {
           });
         }
       }
-      if ((resolvedField.type === "option" || resolvedField.type === "options") && resolvedField.source === "internal") {
-        if (resolvedField.datasource_slug && typeof resolvedField.datasource_slug === "string") {
-          const datasourceNodeId = `datasource:${resolvedField.datasource_slug}`;
-          const datasourceNode = graph.nodes.get(datasourceNodeId);
-          if (datasourceNode?.targetData) {
-            resolvedField.datasource_slug = datasourceNode.targetData.resource.slug;
-          }
-        }
-      }
       Object.keys(resolvedField).forEach((key) => {
         if (typeof resolvedField[key] === "object" && resolvedField[key] !== null) {
           resolvedField[key] = resolveField(resolvedField[key]);
@@ -2284,23 +2138,6 @@ class PresetNode {
     };
   }
 }
-class DatasourceNode extends GraphNode {
-  constructor(id, data, targetDatasource) {
-    super(id, "datasource", data.name, data, targetDatasource);
-  }
-  resolveReferences(_graph) {
-  }
-  async upsert(space) {
-    const existingDatasource = this.targetData?.resource;
-    const existingId = existingDatasource?.id;
-    const { entries, ...datasourceDefinition } = this.sourceData;
-    const result = await upsertDatasource(space, datasourceDefinition, existingId);
-    if (!result) {
-      throw new Error(`Failed to upsert datasource ${this.name}`);
-    }
-    return result;
-  }
-}
 
 function collectAllDependencies(components, allComponents, allGroups, allTags) {
   const requiredComponents = /* @__PURE__ */ new Set();
@@ -2701,63 +2538,6 @@ async function pushWithDependencyGraph(space, spaceState, maxConcurrency = 5) {
   return results;
 }
 
-const fetchDatasourceEntries = async (space, datasourceId) => {
-  try {
-    const client = mapiClient();
-    const { data } = await client.get(`spaces/${space}/datasource_entries?datasource_id=${datasourceId}`);
-    return data.datasource_entries;
-  } catch (error) {
-    handleAPIError("pull_datasources", error);
-  }
-};
-const fetchDatasources = async (space) => {
-  try {
-    const client = mapiClient();
-    const { data } = await client.get(`spaces/${space}/datasources`);
-    const datasources = data.datasources;
-    const datasourcesWithEntries = await Promise.all(
-      datasources.map(async (ds) => {
-        const entries = await fetchDatasourceEntries(space, ds.id);
-        return { ...ds, entries };
-      })
-    );
-    return datasourcesWithEntries;
-  } catch (error) {
-    handleAPIError("pull_datasources", error);
-  }
-};
-const fetchDatasource = async (space, datasourceName) => {
-  try {
-    const client = mapiClient();
-    const { data } = await client.get(`spaces/${space}/datasources?search=${encodeURIComponent(datasourceName)}`);
-    const found = data.datasources?.find((d) => d.name === datasourceName);
-    if (!found) {
-      return void 0;
-    }
-    const entries = await fetchDatasourceEntries(space, found.id);
-    return { ...found, entries };
-  } catch (error) {
-    handleAPIError("pull_datasources", error, `Failed to fetch datasource ${datasourceName}`);
-  }
-};
-const saveDatasourcesToFiles = async (space, datasources, options) => {
-  const { filename = "datasources", suffix, path, separateFiles } = options;
-  const resolvedPath = path ? resolve(process.cwd(), path, "datasources", space) : resolvePath(path, `datasources/${space}`);
-  try {
-    if (separateFiles) {
-      for (const datasource of datasources) {
-        const datasourceFilePath = join(resolvedPath, suffix ? `${datasource.name}.${suffix}.json` : `${datasource.name}.json`);
-        await saveToFile(datasourceFilePath, JSON.stringify(datasource, null, 2));
-      }
-      return;
-    }
-    const datasourcesFilePath = join(resolvedPath, suffix ? `${filename}.${suffix}.json` : `${filename}.json`);
-    await saveToFile(datasourcesFilePath, JSON.stringify(datasources, null, 2));
-  } catch (error) {
-    handleFileSystemError("write", error);
-  }
-};
-
 const program$c = getProgram();
 componentsCommand.command("push [componentName]").description(`Push your space's components schema as json`).option("-f, --from <from>", "source space id").option("--fi, --filter <filter>", "glob filter to apply to the components before pushing").option("--sf, --separate-files", "Read from separate files instead of consolidated files").option("--su, --suffix <suffix>", "Suffix to add to the component name").action(async (componentName, options) => {
   konsola.title(`${commands.COMPONENTS}`, colorPalette.COMPONENTS, componentName ? `Pushing component ${componentName}...` : "Pushing components...");
@@ -2811,10 +2591,9 @@ componentsCommand.command("push [componentName]").description(`Push your space's
       fetchComponents(space),
       fetchComponentGroups(space),
       fetchComponentPresets(space),
-      fetchComponentInternalTags(space),
-      fetchDatasources(space)
+      fetchComponentInternalTags(space)
     ];
-    const [components, groups, presets, internalTags, datasources] = await Promise.all(promises);
+    const [components, groups, presets, internalTags] = await Promise.all(promises);
     if (components) {
       components.forEach((component) => {
         spaceState.target.components.set(component.name, component);
@@ -2839,11 +2618,6 @@ componentsCommand.command("push [componentName]").description(`Push your space's
         spaceState.target.tags.set(tag.name, tag);
       });
     }
-    if (datasources) {
-      datasources.forEach((datasource) => {
-        spaceState.target.datasources.set(datasource.name, datasource);
-      });
-    }
     if (componentName) {
       spaceState.local = filterSpaceDataByComponent(spaceState.local, componentName);
       if (!spaceState.local.components.length) {
@@ -2881,6 +2655,26 @@ componentsCommand.command("push [componentName]").description(`Push your space's
       }
     }
     console.log(`${requestCount} requests made`);
+    const referencedDatasources = /* @__PURE__ */ new Set();
+    spaceState.local.components.forEach((component) => {
+      if (component.schema) {
+        const fields = JSON.stringify(component.schema);
+        const datasourceMatches = fields.match(/"datasource_slug"\s*:\s*"([^"]+)"/g);
+        if (datasourceMatches) {
+          datasourceMatches.forEach((match) => {
+            const slug = match.match(/"([^"]+)"$/)?.[1];
+            if (slug) {
+              referencedDatasources.add(slug);
+            }
+          });
+        }
+      }
+    });
+    if (referencedDatasources.size > 0) {
+      konsola.br();
+      konsola.info(`Components reference datasources: ${chalk.yellow(Array.from(referencedDatasources).join(", "))}`);
+      konsola.info(`To manage datasources, use: ${chalk.cyan("storyblok datasources push")}`);
+    }
   } catch (error) {
     handleError(error, verbose);
   }
@@ -2916,7 +2710,7 @@ const saveLanguagesToFile = async (space, internationalizationOptions, options)
 };
 
 const program$b = getProgram();
-const languagesCommand = program$b.command(commands.LANGUAGES).alias("lang").description(`Manage your space's languages`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/languages");
+const languagesCommand = program$b.command(commands.LANGUAGES).alias("lang").description(`Manage your space's languages`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/languages").hook("preAction", resolveRegion);
 languagesCommand.command("pull").description(`Download your space's languages schema as json`).option("-f, --filename <filename>", "filename to save the file as <filename>.<suffix>.json").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. languages.<suffix>.json). By default, the space ID is used.").action(async (options) => {
   konsola.title(`${commands.LANGUAGES}`, colorPalette.LANGUAGES);
   const verbose = program$b.opts().verbose;
@@ -2961,7 +2755,7 @@ languagesCommand.command("pull").description(`Download your space's languages sc
 });
 
 const program$a = getProgram();
-const migrationsCommand = program$a.command(commands.MIGRATIONS).alias("mig").description(`Manage your space's migrations`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/migrations");
+const migrationsCommand = program$a.command(commands.MIGRATIONS).alias("mig").description(`Manage your space's migrations`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/migrations").hook("preAction", resolveRegion);
 
 const getMigrationTemplate = () => {
   return `export default function (block) {
@@ -3034,9 +2828,9 @@ migrationsCommand.command("generate [componentName]").description("Generate a mi
   }
 });
 
-const fetchStories = async (space, token, region, params) => {
+const fetchStories = async (space, params) => {
   try {
-    const url = getStoryblokUrl(region);
+    const client = mapiClient();
     const allStories = [];
     let currentPage = 1;
     let hasMorePages = true;
@@ -3047,14 +2841,10 @@ const fetchStories = async (space, token, region, params) => {
         ...currentPage > 1 && { page: currentPage.toString() }
       }).toString();
       const queryString = filter_query ? `${regularParams ? `${regularParams}&` : ""}${filter_query}` : regularParams;
-      const endpoint = `${url}/spaces/${space}/stories${queryString ? `?${queryString}` : ""}`;
-      const response = await customFetch(endpoint, {
-        headers: {
-          Authorization: token
-        }
-      });
-      allStories.push(...response.stories);
-      const totalPages = Math.ceil(response.total / response.perPage);
+      const endpoint = `spaces/${space}/stories${queryString ? `?${queryString}` : ""}`;
+      const { data } = await client.get(endpoint, {});
+      allStories.push(...data.stories);
+      const totalPages = Math.ceil(data.total / data.per_page);
       hasMorePages = currentPage < totalPages;
       currentPage++;
     }
@@ -3064,7 +2854,7 @@ const fetchStories = async (space, token, region, params) => {
   }
 };
 async function fetchStoriesByComponent(spaceOptions, filterOptions) {
-  const { spaceId, token, region } = spaceOptions;
+  const { spaceId } = spaceOptions;
   const { componentName = "", query, starts_with } = filterOptions || {};
   const params = {
     ...starts_with && { starts_with }
@@ -3076,39 +2866,30 @@ async function fetchStoriesByComponent(spaceOptions, filterOptions) {
     params.filter_query = query.startsWith("filter_query") ? query : `filter_query${query}`;
   }
   try {
-    const stories = await fetchStories(spaceId, token, region, params);
+    const stories = await fetchStories(spaceId, params);
     return stories ?? [];
   } catch (error) {
     handleAPIError("pull_stories", error);
   }
 }
-const fetchStory = async (space, token, region, storyId) => {
+const fetchStory = async (space, storyId) => {
   try {
-    const url = getStoryblokUrl(region);
-    const endpoint = `${url}/spaces/${space}/stories/${storyId}`;
-    const response = await customFetch(endpoint, {
-      headers: {
-        Authorization: token
-      }
-    });
-    return response.story;
+    const client = mapiClient();
+    const endpoint = `spaces/${space}/stories/${storyId}`;
+    const { data } = await client.get(endpoint, {});
+    return data.story;
   } catch (error) {
     handleAPIError("pull_story", error);
   }
 };
-const updateStory = async (space, token, region, storyId, payload) => {
+const updateStory = async (space, storyId, payload) => {
   try {
-    const url = getStoryblokUrl(region);
-    const endpoint = `${url}/spaces/${space}/stories/${storyId}`;
-    const response = await customFetch(endpoint, {
-      method: "PUT",
-      headers: {
-        "Authorization": token,
-        "Content-Type": "application/json"
-      },
+    const client = mapiClient();
+    const endpoint = `spaces/${space}/stories/${storyId}`;
+    const { data } = await client.put(endpoint, {
       body: JSON.stringify(payload)
     });
-    return response.story;
+    return data.story;
   } catch (error) {
     handleAPIError("update_story", error);
   }
@@ -3424,6 +3205,10 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
     return;
   }
   const { password, region } = state;
+  mapiClient({
+    token: password,
+    region
+  });
   try {
     const spinner = new Spinner({
       verbose: !isVitest
@@ -3448,9 +3233,7 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
     const storiesSpinner = new Spinner({ verbose: !isVitest }).start(`Fetching stories...`);
     const stories = await fetchStoriesByComponent(
       {
-        spaceId: space,
-        token: password,
-        region
+        spaceId: space
       },
       // Filter options
       {
@@ -3464,7 +3247,7 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
       return;
     }
     const storiesWithContent = await Promise.all(stories.map(async (story) => {
-      const fullStory = await fetchStory(space, password, region, story.id.toString());
+      const fullStory = await fetchStory(space, story.id.toString());
       return {
         ...story,
         content: fullStory?.content
@@ -3536,7 +3319,7 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
             payload.publish = 1;
           }
           try {
-            const updatedStory = await updateStory(space, password, region, story.id, payload);
+            const updatedStory = await updateStory(space, story.id, payload);
             if (updatedStory) {
               successCount++;
               storySpinner.succeed(`Updated story ${chalk.hex(colorPalette.PRIMARY)(story.name || story.id.toString())} - Completed in ${storySpinner.elapsedTime.toFixed(2)}ms`);
@@ -3608,7 +3391,7 @@ migrationsCommand.command("rollback [migrationFile]").description("Rollback a mi
 });
 
 const program$6 = getProgram();
-const typesCommand = program$6.command(commands.TYPES).alias("ts").description(`Generate types d.ts for your component schemas`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/types");
+const typesCommand = program$6.command(commands.TYPES).alias("ts").description(`Generate types d.ts for your component schemas`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/types").hook("preAction", resolveRegion);
 
 const getAssetJSONSchema = (title) => ({
   $id: "#/asset",
@@ -4034,7 +3817,7 @@ const DEFAULT_TYPEDEFS_HEADER = [
   "// This file was generated by the storyblok CLI.",
   "// DO NOT MODIFY THIS FILE BY HAND."
 ];
-const getPropertyTypeAnnotation = (property, prefix) => {
+const getPropertyTypeAnnotation = (property, prefix, suffix) => {
   if (Array.from(storyblokSchemas.keys()).includes(property.type)) {
     return { type: property.type };
   }
@@ -4047,11 +3830,11 @@ const getPropertyTypeAnnotation = (property, prefix) => {
     if (property.filter_content_type) {
       if (typeof property.filter_content_type === "string") {
         return {
-          tsType: `(${getStoryType(property.filter_content_type, prefix)} | string )${property.type === "options" ? "[]" : ""}`
+          tsType: `(${getStoryType(property.filter_content_type, prefix, suffix)} | string )${property.type === "options" ? "[]" : ""}`
         };
       }
       return {
-        tsType: `(${property.filter_content_type.map((type2) => getStoryType(type2, prefix)).join(" | ")} | string )${property.type === "options" ? "[]" : ""}`
+        tsType: `(${property.filter_content_type.map((type2) => getStoryType(type2, prefix, suffix)).join(" | ")} | string )${property.type === "options" ? "[]" : ""}`
       };
     }
   }
@@ -4106,13 +3889,14 @@ const getPropertyTypeAnnotation = (property, prefix) => {
       return { type: "any" };
   }
 };
-function getStoryType(property, prefix) {
-  return `${STORY_TYPE}<${prefix ?? ""}${capitalize(toCamelCase(property))}>`;
+function getStoryType(property, prefix, suffix) {
+  return `${STORY_TYPE}<${prefix ?? ""}${capitalize(toCamelCase(property))}${suffix ?? ""}>`;
 }
 const getComponentType = (componentName, options) => {
   const prefix = options.typePrefix ?? "";
+  const suffix = options.typeSuffix ?? "";
   const sanitizedName = componentName.replace(/[^a-z0-9]/gi, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, "");
-  const componentType = toPascalCase(toCamelCase(`${prefix}_${sanitizedName}`));
+  const componentType = toPascalCase(toCamelCase(`${prefix}_${sanitizedName}_${suffix}`));
   const isFirstCharacterNumber = !Number.isNaN(Number.parseInt(componentType.charAt(0)));
   return isFirstCharacterNumber ? `_${componentType}` : componentType;
 };
@@ -4124,7 +3908,7 @@ const getComponentPropertiesTypeAnnotations = async (component, options, spaceDa
     }
     const propertyType = value.type;
     const propertyTypeAnnotation = {
-      [key]: getPropertyTypeAnnotation(value, options.typePrefix)
+      [key]: getPropertyTypeAnnotation(value, options.typePrefix, options.typeSuffix)
     };
     if (propertyType === "custom" && customFieldsParser) {
       const customField = typeof customFieldsParser === "function" ? customFieldsParser(key, value) : {};
@@ -4163,6 +3947,15 @@ const getComponentPropertiesTypeAnnotations = async (component, options, spaceDa
             );
             propertyTypeAnnotation[key].tsType = componentsInGroupWhitelist.length > 0 ? `(${componentsInGroupWhitelist.join(" | ")})[]` : `never[]`;
           }
+        } else if (value.restrict_type === "tags") {
+          if (Array.isArray(value.component_tag_whitelist) && value.component_tag_whitelist.length > 0) {
+            const componentsWithTags = spaceData.components.filter(
+              (component2) => component2.internal_tag_ids && component2.internal_tag_ids.some(
+                (tagId) => value.component_tag_whitelist.includes(Number(tagId))
+              )
+            );
+            propertyTypeAnnotation[key].tsType = componentsWithTags.length > 0 ? `(${componentsWithTags.map((component2) => getComponentType(component2.name, options)).join(" | ")})[]` : `never[]`;
+          }
         } else {
           if (Array.isArray(value.component_whitelist) && value.component_whitelist.length > 0) {
             propertyTypeAnnotation[key].tsType = `(${value.component_whitelist.map((name) => getComponentType(name, options)).join(" | ")})[]`;
@@ -4308,7 +4101,7 @@ const generateStoryblokTypes = async (options = {}) => {
 };
 
 const program$5 = getProgram();
-typesCommand.command("generate").description("Generate types d.ts for your component schemas").option("--sf, --separate-files", "").option("--strict", "strict mode, no loose typing").option("--type-prefix <prefix>", "prefix to be prepended to all generated component type names").option("--suffix <suffix>", "Components suffix").option("--custom-fields-parser <path>", "Path to the parser file for Custom Field Types").option("--compiler-options <options>", "path to the compiler options from json-schema-to-typescript").action(async (options) => {
+typesCommand.command("generate").description("Generate types d.ts for your component schemas").option("--sf, --separate-files", "").option("--strict", "strict mode, no loose typing").option("--type-prefix <prefix>", "prefix to be prepended to all generated component type names").option("--type-suffix <suffix>", "suffix to be appended to all generated component type names").option("--suffix <suffix>", "Components suffix").option("--custom-fields-parser <path>", "Path to the parser file for Custom Field Types").option("--compiler-options <options>", "path to the compiler options from json-schema-to-typescript").action(async (options) => {
   konsola.title(`${commands.TYPES}`, colorPalette.TYPES, "Generating types...");
   const verbose = program$5.opts().verbose;
   const { space, path } = typesCommand.opts();
@@ -4351,7 +4144,65 @@ typesCommand.command("generate").description("Generate types d.ts for your compo
 });
 
 const program$4 = getProgram();
-const datasourcesCommand = program$4.command(commands.DATASOURCES).alias("ds").description(`Manage your space's datasources`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/datasources");
+const datasourcesCommand = program$4.command(commands.DATASOURCES).alias("ds").description(`Manage your space's datasources`).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path to save the file. Default is .storyblok/datasources").hook("preAction", resolveRegion);
+
+const fetchDatasourceEntries = async (space, datasourceId) => {
+  try {
+    const client = mapiClient();
+    const { data } = await client.get(`spaces/${space}/datasource_entries?datasource_id=${datasourceId}`);
+    return data.datasource_entries;
+  } catch (error) {
+    handleAPIError("pull_datasources", error);
+  }
+};
+const fetchDatasources = async (space) => {
+  try {
+    const client = mapiClient();
+    const { data } = await client.get(`spaces/${space}/datasources`);
+    const datasources = data.datasources;
+    const datasourcesWithEntries = await Promise.all(
+      datasources.map(async (ds) => {
+        const entries = await fetchDatasourceEntries(space, ds.id);
+        return { ...ds, entries };
+      })
+    );
+    return datasourcesWithEntries;
+  } catch (error) {
+    handleAPIError("pull_datasources", error);
+  }
+};
+const fetchDatasource = async (space, datasourceName) => {
+  try {
+    const client = mapiClient();
+    const { data } = await client.get(`spaces/${space}/datasources?search=${encodeURIComponent(datasourceName)}`);
+    const found = data.datasources?.find((d) => d.name === datasourceName);
+    if (!found) {
+      return void 0;
+    }
+    const entries = await fetchDatasourceEntries(space, found.id);
+    return { ...found, entries };
+  } catch (error) {
+    handleAPIError("pull_datasources", error, `Failed to fetch datasource ${datasourceName}`);
+  }
+};
+const saveDatasourcesToFiles = async (space, datasources, options) => {
+  const { filename = "datasources", suffix, path, separateFiles } = options;
+  const resolvedPath = path ? resolve(process.cwd(), path, "datasources", space) : resolvePath(path, `datasources/${space}`);
+  try {
+    if (separateFiles) {
+      for (const datasource of datasources) {
+        const sanitizedName = sanitizeFilename(datasource.name);
+        const datasourceFilePath = join(resolvedPath, suffix ? `${sanitizedName}.${suffix}.json` : `${sanitizedName}.json`);
+        await saveToFile(datasourceFilePath, JSON.stringify(datasource, null, 2));
+      }
+      return;
+    }
+    const datasourcesFilePath = join(resolvedPath, suffix ? `${filename}.${suffix}.json` : `${filename}.json`);
+    await saveToFile(datasourcesFilePath, JSON.stringify(datasources, null, 2));
+  } catch (error) {
+    handleFileSystemError("write", error);
+  }
+};
 
 const program$3 = getProgram();
 datasourcesCommand.command("pull [datasourceName]").option("-f, --filename <filename>", "custom name to be used in file(s) name instead of space id").option("--sf, --separate-files", "Argument to create a single file for each datasource").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. datasources.<suffix>.json)").description("Pull datasources from your space").action(async (datasourceName, options) => {
@@ -4423,6 +4274,140 @@ datasourcesCommand.command("pull [datasourceName]").option("-f, --filename <file
   }
 });
 
+const pushDatasource = async (space, datasource) => {
+  try {
+    const client = mapiClient();
+    const { data } = await client.post(`spaces/${space}/datasources`, {
+      body: JSON.stringify(datasource)
+    });
+    return data.datasource;
+  } catch (error) {
+    handleAPIError("push_datasource", error, `Failed to push datasource ${datasource.name}`);
+  }
+};
+const updateDatasource = async (space, datasourceId, datasource) => {
+  try {
+    const client = mapiClient();
+    const { data } = await client.put(`spaces/${space}/datasources/${datasourceId}`, {
+      body: JSON.stringify(datasource)
+    });
+    return data.datasource;
+  } catch (error) {
+    handleAPIError("update_datasource", error, `Failed to update datasource ${datasource.name}`);
+  }
+};
+const upsertDatasource = async (space, datasource, existingId) => {
+  if (existingId) {
+    return await updateDatasource(space, existingId, datasource);
+  } else {
+    return await pushDatasource(space, datasource);
+  }
+};
+const pushDatasourceEntry = async (space, datasourceId, entry) => {
+  try {
+    const client = mapiClient();
+    const { data } = await client.post(`spaces/${space}/datasource_entries`, {
+      body: JSON.stringify({
+        datasource_entry: {
+          ...entry,
+          datasource_id: datasourceId
+        }
+      })
+    });
+    return data.datasource_entry;
+  } catch (error) {
+    handleAPIError("push_datasource", error, `Failed to push datasource entry ${entry.name}`);
+  }
+};
+const updateDatasourceEntry = async (space, entryId, entry) => {
+  try {
+    const client = mapiClient();
+    await client.put(`spaces/${space}/datasource_entries/${entryId}`, {
+      body: JSON.stringify({
+        datasource_entry: entry
+      })
+    });
+  } catch (error) {
+    handleAPIError("update_datasource", error, `Failed to update datasource entry ${entry.name}`);
+  }
+};
+const upsertDatasourceEntry = async (space, datasourceId, entry, existingId) => {
+  if (existingId) {
+    await updateDatasourceEntry(space, existingId, entry);
+    return void 0;
+  } else {
+    return await pushDatasourceEntry(space, datasourceId, entry);
+  }
+};
+const readDatasourcesFiles = async (options) => {
+  const { from, path, separateFiles = false, suffix, space } = options;
+  const resolvedPath = resolvePath(path, `datasources/${from}`);
+  try {
+    await readdir(resolvedPath);
+  } catch (error) {
+    const message = `No local datasources found for space ${chalk.bold(from)}. To push datasources, you need to pull them first:
+
+1. Pull the datasources from your source space:
+   ${chalk.cyan(`storyblok datasources pull --space ${from}`)}
+
+2. Then try pushing again:
+   ${chalk.cyan(`storyblok datasources push --space ${space} --from ${from}`)}`;
+    throw new FileSystemError(
+      "file_not_found",
+      "read",
+      error,
+      message
+    );
+  }
+  if (separateFiles) {
+    return await readSeparateFiles(resolvedPath, suffix);
+  }
+  return await readConsolidatedFiles(resolvedPath, suffix);
+};
+async function readSeparateFiles(resolvedPath, suffix) {
+  const files = await readdir(resolvedPath);
+  const datasources = [];
+  const filteredFiles = files.filter((file) => {
+    if (suffix) {
+      return file.endsWith(`.${suffix}.json`);
+    } else {
+      return !/\.\w+\.json$/.test(file);
+    }
+  });
+  for (const file of filteredFiles) {
+    const filePath = join(resolvedPath, file);
+    if (file.endsWith(".json") || file.endsWith(`${suffix}.json`)) {
+      if (file === "datasources.json" || /^datasources\.\w+\.json$/.test(file)) {
+        continue;
+      }
+      const result = await readJsonFile(filePath);
+      if (result.error) {
+        handleFileSystemError("read", result.error);
+        continue;
+      }
+      datasources.push(...result.data);
+    }
+  }
+  return {
+    datasources
+  };
+}
+async function readConsolidatedFiles(resolvedPath, suffix) {
+  const datasourcesPath = join(resolvedPath, suffix ? `datasources.${suffix}.json` : "datasources.json");
+  const datasourcesResult = await readJsonFile(datasourcesPath);
+  if (datasourcesResult.error || !datasourcesResult.data.length) {
+    throw new FileSystemError(
+      "file_not_found",
+      "read",
+      datasourcesResult.error || new Error("Datasources file is empty"),
+      `No datasources found in ${datasourcesPath}. Please make sure you have pulled the datasources first.`
+    );
+  }
+  return {
+    datasources: datasourcesResult.data
+  };
+}
+
 const program$2 = getProgram();
 datasourcesCommand.command("push [datasourceName]").description(`Push your space's datasources schema as json`).option("-f, --from <from>", "source space id").option("--fi, --filter <filter>", "glob filter to apply to the datasources before pushing").option("--sf, --separate-files", "Read from separate files instead of consolidated files").option("--su, --suffix <suffix>", "Suffix to add to the datasource name").action(async (datasourceName, options) => {
   konsola.title(`${commands.DATASOURCES}`, colorPalette.DATASOURCES, datasourceName ? `Pushing datasource ${datasourceName}...` : "Pushing datasources...");
@@ -4872,7 +4857,7 @@ program$1.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
   konsola.br();
 });
 
-const version = "4.2.2";
+const version = "4.3.2";
 const pkg = {
 	version: version};
 
@@ -4887,7 +4872,8 @@ program.helpOption("-h, --help", "Display help for command");
 program.on("command:*", () => {
   console.error(`Invalid command: ${program.args.join(" ")}`);
   konsola.br();
-  program.help();
+  program.outputHelp();
+  process.exit(1);
 });
 try {
   program.parse(process.argv);