storyblok 4.16.9 → 4.17.0

package/dist/config/index.d.mts

@@ -64,6 +64,10 @@ interface MigrationsGenerateOptions extends CommandOptions {
 interface MigrationsRunOptions extends CommandOptions {
     dryRun?: boolean;
     filter?: string;
+    /**
+     * The source space id to read migration files from.
+     */
+    from?: string;
     query?: string;
     startsWith?: string;
     publish?: 'all' | 'published' | 'published-with-changes';

package/dist/config/index.d.ts

@@ -64,6 +64,10 @@ interface MigrationsGenerateOptions extends CommandOptions {
 interface MigrationsRunOptions extends CommandOptions {
     dryRun?: boolean;
     filter?: string;
+    /**
+     * The source space id to read migration files from.
+     */
+    from?: string;
     query?: string;
     startsWith?: string;
     publish?: 'all' | 'published' | 'published-with-changes';

package/dist/index.mjs

@@ -26,7 +26,6 @@ import { Octokit } from 'octokit';
 import { pipeline as pipeline$1 } from 'node:stream/promises';
 import { Buffer } from 'node:buffer';
 import Storyblok from 'storyblok-js-client';
-import { createHash } from 'node:crypto';
 
 const commands = {
   LOGIN: "login",
@@ -4429,7 +4428,7 @@ class MigrationStream extends Transform {
     }
     const migrationFunction = await getMigrationFunction(
       migrationFile.name,
-      this.options.space,
+      this.options.sourceSpace,
       this.options.path
     );
     this.migrationFunctions.set(migrationFile.name, migrationFunction);
@@ -4756,7 +4755,7 @@ class UpdateStream extends Writable {
   }
 }
 
-const runCmd = migrationsCommand.command("run [componentName]").description("Run migrations").option("--fi, --filter <filter>", "glob filter to apply to the components before pushing").option("-d, --dry-run", "Preview changes without applying them to Storyblok").option("-q, --query <query>", 'Filter stories by content attributes using Storyblok filter query syntax. Example: --query="[highlighted][in]=true"').option("--starts-with <path>", 'Filter stories by path. Example: --starts-with="/en/blog/"').option("--publish <publish>", "Options for publication mode: all | published | published-with-changes").option("-s, --space <space>", "space ID");
+const runCmd = migrationsCommand.command("run [componentName]").description("Run migrations").option("--fi, --filter <filter>", "glob filter to apply to the components before pushing").option("-d, --dry-run", "Preview changes without applying them to Storyblok").option("-q, --query <query>", 'Filter stories by content attributes using Storyblok filter query syntax. Example: --query="[highlighted][in]=true"').option("--starts-with <path>", 'Filter stories by path. Example: --starts-with="/en/blog/"').option("--publish <publish>", "Options for publication mode: all | published | published-with-changes").option("-f, --from <from>", "source space id").option("-s, --space <space>", "space ID");
 runCmd.action(async (componentName, options, command) => {
   const ui = getUI();
   const logger = getLogger();
@@ -4777,11 +4776,16 @@ runCmd.action(async (componentName, options, command) => {
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
-  const { filter, dryRun = false, query, startsWith, publish } = options;
+  const { filter, from, dryRun = false, query, startsWith, publish } = options;
+  const fromSpace = from || space;
+  if (from) {
+    ui.info(`Running migrations ${chalk.bold("from")} space ${chalk.hex(colorPalette.MIGRATIONS)(fromSpace)} ${chalk.bold("on")} space ${chalk.hex(colorPalette.MIGRATIONS)(space)}`);
+    ui.br();
+  }
   try {
     const spinner = ui.createSpinner(`Fetching migration files and stories...`);
     const migrationFiles = await readMigrationFiles({
-      space,
+      space: fromSpace,
       path,
       filter
     });
@@ -4789,7 +4793,7 @@ runCmd.action(async (componentName, options, command) => {
       return file.name.match(new RegExp(`^${componentName}(\\..*)?.js$`));
     }) : migrationFiles;
     if (filteredMigrations.length === 0) {
-      spinner.failed(`No migration files found${componentName ? ` for component "${componentName}"` : ""}${filter ? ` matching filter "${filter}"` : ""} in space "${space}".`);
+      spinner.failed(`No migration files found${componentName ? ` for component "${componentName}"` : ""}${filter ? ` matching filter "${filter}"` : ""} in space "${fromSpace}".`);
       logger.warn("No migration files found");
       logger.info("Migration finished");
       return;
@@ -4817,6 +4821,7 @@ runCmd.action(async (componentName, options, command) => {
     const migrationStream = new MigrationStream({
       migrationFiles: filteredMigrations,
       space,
+      sourceSpace: fromSpace,
       path,
       componentName,
       onTotal: (total) => {
@@ -7037,10 +7042,6 @@ const updateAssetFolder = async (id, folder, {
     handleAPIError("push_asset_folder", toError(maybeError));
   }
 };
-const sha256 = (data) => {
-  const buffer = Buffer.isBuffer(data) ? data : Buffer.from(data);
-  return createHash("sha256").update(buffer).digest("hex");
-};
 const downloadAssetFile = async (asset, options) => {
   let url = asset.filename;
   if (asset.is_private) {
@@ -7564,24 +7565,6 @@ const hasId = (a) => {
 const hasShortFilename = (a) => {
   return !!a && typeof a === "object" && "short_filename" in a && typeof a.short_filename === "string";
 };
-const isDataUnchanged = (localAsset, remoteAsset) => {
-  for (const key of Object.keys(localAsset)) {
-    const local = localAsset[key];
-    const remote = remoteAsset[key];
-    if (typeof local === "object" || typeof remote === "object") {
-      if (JSON.stringify(local) !== JSON.stringify(remote)) {
-        return false;
-      }
-    } else if (local !== remote) {
-      return false;
-    }
-  }
-  return true;
-};
-const makeDownloadAssetFileTransport = ({
-  assetToken,
-  region
-}) => (asset) => downloadAssetFile(asset, { assetToken, region });
 const processAsset = async ({
   localAsset,
   fileBuffer,
@@ -7609,20 +7592,13 @@ const processAsset = async ({
       internal_tag_ids: "internal_tag_ids" in localAsset ? localAsset.internal_tag_ids : remoteAsset.internal_tag_ids,
       meta_data: "meta_data" in localAsset ? localAsset.meta_data : remoteAsset.meta_data
     };
-    const remoteFileBuffer = await transports.downloadAssetFile(remoteAsset);
-    const isFileUnchanged = sha256(fileBuffer) === sha256(remoteFileBuffer);
-    if (isFileUnchanged && isDataUnchanged(updatePayload, remoteAsset)) {
-      newRemoteAsset = remoteAsset;
-      status = "skipped";
-    } else {
-      await transports.updateAsset(
-        remoteAsset.id,
-        { ...updatePayload, short_filename: remoteAsset.short_filename },
-        isFileUnchanged ? void 0 : fileBuffer
-      );
-      newRemoteAsset = { ...remoteAsset, ...updatePayload };
-      status = "updated";
-    }
+    await transports.updateAsset(
+      remoteAsset.id,
+      { ...updatePayload, short_filename: remoteAsset.short_filename },
+      fileBuffer
+    );
+    newRemoteAsset = { ...remoteAsset, ...updatePayload };
+    status = "updated";
   } else if (hasShortFilename(localAsset)) {
     const createPayload = {
       ...localAsset,
@@ -7644,7 +7620,6 @@ const upsertAssetStream = ({
   maps,
   onIncrement,
   onAssetSuccess,
-  onAssetSkipped,
   onAssetError
 }) => {
   const processing = /* @__PURE__ */ new Set();
@@ -7654,7 +7629,7 @@ const upsertAssetStream = ({
       await apiConcurrencyLock$1.acquire();
       const task = (async () => {
         try {
-          const { status, remoteAsset } = await processAsset({
+          const { remoteAsset } = await processAsset({
             localAsset,
             fileBuffer: context.fileBuffer,
             assetBinaryPath: context.assetBinaryPath,
@@ -7662,11 +7637,7 @@ const upsertAssetStream = ({
             transports,
             maps
           });
-          if (status === "skipped") {
-            onAssetSkipped?.(localAsset, remoteAsset);
-          } else {
-            onAssetSuccess?.(localAsset, remoteAsset);
-          }
+          onAssetSuccess?.(localAsset, remoteAsset);
         } catch (maybeError) {
           onAssetError?.(toError(maybeError), localAsset);
         }
@@ -7849,16 +7820,13 @@ pullCmd$1.action(async (options, command) => {
 const traverseAndMapBySchema = (data, {
   schemas,
   maps,
-  fieldRefMappers: fieldRefMappers2,
-  processedFields,
-  missingSchemas
+  fieldRefMappers: fieldRefMappers2
 }) => {
   if (!data?.component) {
     return data ?? {};
   }
   const schema = schemas[data.component];
   if (!schema) {
-    missingSchemas.add(data.component);
     return data;
   }
   const dataNew = { ...data };
@@ -7866,17 +7834,12 @@ const traverseAndMapBySchema = (data, {
     const fieldSchema = schema[fieldName.replace(/__i18n__.*/, "")];
     const fieldType = fieldSchema && typeof fieldSchema === "object" && "type" in fieldSchema && fieldSchema.type;
     const fieldRefMapper = typeof fieldType === "string" && fieldRefMappers2[fieldType];
-    if (fieldSchema) {
-      processedFields.add(fieldSchema);
-    }
     if (fieldRefMapper) {
       dataNew[fieldName] = fieldRefMapper(fieldValue, {
         schema: fieldSchema,
         schemas,
         maps,
-        fieldRefMappers: fieldRefMappers2,
-        processedFields,
-        missingSchemas
+        fieldRefMappers: fieldRefMappers2
       });
     }
   }
@@ -7885,17 +7848,13 @@ const traverseAndMapBySchema = (data, {
 const traverseAndMapRichtextDoc = (data, {
   schemas,
   maps,
-  fieldRefMappers: fieldRefMappers2,
-  processedFields,
-  missingSchemas
+  fieldRefMappers: fieldRefMappers2
 }) => {
   if (Array.isArray(data)) {
     return data.map((item) => traverseAndMapRichtextDoc(item, {
       schemas,
       maps,
-      fieldRefMappers: fieldRefMappers2,
-      processedFields,
-      missingSchemas
+      fieldRefMappers: fieldRefMappers2
     }));
   }
   if (data && typeof data === "object") {
@@ -7916,9 +7875,7 @@ const traverseAndMapRichtextDoc = (data, {
           body: (data.attrs?.body ?? []).map((d) => traverseAndMapBySchema(d, {
             schemas,
             maps,
-            fieldRefMappers: fieldRefMappers2,
-            processedFields,
-            missingSchemas
+            fieldRefMappers: fieldRefMappers2
           }))
         }
       };
@@ -7928,21 +7885,17 @@ const traverseAndMapRichtextDoc = (data, {
       newData[k] = traverseAndMapRichtextDoc(value, {
         schemas,
         maps,
-        fieldRefMappers: fieldRefMappers2,
-        processedFields,
-        missingSchemas
+        fieldRefMappers: fieldRefMappers2
       });
     }
     return newData;
   }
   return data;
 };
-const richtextFieldRefMapper = (data, { schemas, maps, fieldRefMappers: fieldRefMappers2, processedFields, missingSchemas }) => traverseAndMapRichtextDoc(data, {
+const richtextFieldRefMapper = (data, { schemas, maps, fieldRefMappers: fieldRefMappers2 }) => traverseAndMapRichtextDoc(data, {
   schemas,
   maps,
-  fieldRefMappers: fieldRefMappers2,
-  processedFields,
-  missingSchemas
+  fieldRefMappers: fieldRefMappers2
 });
 const multilinkFieldRefMapper = (data, { maps }) => {
   if (data.linktype !== "story") {
@@ -7953,16 +7906,14 @@ const multilinkFieldRefMapper = (data, { maps }) => {
     id: maps.stories?.get(data.id) || data.id
   };
 };
-const bloksFieldRefMapper = (data, { schemas, maps, fieldRefMappers: fieldRefMappers2, processedFields, missingSchemas }) => {
+const bloksFieldRefMapper = (data, { schemas, maps, fieldRefMappers: fieldRefMappers2 }) => {
   if (!Array.isArray(data)) {
     throw new TypeError(`Invalid bloks field: expected an array, but received ${JSON.stringify(data)}. Please make sure your bloks field value is an array of components (e.g. [{ component: "my_blok", ... }]).`);
   }
   return data.map((d) => traverseAndMapBySchema(d, {
     schemas,
     maps,
-    fieldRefMappers: fieldRefMappers2,
-    processedFields,
-    missingSchemas
+    fieldRefMappers: fieldRefMappers2
   }));
 };
 const assetFieldRefMapper = (data, { maps }) => {
@@ -7997,33 +7948,24 @@ const fieldRefMappers = {
   richtext: richtextFieldRefMapper
 };
 const storyRefMapper = (story, { schemas, maps }) => {
-  const processedFields = /* @__PURE__ */ new Set();
-  const missingSchemas = /* @__PURE__ */ new Set();
   const alternates = story.alternates ? story.alternates.map((a) => ({
     ...a,
     id: maps.stories?.get(a.id) ?? a.id,
     parent_id: maps.stories?.get(a.parent_id) ?? a.parent_id
   })) : story.alternates;
   const parentId = maps.stories?.get(story.parent_id) ?? story.parent_id;
-  const mappedStory = {
+  return {
     ...story,
     content: story.content?.component ? traverseAndMapBySchema(story.content, {
       schemas,
       maps,
-      fieldRefMappers,
-      processedFields,
-      missingSchemas
+      fieldRefMappers
     }) : story.content,
     id: Number(maps.stories?.get(story.id) ?? story.id),
     uuid: String(maps.stories?.get(story.uuid) ?? story.uuid),
     parent_id: parentId != null ? Number(parentId) : 0,
     alternates
   };
-  return {
-    mappedStory,
-    processedFields,
-    missingSchemas
-  };
 };
 
 const apiConcurrencyLock = new Sema(12);
@@ -8150,8 +8092,8 @@ const mapReferencesStream = ({
     objectMode: true,
     transform(localStory, _encoding, callback) {
       try {
-        const { mappedStory, processedFields, missingSchemas } = storyRefMapper(localStory, { schemas, maps });
-        onStorySuccess?.(mappedStory, processedFields, missingSchemas);
+        const mappedStory = storyRefMapper(localStory, { schemas, maps });
+        onStorySuccess?.(mappedStory);
         this.push(mappedStory);
       } catch (maybeError) {
         onStoryError?.(toError(maybeError), localStory);
@@ -8394,6 +8336,162 @@ const writeStoryStream = ({
   });
 };
 
+const walkRichtextBloks = (node, onBlok) => {
+  if (Array.isArray(node)) {
+    for (const item of node) {
+      walkRichtextBloks(item, onBlok);
+    }
+    return;
+  }
+  if (!node || typeof node !== "object") {
+    return;
+  }
+  const obj = node;
+  if (obj.type === "blok" && obj.attrs && typeof obj.attrs === "object") {
+    const body = obj.attrs.body;
+    if (Array.isArray(body)) {
+      for (const blok of body) {
+        onBlok(blok);
+      }
+    }
+  }
+  for (const value of Object.values(obj)) {
+    walkRichtextBloks(value, onBlok);
+  }
+};
+
+const RESERVED_KEYS = /* @__PURE__ */ new Set(["component"]);
+const isReservedKey = (key) => RESERVED_KEYS.has(key) || key.startsWith("_");
+const MAX_STORIES_PER_ENTRY = 5;
+const addDrift = (driftByComponent, component, field) => {
+  const existing = driftByComponent.get(component) ?? /* @__PURE__ */ new Set();
+  existing.add(field);
+  driftByComponent.set(component, existing);
+};
+const validateStoryAgainstSchemas = (story, schemas) => {
+  const driftByComponent = /* @__PURE__ */ new Map();
+  const missingSchemas = /* @__PURE__ */ new Set();
+  const visit = (data) => {
+    if (!data || typeof data !== "object" || Array.isArray(data)) {
+      return;
+    }
+    const node = data;
+    const componentName = node.component;
+    if (typeof componentName !== "string" || componentName.length === 0) {
+      return;
+    }
+    const schema = schemas[componentName];
+    if (!schema) {
+      missingSchemas.add(componentName);
+      return;
+    }
+    for (const [fieldName, fieldValue] of Object.entries(node)) {
+      if (isReservedKey(fieldName)) {
+        continue;
+      }
+      const normalized = fieldName.replace(/__i18n__.*/, "");
+      const fieldSchema = schema[normalized];
+      if (!fieldSchema) {
+        addDrift(driftByComponent, componentName, normalized);
+        continue;
+      }
+      const fieldType = typeof fieldSchema.type === "string" ? fieldSchema.type : void 0;
+      if (fieldType === "bloks" && Array.isArray(fieldValue)) {
+        for (const item of fieldValue) {
+          visit(item);
+        }
+      } else if (fieldType === "richtext" && fieldValue && typeof fieldValue === "object") {
+        walkRichtextBloks(fieldValue, (blok) => visit(blok));
+      }
+    }
+  };
+  visit(story.content);
+  return { driftByComponent, missingSchemas };
+};
+const addStoryToSet = (bag, key, storySlug) => {
+  const existing = bag.get(key) ?? /* @__PURE__ */ new Set();
+  existing.add(storySlug);
+  bag.set(key, existing);
+};
+const collectSchemaIssues = async ({
+  directoryPath,
+  schemas
+}) => {
+  const issues = {
+    driftByComponent: /* @__PURE__ */ new Map(),
+    missingSchemas: /* @__PURE__ */ new Map(),
+    total: 0
+  };
+  try {
+    await pipeline$1(
+      readLocalStoriesStream({ directoryPath }),
+      new Writable({
+        objectMode: true,
+        write(story, _encoding, callback) {
+          issues.total += 1;
+          const storyIdentifier = story.full_slug || story.slug;
+          const { driftByComponent, missingSchemas } = validateStoryAgainstSchemas(story, schemas);
+          for (const component of missingSchemas) {
+            addStoryToSet(issues.missingSchemas, component, storyIdentifier);
+          }
+          for (const [component, fields] of driftByComponent) {
+            const fieldMap = issues.driftByComponent.get(component) ?? /* @__PURE__ */ new Map();
+            for (const field of fields) {
+              addStoryToSet(fieldMap, field, storyIdentifier);
+            }
+            issues.driftByComponent.set(component, fieldMap);
+          }
+          callback();
+        }
+      })
+    );
+  } catch (error) {
+    if (error?.code !== "ENOENT") {
+      throw error;
+    }
+  }
+  return issues;
+};
+const formatStoryList = (stories) => {
+  const sorted = [...stories].sort();
+  if (sorted.length <= MAX_STORIES_PER_ENTRY) {
+    return sorted.join(", ");
+  }
+  const shown = sorted.slice(0, MAX_STORIES_PER_ENTRY).join(", ");
+  return `${shown}, and ${sorted.length - MAX_STORIES_PER_ENTRY} more`;
+};
+const formatSchemaIssues = (issues) => {
+  const lines = ["Schema validation failed. Push aborted."];
+  if (issues.missingSchemas.size > 0) {
+    lines.push("");
+    lines.push("Missing component schemas:");
+    const sortedMissing = [...issues.missingSchemas.entries()].sort(([a], [b]) => a.localeCompare(b));
+    for (const [component, stories] of sortedMissing) {
+      lines.push(`  - ${component} (in stories: ${formatStoryList(stories)})`);
+    }
+    lines.push("");
+    lines.push("If these components exist in Storyblok, run `storyblok components pull` to sync them locally.");
+    lines.push("Otherwise, create them in Storyblok first, or remove the references from the affected stories.");
+  }
+  if (issues.driftByComponent.size > 0) {
+    lines.push("");
+    lines.push("Fields not declared in local schemas:");
+    const sortedComponents = [...issues.driftByComponent.entries()].sort(([a], [b]) => a.localeCompare(b));
+    for (const [component, fieldMap] of sortedComponents) {
+      const sortedFields = [...fieldMap.entries()].sort(([a], [b]) => a.localeCompare(b));
+      for (const [field, stories] of sortedFields) {
+        lines.push(`  - ${component}.${field} (in stories: ${formatStoryList(stories)})`);
+      }
+    }
+    lines.push("");
+    lines.push("These fields will be lost when the stories are pushed. To fix, either:");
+    lines.push("  - Add the field to the component in Storyblok, then run `storyblok components pull`");
+    lines.push("  - Or remove the field from the affected story JSON files");
+  }
+  return lines.join("\n");
+};
+const hasSchemaIssues = (issues) => issues.missingSchemas.size > 0 || issues.driftByComponent.size > 0;
+
 const PROGRESS_BAR_PADDING = 23;
 const upsertAssetFoldersPipeline = async ({
   directoryPath,
@@ -8443,7 +8541,7 @@ const upsertAssetsPipeline = async ({
   ui
 }) => {
   const assetProgress = ui.createProgressBar({ title: "Assets...".padEnd(PROGRESS_BAR_PADDING) });
-  const summary = { total: 0, succeeded: 0, failed: 0, skipped: 0 };
+  const summary = { total: 0, succeeded: 0, failed: 0 };
   const steps = [];
   if (assetBinaryPath && assetData) {
     summary.total = 1;
@@ -8489,20 +8587,6 @@ const upsertAssetsPipeline = async ({
       summary.succeeded += 1;
       logger.info("Uploaded asset", { assetId: remoteAsset.id });
     },
-    onAssetSkipped: (localAssetResult, remoteAsset) => {
-      if ("id" in localAssetResult && localAssetResult.id) {
-        maps.assets.set(localAssetResult.id, {
-          old: localAssetResult,
-          new: {
-            id: remoteAsset.id,
-            filename: remoteAsset.filename,
-            meta_data: remoteAsset.meta_data
-          }
-        });
-      }
-      summary.skipped += 1;
-      logger.debug("Skipped asset (unchanged)", { assetId: remoteAsset.id });
-    },
     onAssetError: (error, asset) => {
       summary.failed += 1;
       logOnlyError(error, { assetId: asset.id });
@@ -8601,7 +8685,8 @@ const mapAssetReferencesInStoriesPipeline = async ({
       onIncrement() {
         processProgress.increment();
       },
-      onStorySuccess(localStory, _, missingSchemas) {
+      onStorySuccess(localStory) {
+        const { missingSchemas } = validateStoryAgainstSchemas(localStory, schemas);
         warnAboutMissingSchemas(missingSchemas, localStory);
         logger.info("Processed story", { storyId: localStory.uuid });
         summaries.storyProcessResults.succeeded += 1;
@@ -8634,7 +8719,7 @@ const mapAssetReferencesInStoriesPipeline = async ({
   return Object.entries(summaries);
 };
 
-const pushCmd$1 = assetsCommand.command("push").argument("[asset]", "path or URL of a single asset to push").option("-s, --space <space>", "space ID").option("-f, --from <from>", "source space id").option("--data <data>", "inline asset data as JSON").option("--short-filename <short-filename>", "override the asset filename").option("--folder <folderId>", "destination asset folder ID").option("--cleanup", "delete local assets and metadata after a successful push (note: does not cleanup manifests)").option("--update-stories", "update file references in stories if necessary", false).option("--asset-token <token>", "asset token for accessing private assets").option("-d, --dry-run", "Preview changes without applying them to Storyblok").description(`Push local assets to a Storyblok space.`);
+const pushCmd$1 = assetsCommand.command("push").argument("[asset]", "path or URL of a single asset to push").option("-s, --space <space>", "space ID").option("-f, --from <from>", "source space id").option("--data <data>", "inline asset data as JSON").option("--short-filename <short-filename>", "override the asset filename").option("--folder <folderId>", "destination asset folder ID").option("--cleanup", "delete local assets and metadata after a successful push (note: does not cleanup manifests)").option("--update-stories", "update file references in stories if necessary", false).option("-d, --dry-run", "Preview changes without applying them to Storyblok").description(`Push local assets to a Storyblok space.`);
 pushCmd$1.action(async (assetInput, options, command) => {
   const ui = getUI();
   const logger = getLogger();
@@ -8648,7 +8733,6 @@ pushCmd$1.action(async (assetInput, options, command) => {
   }
   const { space: targetSpace, path: basePath, verbose } = command.optsWithGlobals();
   const fromSpace = options.from || targetSpace;
-  const assetToken = options.assetToken;
   const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     process.exitCode = 2;
@@ -8659,7 +8743,6 @@ pushCmd$1.action(async (assetInput, options, command) => {
     process.exitCode = 2;
     return;
   }
-  const { region } = state;
   const summaries = [];
   let fatalError = false;
   const manifestFile = join(resolveCommandPath(directories.assets, fromSpace, basePath), "manifest.jsonl");
@@ -8706,10 +8789,6 @@ pushCmd$1.action(async (assetInput, options, command) => {
     const createAssetTransport = options.dryRun ? async (asset) => asset : makeCreateAssetAPITransport({ spaceId: targetSpace });
     const updateAssetTransport = options.dryRun ? async () => {
     } : makeUpdateAssetAPITransport({ spaceId: targetSpace });
-    const downloadAssetFileTransport = makeDownloadAssetFileTransport({
-      assetToken,
-      region
-    });
     const assetManifestTransport = options.dryRun ? () => Promise.resolve() : makeAppendAssetManifestFSTransport({ manifestFile });
     const cleanupAssetTransport = options.cleanup && !options.dryRun ? makeCleanupAssetFSTransport() : () => Promise.resolve();
     summaries.push(...await upsertAssetsPipeline({
@@ -8722,7 +8801,6 @@ pushCmd$1.action(async (assetInput, options, command) => {
         getAsset: getAssetTransport,
         createAsset: createAssetTransport,
         updateAsset: updateAssetTransport,
-        downloadAssetFile: downloadAssetFileTransport,
         appendAssetManifest: assetManifestTransport,
         cleanupAsset: cleanupAssetTransport
       },
@@ -8757,12 +8835,11 @@ pushCmd$1.action(async (assetInput, options, command) => {
     logger.info("Pushing assets finished", { summary });
     const assetsTotal = summary.assetResults?.total ?? 0;
     const assetsSucceeded = summary.assetResults?.succeeded ?? 0;
-    const assetsSkipped = summary.assetResults?.skipped ?? 0;
     const assetsFailed = summary.assetResults?.failed ?? 0;
     ui.info(`Push results: ${assetsTotal} processed, ${assetsFailed} assets failed`);
     ui.list([
       `Folders: ${summary.assetFolderResults?.succeeded ?? 0}/${summary.assetFolderResults?.total ?? 0} succeeded, ${summary.assetFolderResults?.failed ?? 0} failed.`,
-      `Assets: ${assetsSucceeded}/${assetsTotal} succeeded, ${assetsSkipped} skipped, ${assetsFailed} failed.`
+      `Assets: ${assetsSucceeded}/${assetsTotal} succeeded, ${assetsFailed} failed.`
     ]);
     for (const [name, reportSummary] of summaries) {
       reporter.addSummary(name, reportSummary);
@@ -8914,32 +8991,6 @@ pushCmd.action(async (options, command) => {
     return;
   }
   const pendingWarnings = [];
-  const warnedPlugins = /* @__PURE__ */ new Set();
-  const warnAboutCustomPlugins = (fields, story) => {
-    for (const field of fields) {
-      if (field.type === "custom" && typeof field.field_type === "string") {
-        if (warnedPlugins.has(field.field_type)) {
-          continue;
-        }
-        warnedPlugins.add(field.field_type);
-        const message = `The custom plugin "${field.field_type}" may contain references that require manual updates.`;
-        pendingWarnings.push(message);
-        logger.warn(message, { storyId: story.uuid });
-      }
-    }
-  };
-  const missingSchemaWarnings = /* @__PURE__ */ new Set();
-  const warnAboutMissingSchemas = (missingSchemas, story) => {
-    for (const schemaName of missingSchemas) {
-      if (missingSchemaWarnings.has(schemaName)) {
-        continue;
-      }
-      const message = `The component "${schemaName}" was not found. Please run \`storyblok components pull\` to fetch the latest components.`;
-      pendingWarnings.push(message);
-      logger.warn(message, { storyId: story.uuid });
-      missingSchemaWarnings.add(schemaName);
-    }
-  };
   const summary = {
     creationResults: { total: 0, succeeded: 0, skipped: 0, failed: 0 },
     processResults: { total: 0, succeeded: 0, failed: 0 },
@@ -8960,13 +9011,49 @@ pushCmd.action(async (options, command) => {
       logger.error(message);
       return;
     }
+    const storiesDirectoryPath = resolveCommandPath(directories.stories, fromSpace, basePath);
+    const schemaIssues = await collectSchemaIssues({ directoryPath: storiesDirectoryPath, schemas });
+    if (hasSchemaIssues(schemaIssues)) {
+      const message = formatSchemaIssues(schemaIssues);
+      ui.error(message);
+      logger.error(message);
+      const total = Math.max(schemaIssues.total, 1);
+      summary.creationResults.total = total;
+      summary.creationResults.failed = total;
+      return;
+    }
+    const warnAboutCustomPlugins = (story) => {
+      const warned = /* @__PURE__ */ new Set();
+      const visit = (node) => {
+        if (Array.isArray(node)) {
+          for (const item of node) {
+            visit(item);
+          }
+          return;
+        }
+        if (!node || typeof node !== "object") {
+          return;
+        }
+        const obj = node;
+        const plugin = obj.plugin;
+        if (typeof plugin === "string" && !warned.has(plugin)) {
+          warned.add(plugin);
+          const message = `The custom plugin "${plugin}" may contain references that require manual updates.`;
+          pendingWarnings.push(message);
+          logger.warn(message, { storyId: story.uuid });
+        }
+        for (const value of Object.values(obj)) {
+          visit(value);
+        }
+      };
+      visit(story.content);
+    };
     const fetchProgress = ui.createProgressBar({ title: "Matching Stories...".padEnd(21) });
     const existingTargetStories = await prefetchTargetStories(space, {
       onTotal: (total) => fetchProgress.setTotal(total),
       onIncrement: (count) => fetchProgress.increment(count)
     });
     fetchProgress.stop();
-    const storiesDirectoryPath = resolveCommandPath(directories.stories, fromSpace, basePath);
     const scanProgress = ui.createProgressBar({ title: "Scanning Stories...".padEnd(21) });
     const storyIndex = await scanLocalStoryIndex({
       directoryPath: storiesDirectoryPath,
@@ -9070,9 +9157,8 @@ pushCmd.action(async (options, command) => {
         onIncrement() {
           processProgress.increment();
         },
-        onStorySuccess(localStory, processedFields, missingSchemas) {
-          warnAboutCustomPlugins(processedFields, localStory);
-          warnAboutMissingSchemas(missingSchemas, localStory);
+        onStorySuccess(localStory) {
+          warnAboutCustomPlugins(localStory);
           logger.info("Processed story", { storyId: localStory.uuid });
           summary.processResults.succeeded += 1;
         },