storyblok 4.14.3 → 4.15.1

package/dist/index.mjs

@@ -11,7 +11,7 @@ import { Command } from 'commander';
 import path, { join, resolve as resolve$1, parse, dirname as dirname$1, extname, relative, basename } from 'node:path';
 import { MultiBar, Presets } from 'cli-progress';
 import { Spinner } from '@topcli/spinner';
-import fs, { mkdir, writeFile, readFile as readFile$1, appendFile, access, constants, readdir, unlink, stat } from 'node:fs/promises';
+import fs, { mkdir, writeFile, readFile as readFile$1, appendFile, access, constants, readdir, unlink } from 'node:fs/promises';
 import filenamify from 'filenamify';
 import { ManagementApiClient } from '@storyblok/management-api-client';
 import { RateLimit, Sema } from 'async-sema';
@@ -103,6 +103,44 @@ const regionNames = {
 ({
   SB_Agent_Version: process.env.npm_package_version || "4.x"
 });
+const SUPPORTED_ASSET_EXTENSIONS = /* @__PURE__ */ new Set([
+  // Images: image/png, image/x-png, image/gif, image/jpeg, image/avif, image/svg+xml, image/webp
+  ".jpg",
+  ".jpeg",
+  ".png",
+  ".gif",
+  ".webp",
+  ".avif",
+  ".svg",
+  // Video: video/*, application/mp4, application/x-mpegurl, application/vnd.apple.mpegurl
+  ".mp4",
+  ".mov",
+  ".avi",
+  ".webm",
+  ".wmv",
+  ".mkv",
+  ".flv",
+  ".ogv",
+  ".3gp",
+  ".m4v",
+  ".mpg",
+  ".mpeg",
+  ".m3u8",
+  // Audio: audio/*
+  ".mp3",
+  ".wav",
+  ".ogg",
+  ".aac",
+  ".flac",
+  ".wma",
+  ".m4a",
+  ".opus",
+  // Documents: application/msword, text/plain, application/pdf, application/vnd.openxmlformats-officedocument.wordprocessingml.document
+  ".pdf",
+  ".doc",
+  ".docx",
+  ".txt"
+]);
 const directories = {
   assets: "assets",
   components: "components",
@@ -651,25 +689,38 @@ const API_ACTIONS = {
 const API_ERRORS = {
   unauthorized: "The user is not authorized to access the API",
   network_error: "No response from server, please check if you are correctly connected to internet",
+  server_error: "The server returned an error",
   invalid_credentials: "The provided credentials are invalid",
   timeout: "The API request timed out",
   generic: "Error fetching data from the API",
   not_found: "The requested resource was not found",
   unprocessable_entity: "The request was well-formed but was unable to be followed due to semantic errors"
 };
+function getErrorId(status) {
+  switch (status) {
+    case 401:
+      return "unauthorized";
+    case 404:
+      return "not_found";
+    case 422:
+      return "unprocessable_entity";
+    default:
+      return status >= 500 ? "server_error" : "generic";
+  }
+}
 function handleAPIError(action, error, customMessage) {
   if (error instanceof FetchError) {
-    const status = error.response.status;
-    switch (status) {
-      case 401:
-        throw new APIError("unauthorized", action, error, customMessage);
-      case 404:
-        throw new APIError("not_found", action, error, customMessage);
-      case 422:
-        throw new APIError("unprocessable_entity", action, error, customMessage);
-      default:
-        throw new APIError("network_error", action, error, customMessage);
-    }
+    const errorId = getErrorId(error.response.status);
+    throw new APIError(errorId, action, error, customMessage);
+  }
+  const response = error?.response;
+  if (response?.status) {
+    const wrappedError = new FetchError(
+      response.statusText ?? error.message,
+      { status: response.status, statusText: response.statusText ?? "", data: response.data }
+    );
+    const errorId = getErrorId(response.status);
+    throw new APIError(errorId, action, wrappedError, customMessage);
   }
   throw new APIError("generic", action, error, customMessage);
 }
@@ -1888,34 +1939,10 @@ const getUser = async (token, region) => {
     });
     return data?.user;
   } catch (error) {
-    if (error instanceof FetchError) {
-      const status = error.response.status;
-      switch (status) {
-        case 401:
-          throw new APIError("unauthorized", "get_user", error, `The token provided ${chalk.bold(maskToken(token))} is invalid.
-        Please make sure you are using the correct token and try again.`);
-        default:
-          throw new APIError("network_error", "get_user", error);
-      }
-    }
-    if (typeof error === "string" && error === "Unauthorized") {
-      const mockFetchError = new FetchError("Non-JSON response", {
-        status: 401,
-        statusText: "Unauthorized",
-        data: null
-      });
-      throw new APIError("unauthorized", "get_user", mockFetchError, `The token provided ${chalk.bold(maskToken(token))} is invalid.
-        Please make sure you are using the correct token and try again.`);
-    }
-    if (typeof error === "object" && error !== null && Object.keys(error).length === 0) {
-      const mockFetchError = new FetchError("Network Error", {
-        status: 500,
-        statusText: "Internal Server Error",
-        data: null
-      });
-      throw new APIError("network_error", "get_user", mockFetchError);
-    }
-    throw new APIError("generic", "get_user", error);
+    const status = error?.response?.status;
+    const customMessage = status === 401 ? `The token provided ${chalk.bold(maskToken(token))} is invalid.
+        Please make sure you are using the correct token and try again.` : void 0;
+    handleAPIError("get_user", error, customMessage);
   }
 };
 
