storyblok 4.6.2 → 4.6.4

package/dist/index.mjs

@@ -9,12 +9,11 @@ import { Spinner } from '@topcli/spinner';
 import { select, password, input, confirm } from '@inquirer/prompts';
 import { ManagementApiClient } from '@storyblok/management-api-client';
 import { RateLimit, Sema } from 'async-sema';
-import fs, { mkdir, writeFile, readFile as readFile$1, access, readdir } from 'node:fs/promises';
+import fs, { mkdir, writeFile, readFile as readFile$1, appendFile, 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 { Readable, pipeline, Transform, Writable } from 'node:stream';
 import { hash } from 'ohash';
@@ -669,6 +668,22 @@ const saveToFile = async (filePath, data, options) => {
     handleFileSystemError("write", writeError);
   }
 };
+const appendToFile = async (filePath, data, options) => {
+  const resolvedPath = parse(filePath).dir;
+  try {
+    await mkdir(resolvedPath, { recursive: true });
+  } catch (mkdirError) {
+    handleFileSystemError("mkdir", mkdirError);
+    return;
+  }
+  try {
+    const dataWithNewline = data.endsWith("\n") ? data : `${data}
+`;
+    await appendFile(filePath, dataWithNewline, options);
+  } catch (writeError) {
+    handleFileSystemError("write", writeError);
+  }
+};
 const readFile = async (filePath) => {
   try {
     return await readFile$1(filePath, "utf8");
@@ -1083,30 +1098,8 @@ 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").hook("preAction", resolveRegion);
+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 fetchComponents = async (spaceId) => {
   try {
@@ -2721,7 +2714,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").hook("preAction", resolveRegion);
+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");
 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;
@@ -2772,7 +2765,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").hook("preAction", resolveRegion);
+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 getMigrationTemplate = () => {
   return `export default function (block) {
@@ -2922,7 +2915,8 @@ async function* storiesIterator(spaceId, params, onTotal) {
     const result = await fetchStories(spaceId, {
       ...transformedParams,
       per_page: perPage,
-      page: 1
+      page: 1,
+      story_only: true
     });
     if (!result) {
       return;
@@ -2938,7 +2932,8 @@ async function* storiesIterator(spaceId, params, onTotal) {
       const result2 = await fetchStories(spaceId, {
         ...transformedParams,
         per_page: perPage,
-        page
+        page,
+        story_only: true
       });
       if (!result2) {
         return;
@@ -3069,69 +3064,58 @@ async function getMigrationFunction(fileName, space, basePath) {
   }
 }
 function applyMigrationToAllBlocks(content, migrationFunction, targetComponent) {
+  let processed = false;
   if (!content || typeof content !== "object") {
-    return false;
+    return processed;
   }
-  let modified = false;
   const baseTargetComponent = targetComponent.split(".")[0];
+  let migratedContent = null;
   if (content.component === baseTargetComponent) {
-    const migratedContent = migrationFunction({ ...content });
-    Object.assign(content, migratedContent);
-    modified = true;
+    migratedContent = migrationFunction({ ...content });
+    processed = true;
   }
-  for (const key in content) {
-    if (Object.prototype.hasOwnProperty.call(content, key)) {
-      const value = content[key];
-      if (Array.isArray(value)) {
-        for (let i = 0; i < value.length; i++) {
-          if (value[i] && typeof value[i] === "object") {
-            const blockModified = applyMigrationToAllBlocks(value[i], migrationFunction, targetComponent);
-            modified = modified || blockModified;
-          }
+  for (const key of Object.keys(content)) {
+    if (migratedContent) {
+      if (!(key in migratedContent)) {
+        delete content[key];
+        continue;
+      }
+      content[key] = migratedContent[key];
+    }
+    if (Array.isArray(content[key])) {
+      for (const value of content[key]) {
+        if (value && typeof value === "object") {
+          const blockProcessed = applyMigrationToAllBlocks(value, migrationFunction, targetComponent);
+          processed = processed || blockProcessed;
         }
-      } else if (value && typeof value === "object") {
-        const blockModified = applyMigrationToAllBlocks(value, migrationFunction, targetComponent);
-        modified = modified || blockModified;
       }
+    } else if (content[key] && typeof content[key] === "object") {
+      const blockProcessed = applyMigrationToAllBlocks(content[key], migrationFunction, targetComponent);
+      processed = processed || blockProcessed;
     }
   }
-  return modified;
+  return processed;
 }
 
 async function saveRollbackData({
   space,
   path,
-  stories,
+  story,
+  migrationTimestamp,
   migrationFile
 }) {
   const rollbackData = {
-    stories: stories.map((story) => ({
-      storyId: story.id,
-      name: story.name,
-      content: story.content
-    }))
+    storyId: story.id,
+    name: story.name,
+    content: story.content
   };
   const rollbacksPath = resolvePath(path, `migrations/${space}/rollbacks`);
-  const timestamp = Date.now();
-  const rollbackFileName = `${migrationFile.replace(".js", "")}.${timestamp}.json`;
+  const rollbackFileName = `${migrationFile.replace(".js", "")}.${migrationTimestamp}.jsonl`;
   const rollbackFilePath = join(rollbacksPath, rollbackFileName);
-  try {
-    await saveToFile(
-      rollbackFilePath,
-      JSON.stringify(rollbackData, null, 2)
-    );
-  } catch (error) {
-    if (error.code === "ENOENT") {
-      const fs = await import('node:fs/promises');
-      await fs.mkdir(rollbacksPath, { recursive: true });
-      await saveToFile(
-        rollbackFilePath,
-        JSON.stringify(rollbackData, null, 2)
-      );
-    } else {
-      throw error;
-    }
-  }
+  await appendToFile(
+    rollbackFilePath,
+    JSON.stringify(rollbackData)
+  );
 }
 async function readRollbackFile({
   space,
@@ -3141,8 +3125,10 @@ async function readRollbackFile({
   try {
     const resolvedPath = resolvePath(path, `migrations/${space}/rollbacks`);
     const rollbackFilePath = join(resolvedPath, migrationFile);
-    const filePath = rollbackFilePath.endsWith(".json") ? rollbackFilePath : `${rollbackFilePath}.json`;
-    return JSON.parse(await readFile$1(filePath, "utf-8"));
+    const filePath = rollbackFilePath.endsWith(".jsonl") ? rollbackFilePath : `${rollbackFilePath}.jsonl`;
+    return {
+      stories: (await readFile$1(filePath, "utf-8")).trim().split("\n").filter(Boolean).map((x) => JSON.parse(x))
+    };
   } catch (error) {
     throw new CommandError(`Failed to read rollback file: ${error.message}`);
   }
@@ -3161,22 +3147,22 @@ class MigrationStream extends Transform {
       totalProcessed: 0
     };
   }
+  timestamp = Date.now();
   results;
   migrationFunctions = /* @__PURE__ */ new Map();
   totalProcessed = 0;
-  _transform(chunk, _encoding, callback) {
+  async _transform(chunk, _encoding, callback) {
     try {
-      this.processStory(chunk).then((results) => {
-        this.results.totalProcessed++;
-        this.options.onProgress?.(this.results.totalProcessed);
-        if (results.length > 0) {
-          this.totalProcessed += results.length;
-          this.options.onTotal?.(this.totalProcessed);
-          for (const result of results) {
-            this.push(result);
-          }
+      const results = await this.processStory(chunk);
+      this.results.totalProcessed++;
+      this.options.onProgress?.(this.results.totalProcessed);
+      if (results.length > 0) {
+        this.totalProcessed += results.length;
+        this.options.onTotal?.(this.totalProcessed);
+        for (const result of results) {
+          this.push(result);
         }
-      });
+      }
       callback();
     } catch (error) {
       callback(error);
@@ -3228,16 +3214,17 @@ class MigrationStream extends Transform {
       await saveRollbackData({
         space: this.options.space,
         path: this.options.path,
-        stories: [{ id: story.id, name: story.name || "", content: story.content }],
+        story: { id: story.id, name: story.name || "", content: story.content },
+        migrationTimestamp: this.timestamp,
         migrationFile: migrationFile.name
       });
       const storyContent = structuredClone(story.content);
-      const originalContentHash = hash(story.content);
+      const originalContentHash = hash(storyContent);
       const targetComponent = this.options.componentName || getComponentNameFromFilename(migrationFile.name);
-      const modified = applyMigrationToAllBlocks(storyContent, migrationFunction, targetComponent);
+      const processed = applyMigrationToAllBlocks(storyContent, migrationFunction, targetComponent);
       const newContentHash = hash(storyContent);
       const contentChanged = originalContentHash !== newContentHash;
-      if (modified && contentChanged) {
+      if (processed && contentChanged) {
         this.results.successful.push({
           storyId: story.id,
           name: story.name,
@@ -3249,7 +3236,7 @@ class MigrationStream extends Transform {
           name: story.name,
           content: storyContent
         };
-      } else if (modified && !contentChanged) {
+      } else if (processed && !contentChanged) {
         this.results.skipped.push({
           storyId: story.id,
           name: story.name,
@@ -3557,6 +3544,13 @@ migrationsCommand.command("rollback [migrationFile]").description("Rollback a mi
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
+  const { password, region } = state;
+  mapiClient({
+    token: {
+      accessToken: password
+    },
+    region
+  });
   try {
     const rollbackData = await readRollbackFile({
       space,
@@ -3585,7 +3579,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").hook("preAction", resolveRegion);
+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 getAssetJSONSchema = (title) => ({
   $id: "#/asset",
@@ -4342,7 +4336,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").hook("preAction", resolveRegion);
+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 fetchDatasourceEntries = async (spaceId, datasourceId) => {
   try {
@@ -5163,7 +5157,7 @@ program$1.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
   konsola.br();
 });
 
-const version = "4.6.2";
+const version = "4.6.4";
 const pkg = {
 	version: version};