storyblok 4.2.2 → 4.3.1

package/dist/index.mjs

@@ -11,6 +11,7 @@ import fs, { mkdir, writeFile, readFile as readFile$1, access, readdir } from 'n
 import path, { join, parse, resolve } from 'node:path';
 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';
@@ -1019,8 +1020,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) => {
@@ -2916,7 +2939,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 +2984,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 +3057,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 +3070,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 +3083,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 +3095,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 +3434,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 +3462,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 +3476,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 +3548,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 +3620,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 +4046,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 +4059,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 +4118,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 +4137,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) : {};
@@ -4308,7 +4321,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 +4364,7 @@ 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 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) => {
@@ -4872,7 +4885,7 @@ program$1.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
   konsola.br();
 });
 
-const version = "4.2.2";
+const version = "4.3.1";
 const pkg = {
 	version: version};
 
@@ -4887,7 +4900,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);