@@ -1926,17 +1953,7 @@ const loginWithToken = async (token, region) => {
     if (error instanceof APIError) {
       throw error;
     }
-    if (error instanceof FetchError) {
-      const status = error.response.status;
-      switch (status) {
-        case 401:
-          throw new APIError("unauthorized", "login_with_token", error, `The token provided ${chalk.bold(maskToken(token))} is invalid.
-        Please make sure you are using the correct token and try again.`);
-        default:
-          throw new APIError("network_error", "login_with_token", error);
-      }
-    }
-    throw new APIError("generic", "login_with_token", error, "The provided credentials are invalid");
+    handleAPIError("login_with_token", error);
   }
 };
 const loginWithEmailAndPassword = async (email, password, region) => {
@@ -4025,13 +4042,13 @@ const createStory = async (spaceId, payload) => {
       },
       body: {
         story: payload.story,
-        publish: payload.publish
+        ...payload.publish ? { publish: payload.publish } : {}
       },
       throwOnError: true
     });
     return data?.story;
-  } catch (maybeError) {
-    handleAPIError("create_story", toError(maybeError));
+  } catch (error) {
+    handleAPIError("create_story", error);
   }
 };
 const updateStory = async (spaceId, storyId, payload) => {
@@ -4045,18 +4062,20 @@ const updateStory = async (spaceId, storyId, payload) => {
       body: {
         story: payload.story,
         force_update: payload.force_update === "1" ? "1" : "0",
-        publish: payload.publish
+        ...payload.publish ? { publish: payload.publish } : {}
       },
       throwOnError: true
     });
-    const { story } = data;
+    const story = data?.story;
     if (!story) {
       throw new Error("Failed to update story");
     }
     return story;
-  } catch (maybeError) {
-    handleAPIError("update_story", toError(maybeError));
-    throw maybeError;
+  } catch (error) {
+    if (error instanceof Error && error.message === "Failed to update story") {
+      throw error;
+    }
+    handleAPIError("update_story", error);
   }
 };
 
@@ -5299,6 +5318,121 @@ const storyblokSchemas = /* @__PURE__ */ new Map([
   ["richtext", getRichtextJSONSchema]
 ]);
 
+function generateStoryblokImports(storyblokPropertyTypes, STORY_TYPE) {
+  const imports = [];
+  const needsISbStoryData = storyblokPropertyTypes.has(STORY_TYPE);
+  if (needsISbStoryData) {
+    imports.push(`import type { ${STORY_TYPE} } from '@storyblok/js';`);
+    storyblokPropertyTypes.delete(STORY_TYPE);
+  }
+  if (storyblokPropertyTypes.size > 0) {
+    const typeImports = Array.from(storyblokPropertyTypes).map((type) => {
+      const pascalType = toPascalCase(type);
+      return `Storyblok${pascalType}`;
+    });
+    imports.push(`import type { ${typeImports.join(", ")} } from '../storyblok.d.ts';`);
+  }
+  return imports;
+}
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function hasIdentifier(content, identifier) {
+  const regex = new RegExp(`\\b${escapeRegExp(identifier)}\\b`, "g");
+  return regex.test(content);
+}
+function detectUsedStoryblokTypes(content, storyblokPropertyTypes, STORY_TYPE) {
+  const usedTypes = [];
+  if (content.includes(STORY_TYPE)) {
+    usedTypes.push(STORY_TYPE);
+  }
+  Array.from(storyblokPropertyTypes).forEach((type) => {
+    const pascalType = toPascalCase(type);
+    if (content.includes(`Storyblok${pascalType}`)) {
+      usedTypes.push(type);
+    }
+  });
+  return usedTypes;
+}
+function detectUsedDatasourceTypes(content, datasourceResults) {
+  return datasourceResults.filter((ds) => hasIdentifier(content, ds.title)).map((ds) => ds.title);
+}
+function detectReferencedComponents(content, currentTitle, componentResults) {
+  return componentResults.filter((c) => c.title !== currentTitle && hasIdentifier(content, c.title)).map((c) => c.title);
+}
+function generateComponentImports(componentContent, componentTitle, storyblokPropertyTypes, datasourceResults, componentResults, STORY_TYPE) {
+  const imports = [];
+  const usedStoryblokTypes = detectUsedStoryblokTypes(
+    componentContent,
+    storyblokPropertyTypes,
+    STORY_TYPE
+  );
+  if (usedStoryblokTypes.length > 0) {
+    const hasISbStoryData = usedStoryblokTypes.includes(STORY_TYPE);
+    const otherTypes = usedStoryblokTypes.filter((t) => t !== STORY_TYPE);
+    if (hasISbStoryData) {
+      imports.push(`import type { ${STORY_TYPE} } from '@storyblok/js';`);
+    }
+    if (otherTypes.length > 0) {
+      const typeImports = otherTypes.map((type) => {
+        const pascalType = toPascalCase(type);
+        return `Storyblok${pascalType}`;
+      });
+      imports.push(`import type { ${typeImports.join(", ")} } from '../storyblok.d.ts';`);
+    }
+  }
+  const usedDatasourceTypes = detectUsedDatasourceTypes(componentContent, datasourceResults);
+  if (usedDatasourceTypes.length > 0) {
+    imports.push(`import type { ${usedDatasourceTypes.join(", ")} } from './datasource-types.d.ts';`);
+  }
+  const referencedComponents = detectReferencedComponents(
+    componentContent,
+    componentTitle,
+    componentResults
+  );
+  if (referencedComponents.length > 0) {
+    const componentImportsStr = referencedComponents.map((name) => `import type { ${name} } from './${name}.d.ts';`).join("\n");
+    imports.push(componentImportsStr);
+  }
+  return imports;
+}
+function createDatasourcesFile(datasourceResults, typeDefs) {
+  if (datasourceResults.length === 0) {
+    return null;
+  }
+  const content = [
+    ...typeDefs,
+    ...datasourceResults.map((r) => r.content)
+  ].join("\n");
+  return { name: "datasource-types", content };
+}
+function createContentTypesFile(contentTypeBloks, typeDefs) {
+  if (contentTypeBloks.size === 0) {
+    return null;
+  }
+  const contentTypeNames = Array.from(contentTypeBloks);
+  const imports = contentTypeNames.map((name) => `import type { ${name} } from './${name}.d.ts';`).join("\n");
+  const typeUnion = contentTypeNames.length > 0 ? contentTypeNames.join("\n  | ") : "never";
+  const typeDefinition = `export type ContentType =
+  | ${typeUnion};`;
+  const content = [
+    ...typeDefs,
+    imports,
+    typeDefinition
+  ].join("\n");
+  return { name: "content-types", content };
+}
+function createComponentFile(componentResult, typeDefs, componentImports) {
+  return {
+    name: componentResult.title,
+    content: [
+      ...typeDefs,
+      ...componentImports,
+      componentResult.content
+    ].join("\n")
+  };
+}
+
 const STORY_TYPE = "ISbStoryData";
 const DEFAULT_COMPONENT_FILENAME = "storyblok-components";
 const DEFAULT_TYPEDEFS_HEADER = [
@@ -5390,6 +5524,9 @@ const getComponentType = (componentName, options) => {
   return isFirstCharacterNumber ? `_${componentType}` : componentType;
 };
 const getComponentPropertiesTypeAnnotations = async (component, options, spaceData, customFieldsParser) => {
+  if (!component.schema || typeof component.schema !== "object") {
+    return {};
+  }
   return Object.entries(component.schema).reduce(async (accPromise, [key, value]) => {
     const acc = await accPromise;
     if (key.startsWith("tab-")) {
@@ -5551,6 +5688,9 @@ const generateTypes = async (spaceData, options = {
     const datasourcesSchema = spaceData.datasources.map(async (datasource) => {
       const allComponentTypes = resolvedComponentsSchema.map((schema) => schema.title);
       const enumValues = datasource.entries?.filter((d) => d.value).map((d) => d.value);
+      if (!datasource.slug) {
+        return null;
+      }
       const type = getDatasourceTypeTitle(datasource.slug);
       if (allComponentTypes.includes(type)) {
         console.warn(`Warning: Datasource type "${type}" conflicts with existing component type`);
@@ -5563,7 +5703,10 @@ const generateTypes = async (spaceData, options = {
       };
       return datasourceSchema;
     });
-    const resolvedDatasourcesSchema = await Promise.all(datasourcesSchema);
+    const resolvedDatasourcesSchemaWithNulls = await Promise.all(datasourcesSchema);
+    const resolvedDatasourcesSchema = resolvedDatasourcesSchemaWithNulls.filter((s) => s !== null);
+    const componentTitles = new Set(resolvedComponentsSchema.map((s) => s.title).filter(Boolean));
+    const datasourceTitles = new Set(resolvedDatasourcesSchema.map((s) => s.title).filter(Boolean));
     const contentTypeSchema = {
       $id: `#/ContentType`,
       title: "ContentType",
@@ -5576,26 +5719,48 @@ const generateTypes = async (spaceData, options = {
       contentTypeSchema
     ];
     const result = await Promise.all(schemas.map(async (schema) => {
-      return await compile(schema, schema.title || schema.$id.replace("#/", ""), {
-        additionalProperties: !options.strict,
-        bannerComment: "",
-        ...compilerOptions
-      });
+      const title = schema.title || schema.$id.replace("#/", "");
+      return {
+        title,
+        content: await compile(schema, title, {
+          additionalProperties: !options.strict,
+          bannerComment: "",
+          ...compilerOptions
+        }),
+        isComponent: componentTitles.has(title),
+        isDatasource: datasourceTitles.has(title)
+      };
     }));
-    const imports = [];
-    const needsISbStoryData = storyblokPropertyTypes.has(STORY_TYPE);
-    if (needsISbStoryData) {
-      imports.push(`import type { ${STORY_TYPE} } from '@storyblok/js';`);
-      storyblokPropertyTypes.delete(STORY_TYPE);
-    }
-    if (storyblokPropertyTypes.size > 0) {
-      const typeImports = Array.from(storyblokPropertyTypes).map((type) => {
-        const pascalType = toPascalCase(type);
-        return `Storyblok${pascalType}`;
-      });
-      imports.push(`import type { ${typeImports.join(", ")} } from '../storyblok.d.ts';`);
+    const imports = generateStoryblokImports(storyblokPropertyTypes, STORY_TYPE);
+    if (options.separateFiles) {
+      const files = [];
+      const datasourceResults = result.filter((r) => r.isDatasource);
+      const componentResults = result.filter((r) => r.isComponent);
+      const datasourcesFile = createDatasourcesFile(datasourceResults, typeDefs);
+      if (datasourcesFile) {
+        files.push(datasourcesFile);
+      }
+      const contentTypesFile = createContentTypesFile(
+        contentTypeBloks,
+        typeDefs
+      );
+      if (contentTypesFile) {
+        files.push(contentTypesFile);
+      }
+      for (const componentResult of componentResults) {
+        const componentImports = generateComponentImports(
+          componentResult.content,
+          componentResult.title,
+          storyblokPropertyTypes,
+          datasourceResults,
+          componentResults,
+          STORY_TYPE
+        );
+        files.push(createComponentFile(componentResult, typeDefs, componentImports));
+      }
+      return files;
     }
-    const finalTypeDef = [...typeDefs, ...imports, ...result];
+    const finalTypeDef = [...typeDefs, ...imports, ...result.map((r) => r.content)];
     return [
       ...finalTypeDef
     ].join("\n");
@@ -5603,11 +5768,17 @@ const generateTypes = async (spaceData, options = {
     handleError(error);
   }
 };
-const saveTypesToComponentsFile = async (space, typedefString, options) => {
-  const { filename = DEFAULT_COMPONENT_FILENAME, path } = options;
+const saveTypesToComponentsFile = async (space, typedefData, options) => {
+  const { filename = DEFAULT_COMPONENT_FILENAME, path, separateFiles } = options;
   const resolvedPath = path ? resolve$1(process.cwd(), path, "types", space) : resolvePath(path, `types/${space}`);
   try {
-    await saveToFile(join(resolvedPath, `${filename}.d.ts`), typedefString);
+    if (separateFiles && Array.isArray(typedefData)) {
+      for (const { name, content } of typedefData) {
+        await saveToFile(join(resolvedPath, `${name}.d.ts`), content);
+      }
+    } else if (typeof typedefData === "string") {
+      await saveToFile(join(resolvedPath, `${filename}.d.ts`), typedefData);
+    }
   } catch (error) {
     handleFileSystemError("write", error);
   }
@@ -5801,16 +5972,18 @@ generateCmd.action(async (options, command) => {
   try {
     spinner.start(`Generating types...`);
     const componentsData = await readComponentsFiles({
-      ...options,
       from: space,
-      path
+      path,
+      suffix: options.suffix,
+      verbose
     });
     let dataSourceData;
     try {
       dataSourceData = await readDatasourcesFiles({
-        ...options,
         from: space,
-        path
+        path,
+        suffix: options.suffix,
+        verbose
       });
     } catch (error) {
       if (error instanceof FileSystemError && error.errorId === "file_not_found") {
@@ -5826,17 +5999,21 @@ generateCmd.action(async (options, command) => {
       ...componentsData,
       ...dataSourceData
     };
-    const typedefString = await generateTypes(spaceDataWithComponentsAndDatasources, {
+    const typedefData = await generateTypes(spaceDataWithComponentsAndDatasources, {
       ...options,
       path
     });
-    if (typedefString) {
-      await saveTypesToComponentsFile(space, typedefString, {
+    if (typedefData) {
+      await saveTypesToComponentsFile(space, typedefData, {
         filename: options.filename,
-        path
+        path,
+        separateFiles: options.separateFiles
       });
     }
     spinner.succeed();
+    if (options.separateFiles && options.filename) {
+      konsola.warn(`The --filename option is ignored when using --separate-files`);
+    }
     konsola.ok(`Successfully generated types for space ${space}`, true);
     konsola.br();
   } catch (error) {
@@ -7302,31 +7479,25 @@ const readLocalAssetsStream = ({
   const iterator = async function* readAssets() {
     try {
       const files = await readdir(directoryPath);
-      const metadataFiles = files.filter((file) => file.endsWith(".json") && file !== "manifest.jsonl");
-      setTotalAssets?.(metadataFiles.length);
-      for (const file of metadataFiles) {
-        const filePath = join(directoryPath, file);
+      const binaryFiles = files.filter((f) => SUPPORTED_ASSET_EXTENSIONS.has(extname(f).toLowerCase()));
+      setTotalAssets?.(binaryFiles.length);
+      for (const file of binaryFiles) {
+        const binaryFilePath = join(directoryPath, file);
         try {
-          const statResult = await stat(filePath);
-          if (!statResult.isFile()) {
-            continue;
-          }
-          const metadataContent = await readFile$1(filePath, "utf8");
-          const assetRaw = JSON.parse(metadataContent);
+          const sidecar = await loadSidecarAssetData(binaryFilePath);
+          const shortFilename = sidecar.short_filename || (sidecar.filename ? basename(sidecar.filename) : void 0) || file;
           const asset = {
-            ...assetRaw,
-            short_filename: assetRaw.short_filename || basename(assetRaw.filename)
+            ...sidecar,
+            short_filename: shortFilename
           };
-          const baseName = parse(file).name;
-          const extFromMetadata = extname(asset.short_filename || asset.filename) || "";
-          const assetBinaryPath = join(directoryPath, `${baseName}${extFromMetadata}`);
-          const fileBuffer = await readFile$1(assetBinaryPath);
+          const fileBuffer = await readFile$1(binaryFilePath);
+          const sidecarPath = getSidecarFilename(binaryFilePath);
           yield {
             asset,
             context: {
               fileBuffer,
-              assetBinaryPath,
-              assetPath: filePath
+              assetBinaryPath: binaryFilePath,
+              assetPath: sidecarPath
             }
           };
         } catch (maybeError) {
@@ -7710,6 +7881,9 @@ const traverseAndMapBySchema = (data, {
   processedFields,
   missingSchemas
 }) => {
+  if (!data?.component) {
+    return data ?? {};
+  }
   const schema = schemas[data.component];
   if (!schema) {
     missingSchemas.add(data.component);
@@ -7753,7 +7927,7 @@ const traverseAndMapRichtextDoc = (data, {
     }));
   }
   if (data && typeof data === "object") {
-    if (data.type === "link" && data.attrs.linktype === "story") {
+    if (data.type === "link" && data.attrs?.linktype === "story") {
       return {
         ...data,
         attrs: {
@@ -7767,7 +7941,7 @@ const traverseAndMapRichtextDoc = (data, {
         ...data,
         attrs: {
           ...data.attrs,
-          body: data.attrs.body.map((d) => traverseAndMapBySchema(d, {
+          body: (data.attrs?.body ?? []).map((d) => traverseAndMapBySchema(d, {
             schemas,
             maps,
             fieldRefMappers: fieldRefMappers2,
@@ -7809,7 +7983,7 @@ const multilinkFieldRefMapper = (data, { maps }) => {
 };
 const bloksFieldRefMapper = (data, { schemas, maps, fieldRefMappers: fieldRefMappers2, processedFields, missingSchemas }) => {
   if (!Array.isArray(data)) {
-    throw new TypeError("Invalid 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,
@@ -7828,7 +8002,7 @@ const assetFieldRefMapper = (data, { maps }) => {
 };
 const multiassetFieldRefMapper = (data, options) => {
   if (!Array.isArray(data)) {
-    throw new TypeError("Invalid data!");
+    throw new TypeError(`Invalid multiasset field: expected an array, but received ${JSON.stringify(data)}. Please make sure your multiasset field value is an array of asset objects (e.g. [{ filename: "...", id: 123 }]).`);
   }
   return data.map((d) => assetFieldRefMapper(d, options));
 };
@@ -7851,23 +8025,23 @@ const storyRefMapper = (story, { schemas, maps }) => {
   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
+    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 parentId = maps.stories?.get(story.parent_id) ?? story.parent_id;
   const mappedStory = {
     ...story,
-    content: traverseAndMapBySchema(story.content, {
+    content: story.content?.component ? traverseAndMapBySchema(story.content, {
       schemas,
       maps,
       fieldRefMappers,
       processedFields,
       missingSchemas
-    }),
-    id: Number(maps.stories?.get(story.id) || story.id),
-    uuid: String(maps.stories?.get(story.uuid) || story.uuid),
+    }) : story.content,
+    id: Number(maps.stories?.get(story.id) ?? story.id),
+    uuid: String(maps.stories?.get(story.uuid) ?? story.uuid),
     // @ts-expect-error Our types are wrong.
-    parent_id: parentId ? Number(parentId) : null,
+    parent_id: parentId != null ? Number(parentId) : null,
     alternates
   };
   return {
@@ -8029,14 +8203,14 @@ const getRemoteStory = async ({ spaceId, storyId }) => {
   return data?.story;
 };
 const makeCreateStoryAPITransport = ({ spaceId }) => async (localStory) => {
-  const { id: _id, uuid: _uuid, content, parent_id: _p, ...newStoryData } = localStory;
+  const { id: _id, uuid: _uuid, parent_id: _parentId, content, ...newStoryData } = localStory;
+  if (!localStory.is_folder && !content?.component) {
+    throw new Error(`Story "${localStory.slug}" is missing a content type (content.component). Every story must define a content field with a valid component.`);
+  }
   const remoteStory = await createStory(spaceId, {
     story: {
       ...newStoryData,
-      content: {
-        _uid: "",
-        component: "__tmp__"
-      }
+      ...content?.component ? { content: { _uid: "", component: "__migration_artifact__" } } : {}
     },
     publish: 0
   });
@@ -8112,7 +8286,7 @@ const makeWriteStoryFSTransport = ({ directoryPath }) => async (story) => {
 };
 const makeWriteStoryAPITransport = ({ spaceId, publish }) => (mappedLocalStory) => updateStory(spaceId, mappedLocalStory.id, {
   story: mappedLocalStory,
-  publish: publish ?? (mappedLocalStory.published ? 1 : 0)
+  publish: publish ?? (isStoryPublishedWithoutChanges(mappedLocalStory) ? 1 : 0)
 });
 const makeCleanupStoryFSTransport = ({ directoryPath, maps }) => async (mappedStory) => {
   const mapEntry = maps.stories?.entries().find(([_, v]) => v === mappedStory.uuid);
@@ -8738,14 +8912,14 @@ pushCmd.action(async (options, command) => {
           processProgress.setTotal(total);
           updateProgress.setTotal(total);
         },
-        onStoryError(error) {
+        onStoryError(error, filename) {
           summary.creationResults.failed += 1;
           summary.processResults.total -= 1;
           summary.updateResults.total -= 1;
           processProgress.setTotal(summary.processResults.total);
           updateProgress.setTotal(summary.updateResults.total);
           creationProgress.increment();
-          handleError(error, verbose);
+          handleError(error, verbose, { storyFile: filename });
         }
       }),
       // Create remote stories.
@@ -8754,7 +8928,6 @@ pushCmd.action(async (options, command) => {
         spaceId: space,
         transports: {
           createStory: options.dryRun ? async (story) => story : makeCreateStoryAPITransport({
-            maps,
             spaceId: space
           }),
           appendStoryManifest: options.dryRun ? () => Promise.resolve() : makeAppendToManifestFSTransport({
@@ -8779,13 +8952,13 @@ pushCmd.action(async (options, command) => {
           logger.info("Skipped creating story", { storyId: localStory.uuid });
           summary.creationResults.skipped += 1;
         },
-        onStoryError(error) {
+        onStoryError(error, localStory) {
           summary.creationResults.failed += 1;
           summary.processResults.total -= 1;
           summary.updateResults.total -= 1;
           processProgress.setTotal(summary.processResults.total);
           updateProgress.setTotal(summary.updateResults.total);
-          handleError(error, verbose);
+          handleError(error, verbose, { storyId: localStory?.uuid });
         },
         onIncrement() {
           creationProgress.increment();
@@ -8805,13 +8978,13 @@ pushCmd.action(async (options, command) => {
           processProgress.setTotal(total);
           updateProgress.setTotal(total);
         },
-        onStoryError(error) {
+        onStoryError(error, filename) {
           summary.creationResults.failed += 1;
           summary.processResults.total -= 1;
           summary.updateResults.total -= 1;
           processProgress.setTotal(summary.processResults.total);
           updateProgress.setTotal(summary.updateResults.total);
-          handleError(error, verbose);
+          handleError(error, verbose, { storyFile: filename });
         }
       }),
       // Map all references to numeric ids and uuids.