storyblok 4.15.1 → 4.16.0

package/dist/config/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../src/lib/config/types.ts"],"sourcesContent":["import type { RegionCode } from '../../constants';\nimport type { Command, Option } from 'commander';\nimport type { CommandOptions } from '../../types';\nimport type { PullComponentsOptions } from '../../commands/components/pull/constants';\nimport type { PushComponentsOptions } from '../../commands/components/push/constants';\nimport type { PullDatasourcesOptions } from '../../commands/datasources/pull/constants';\nimport type { PushDatasourcesOptions } from '../../commands/datasources/push/constants';\nimport type { DeleteDatasourceOptions } from '../../commands/datasources/delete/constants';\nimport type { MigrationsGenerateOptions } from '../../commands/migrations/generate/constants';\nimport type { MigrationsRunOptions } from '../../commands/migrations/run/constants';\nimport type { MigrationsRollbackOptions } from '../../commands/migrations/rollback/types';\nimport type { GenerateTypesOptions } from '../../commands/types/generate/constants';\nimport type { PullLanguagesOptions } from '../../commands/languages/constants';\nimport type { PullAssetsOptions } from '../../commands/assets/pull/types';\nimport type { PushAssetsOptions } from '../../commands/assets/push/types';\nimport type { PullStoriesOptions } from '../../commands/stories/pull/types';\nimport type { PushStoriesOptions } from '../../commands/stories/push/types';\nimport type { PruneLogsOptions } from '../../commands/logs/prune/types';\nimport type { PruneReportsOptions } from '../../commands/reports/prune/types';\nimport type { DeepPartial } from '../../utils/types';\n\nexport type PlainObject = Record<string, any>;\n\nexport interface ApiConfig {\n  maxRetries: number;\n  maxConcurrency: number;\n}\n\nexport interface LogConsoleConfig {\n  enabled: boolean;\n  level: string;\n}\n\nexport interface LogFileConfig {\n  enabled: boolean;\n  level: string;\n  maxFiles: number;\n}\n\nexport interface LogConfig {\n  console: LogConsoleConfig;\n  file: LogFileConfig;\n}\n\nexport interface ReportConfig {\n  enabled: boolean;\n  maxFiles: number;\n}\n\nexport interface UiConfig {\n  enabled: boolean;\n}\n\nexport interface GlobalConfig {\n  region?: RegionCode;\n  space?: number | string;\n  path?: string;\n  api: ApiConfig;\n  log: LogConfig;\n  report: ReportConfig;\n  ui: UiConfig;\n  verbose: boolean;\n}\n\nexport interface ResolvedCliConfig extends GlobalConfig {\n  [key: string]: any;\n}\n\ntype StripCommandOption<T> = T extends CommandOptions ? Omit<T, keyof CommandOptions> : T;\ntype CommandConfig<T> = Partial<StripCommandOption<T>>;\n\nexport interface SharedConfigOptions {\n  space?: number | string;\n  path?: string;\n}\n\nexport interface CommandOptionsMap {\n  components: { pull: PullComponentsOptions; push: PushComponentsOptions };\n  datasources: { pull: PullDatasourcesOptions; push: PushDatasourcesOptions; delete: DeleteDatasourceOptions };\n  migrations: { generate: MigrationsGenerateOptions; run: MigrationsRunOptions; rollback: MigrationsRollbackOptions };\n  types: { generate: GenerateTypesOptions };\n  languages: { pull: PullLanguagesOptions };\n  assets: { pull: PullAssetsOptions; push: PushAssetsOptions };\n  stories: { pull: PullStoriesOptions; push: PushStoriesOptions };\n  logs: { list: Record<string, never>; prune: PruneLogsOptions };\n  reports: { list: Record<string, never>; prune: PruneReportsOptions };\n}\n\ntype SubcommandConfig<T> = SharedConfigOptions & CommandConfig<T>;\n\ntype ModuleConfig<Subs extends Record<string, any>> = SharedConfigOptions & {\n  [K in keyof Subs]?: SubcommandConfig<Subs[K]>;\n};\n\nexport type ModulesConfig = {\n  [K in keyof CommandOptionsMap]?: ModuleConfig<CommandOptionsMap[K]>;\n};\n\nexport type ComponentsModuleConfig = ModulesConfig['components'];\nexport type DatasourcesModuleConfig = ModulesConfig['datasources'];\nexport type MigrationsModuleConfig = ModulesConfig['migrations'];\nexport type TypesModuleConfig = ModulesConfig['types'];\nexport type LanguagesModuleConfig = ModulesConfig['languages'];\nexport type AssetsModuleConfig = ModulesConfig['assets'];\nexport type StoriesModuleConfig = ModulesConfig['stories'];\nexport type LogsModuleConfig = ModulesConfig['logs'];\nexport type ReportsModuleConfig = ModulesConfig['reports'];\n\nexport interface StoryblokConfig extends DeepPartial<GlobalConfig> {\n  modules?: ModulesConfig;\n}\n\nexport function defineConfig<T extends StoryblokConfig>(config: T): T {\n  return config;\n}\n\nexport type OptionParser<T> = (value: string, previous?: T) => T;\n\nexport interface GlobalOptionDefinition<T = unknown> {\n  flags: string;\n  description: string;\n  defaultValue?: T;\n  parser?: OptionParser<T>;\n}\n\nexport interface ConfigLocation {\n  cwd: string;\n  configFile: string;\n}\n\nexport type CommanderOption = Option;\nexport type CommanderCommand = Command;\n"],"names":[],"mappings":"AAgHO,SAAS,aAAwC,MAAc,EAAA;AACpE,EAAO,OAAA,MAAA;AACT;;;;"}
+{"version":3,"file":"index.mjs","sources":["../../src/lib/config/types.ts"],"sourcesContent":["import type { RegionCode } from '../../constants';\nimport type { Command, Option } from 'commander';\nimport type { CommandOptions } from '../../types';\nimport type { PullComponentsOptions } from '../../commands/components/pull/constants';\nimport type { PushComponentsOptions } from '../../commands/components/push/constants';\nimport type { PullDatasourcesOptions } from '../../commands/datasources/pull/constants';\nimport type { PushDatasourcesOptions } from '../../commands/datasources/push/constants';\nimport type { DeleteDatasourceOptions } from '../../commands/datasources/delete/constants';\nimport type { MigrationsGenerateOptions } from '../../commands/migrations/generate/constants';\nimport type { MigrationsRunOptions } from '../../commands/migrations/run/constants';\nimport type { MigrationsRollbackOptions } from '../../commands/migrations/rollback/types';\nimport type { GenerateTypesOptions } from '../../commands/types/generate/constants';\nimport type { PullLanguagesOptions } from '../../commands/languages/constants';\nimport type { PullAssetsOptions } from '../../commands/assets/pull/types';\nimport type { PushAssetsOptions } from '../../commands/assets/push/types';\nimport type { PullStoriesOptions } from '../../commands/stories/pull/types';\nimport type { PushStoriesOptions } from '../../commands/stories/push/types';\nimport type { PruneLogsOptions } from '../../commands/logs/prune/types';\nimport type { PruneReportsOptions } from '../../commands/reports/prune/types';\nimport type { DeepPartial } from '../../utils/types';\n\nexport type PlainObject = Record<string, any>;\n\nexport interface ApiConfig {\n  maxRetries: number;\n  maxConcurrency: number;\n}\n\nexport interface LogConsoleConfig {\n  enabled: boolean;\n  level: string;\n}\n\nexport interface LogFileConfig {\n  enabled: boolean;\n  level: string;\n  maxFiles: number;\n}\n\nexport interface LogConfig {\n  console: LogConsoleConfig;\n  file: LogFileConfig;\n}\n\nexport interface ReportConfig {\n  enabled: boolean;\n  maxFiles: number;\n}\n\nexport interface UiConfig {\n  enabled: boolean;\n}\n\nexport interface GlobalConfig {\n  region?: RegionCode;\n  space?: number | string;\n  path?: string;\n  api: ApiConfig;\n  log: LogConfig;\n  report: ReportConfig;\n  ui: UiConfig;\n  verbose: boolean;\n}\n\nexport interface ResolvedCliConfig extends GlobalConfig {\n  [key: string]: any;\n}\n\ntype StripCommandOption<T> = T extends CommandOptions ? Omit<T, keyof CommandOptions> : T;\ntype CommandConfig<T> = Partial<StripCommandOption<T>>;\n\nexport interface SharedConfigOptions {\n  space?: number | string;\n  path?: string;\n}\n\nexport interface CommandOptionsMap {\n  components: { pull: PullComponentsOptions; push: PushComponentsOptions };\n  datasources: { pull: PullDatasourcesOptions; push: PushDatasourcesOptions; delete: DeleteDatasourceOptions };\n  migrations: { generate: MigrationsGenerateOptions; run: MigrationsRunOptions; rollback: MigrationsRollbackOptions };\n  types: { generate: GenerateTypesOptions };\n  languages: { pull: PullLanguagesOptions };\n  assets: { pull: PullAssetsOptions; push: PushAssetsOptions };\n  stories: { pull: PullStoriesOptions; push: PushStoriesOptions };\n  logs: { list: Record<string, never>; prune: PruneLogsOptions };\n  reports: { list: Record<string, never>; prune: PruneReportsOptions };\n}\n\ntype SubcommandConfig<T> = SharedConfigOptions & CommandConfig<T>;\n\ntype ModuleConfig<Subs extends Record<string, any>> = SharedConfigOptions & {\n  [K in keyof Subs]?: SubcommandConfig<Subs[K]>;\n};\n\nexport type ModulesConfig = {\n  [K in keyof CommandOptionsMap]?: ModuleConfig<CommandOptionsMap[K]>;\n};\n\nexport type ComponentsModuleConfig = ModulesConfig['components'];\nexport type DatasourcesModuleConfig = ModulesConfig['datasources'];\nexport type MigrationsModuleConfig = ModulesConfig['migrations'];\nexport type TypesModuleConfig = ModulesConfig['types'];\nexport type LanguagesModuleConfig = ModulesConfig['languages'];\nexport type AssetsModuleConfig = ModulesConfig['assets'];\nexport type StoriesModuleConfig = ModulesConfig['stories'];\nexport type LogsModuleConfig = ModulesConfig['logs'];\nexport type ReportsModuleConfig = ModulesConfig['reports'];\n\nexport interface StoryblokConfig extends DeepPartial<GlobalConfig> {\n  modules?: ModulesConfig;\n}\n\nexport function defineConfig<T extends StoryblokConfig>(config: T): T {\n  return config;\n}\n\nexport type OptionParser<T> = (value: string, previous?: T) => T;\n\nexport interface GlobalOptionDefinition<T = unknown> {\n  flags: string;\n  description: string;\n  defaultValue?: T;\n  parser?: OptionParser<T>;\n}\n\nexport interface ConfigLocation {\n  cwd: string;\n  configFile: string;\n}\n\nexport type CommanderOption = Option;\nexport type CommanderCommand = Command;\n"],"names":[],"mappings":"AAgHO,SAAS,aAAwC,MAAA,EAAc;AACpE,EAAA,OAAO,MAAA;AACT;;;;"}

package/dist/index.mjs

@@ -1,14 +1,13 @@
 #!/usr/bin/env node
 import 'dotenv/config';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { resolve, dirname, isAbsolute, relative as relative$1, join as join$1 } from 'pathe';
+import { resolve, dirname, join, parse, extname, relative, isAbsolute, basename } from 'pathe';
 import { existsSync, mkdirSync, appendFileSync, writeFileSync, readdirSync, unlinkSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { loadConfig as loadConfig$1, SUPPORTED_EXTENSIONS } from 'c12';
 import chalk from 'chalk';
 import { readPackageUp } from 'read-package-up';
 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 } from 'node:fs/promises';
@@ -1075,10 +1074,10 @@ const konsola = {
   }
 };
 
-const __filename$1 = fileURLToPath(import.meta.url);
-const __dirname$1 = dirname(__filename$1);
+const __filename$2 = fileURLToPath(import.meta.url);
+const __dirname$2 = dirname(__filename$2);
 const result = await readPackageUp({
-  cwd: __dirname$1
+  cwd: __dirname$2
 });
 const packageJson$1 = result ? result.packageJson : {
   name: "storyblok",
@@ -1092,8 +1091,8 @@ function getPackageJson() {
   return packageJson$1;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __filename$1 = fileURLToPath(import.meta.url);
+const __dirname$1 = dirname(__filename$1);
 function isRegion(value) {
   return Object.values(regions).includes(value);
 }
@@ -1309,7 +1308,7 @@ const deduplicateManifest = async (manifestFile) => {
 };
 const resolvePath = (path, folder) => {
   const basePath = path ?? DEFAULT_STORAGE_DIR;
-  return resolve$1(process.cwd(), basePath, folder);
+  return resolve(process.cwd(), basePath, folder);
 };
 function resolveCommandPath(commandPath, space, baseDir) {
   if (space) {
@@ -1421,7 +1420,7 @@ class Reporter {
     if (this.maxFiles === void 0) {
       return;
     }
-    const dir = dirname$1(this.filePath);
+    const dir = dirname(this.filePath);
     const ext = extname(this.filePath);
     Reporter.pruneReportFiles(dir, this.maxFiles, ext);
   }
@@ -1479,7 +1478,7 @@ class FileTransport {
     if (this.maxFiles === void 0) {
       return;
     }
-    const dir = dirname$1(this.filePath);
+    const dir = dirname(this.filePath);
     const ext = extname(this.filePath);
     FileTransport.pruneLogFiles(dir, this.maxFiles, ext);
   }
@@ -1878,7 +1877,7 @@ function getProgram() {
           options.path
         );
         const logFilename = `${commandPieces.join("-")}-${runId}.jsonl`;
-        logFilePath = path.join(logsPath, logFilename);
+        logFilePath = join(logsPath, logFilename);
         transports.push(
           new FileTransport({
             filePath: logFilePath,
@@ -1902,7 +1901,7 @@ function getProgram() {
           options.path
         );
         const reportFilename = `${commandPieces.join("-")}-${runId}.json`;
-        const reportFilePath = path.join(reportPath, reportFilename);
+        const reportFilePath = join(reportPath, reportFilename);
         const reporter = getReporter({
           enabled: true,
           filePath: reportFilePath,
@@ -2339,7 +2338,7 @@ const fetchComponentInternalTags = async (spaceId) => {
 const saveComponentsToFiles = async (space, spaceData, options) => {
   const { components = [], groups = [], presets = [], internalTags = [] } = spaceData;
   const { filename = DEFAULT_COMPONENTS_FILENAME, suffix, path, separateFiles } = options;
-  const resolvedPath = path ? resolve$1(process.cwd(), path, "components", space) : resolvePath(path, `components/${space}`);
+  const resolvedPath = path ? resolve(process.cwd(), path, "components", space) : resolvePath(path, `components/${space}`);
   try {
     if (separateFiles) {
       for (const component of components) {
@@ -2713,17 +2712,17 @@ pullCmd$4.action(async (componentName, options, command) => {
         konsola.warn(`The --filename option is ignored when using --separate-files`);
       }
       const filePath = `${componentsOutputDir}/`;
-      const displayPath = path && isAbsolute(path) ? filePath : `${relative$1(process.cwd(), componentsOutputDir)}/`;
+      const displayPath = path && isAbsolute(path) ? filePath : `${relative(process.cwd(), componentsOutputDir)}/`;
       konsola.ok(`Components downloaded successfully to ${chalk.hex(colorPalette.PRIMARY)(displayPath)}`);
     } else if (componentName) {
       const fileName = suffix ? `${actualFilename}.${suffix}.json` : `${componentName}.json`;
-      const filePath = join$1(componentsOutputDir, fileName);
-      const displayPath = path && isAbsolute(path) ? filePath : relative$1(process.cwd(), filePath);
+      const filePath = join(componentsOutputDir, fileName);
+      const displayPath = path && isAbsolute(path) ? filePath : relative(process.cwd(), filePath);
       konsola.ok(`Component ${chalk.hex(colorPalette.PRIMARY)(componentName)} downloaded successfully in ${chalk.hex(colorPalette.PRIMARY)(displayPath)}`);
     } else {
       const fileName = suffix ? `${actualFilename}.${suffix}.json` : `${actualFilename}.json`;
-      const filePath = join$1(componentsOutputDir, fileName);
-      const displayPath = path && isAbsolute(path) ? filePath : relative$1(process.cwd(), filePath);
+      const filePath = join(componentsOutputDir, fileName);
+      const displayPath = path && isAbsolute(path) ? filePath : relative(process.cwd(), filePath);
       konsola.ok(`Components downloaded successfully to ${chalk.hex(colorPalette.PRIMARY)(displayPath)}`);
     }
     konsola.br();
@@ -3906,8 +3905,8 @@ pullCmd$3.action(async (options, command) => {
     });
     const languagesOutputDir = resolveCommandPath("languages", space, path);
     const fileName = suffix ? `${filename}.${suffix}.json` : `${filename}.json`;
-    const filePath = join$1(languagesOutputDir, fileName);
-    const displayPath = path && isAbsolute(path) ? filePath : relative$1(process.cwd(), filePath);
+    const filePath = join(languagesOutputDir, fileName);
+    const displayPath = path && isAbsolute(path) ? filePath : relative(process.cwd(), filePath);
     spinner.succeed();
     konsola.ok(`Languages schema downloaded successfully at ${chalk.hex(colorPalette.PRIMARY)(displayPath)}`, true);
   } catch (error) {
@@ -3937,7 +3936,7 @@ const getMigrationTemplate = () => {
 `;
 };
 const generateMigration = async (space, path, component, suffix) => {
-  const resolvedPath = path ? resolve$1(process.cwd(), path, "migrations", space) : resolvePath(path, `migrations/${space}`);
+  const resolvedPath = path ? resolve(process.cwd(), path, "migrations", space) : resolvePath(path, `migrations/${space}`);
   const fileName = suffix ? `${component.name}.${suffix}.js` : `${component.name}.js`;
   const migrationPath = join(resolvedPath, fileName);
   try {
@@ -4078,6 +4077,36 @@ const updateStory = async (spaceId, storyId, payload) => {
     handleAPIError("update_story", error);
   }
 };
+const prefetchTargetStories = async (spaceId, options) => {
+  const result = {
+    bySlug: /* @__PURE__ */ new Map(),
+    byId: /* @__PURE__ */ new Map()
+  };
+  let page = 1;
+  let totalPages = 1;
+  while (page <= totalPages) {
+    const response = await fetchStories(spaceId, { page, per_page: 100 });
+    if (!response) {
+      break;
+    }
+    const total = Number(response.headers.get("Total"));
+    const perPage = Number(response.headers.get("Per-Page"));
+    totalPages = Math.ceil(total / perPage);
+    if (page === 1) {
+      options?.onTotal?.(total);
+    }
+    for (const story of response.stories) {
+      const ref = { id: story.id, uuid: story.uuid };
+      if (story.full_slug) {
+        result.bySlug.set(story.full_slug, ref);
+      }
+      result.byId.set(story.id, ref);
+    }
+    options?.onIncrement?.(response.stories.length);
+    page++;
+  }
+  return result;
+};
 
 const ERROR_CODES = {
   MIGRATION_APPLY_TO_STORY_ERROR: "MIGRATION_APPLY_TO_STORY_ERROR",
@@ -4545,8 +4574,8 @@ const findComponentSchemas = async (directoryPath) => {
     }
     throw error;
   });
-  const fileContents = files.filter((f) => path.extname(f) === ".json").map((f) => {
-    const filePath = path.join(directoryPath, f);
+  const fileContents = files.filter((f) => extname(f) === ".json").map((f) => {
+    const filePath = join(directoryPath, f);
     const fileContent = readFileSync(filePath, "utf-8");
     return JSON.parse(fileContent);
   });
@@ -5611,7 +5640,7 @@ const getComponentPropertiesTypeAnnotations = async (component, options, spaceDa
 };
 const loadCustomFieldsParser = async (path) => {
   try {
-    const customFieldsParser = await import(resolve$1(path));
+    const customFieldsParser = await import(pathToFileURL(resolve(path)).href);
     return customFieldsParser.default;
   } catch (error) {
     handleError(error);
@@ -5620,7 +5649,7 @@ const loadCustomFieldsParser = async (path) => {
 };
 async function loadCompilerOptions(path) {
   if (path) {
-    const compilerOptions = await import(resolve$1(path));
+    const compilerOptions = await import(pathToFileURL(resolve(path)).href);
     return compilerOptions.default;
   }
   return {};
@@ -5770,7 +5799,7 @@ const generateTypes = async (spaceData, 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}`);
+  const resolvedPath = path ? resolve(process.cwd(), path, "types", space) : resolvePath(path, `types/${space}`);
   try {
     if (separateFiles && Array.isArray(typedefData)) {
       for (const { name, content } of typedefData) {
@@ -5786,7 +5815,7 @@ const saveTypesToComponentsFile = async (space, typedefData, options) => {
 const generateStoryblokTypes = async (options = {}) => {
   const { path } = options;
   try {
-    const storyblokTypesPath = resolve$1(__dirname, "./index.d.ts");
+    const storyblokTypesPath = resolve(__dirname$1, "./index.d.ts");
     const storyblokTypesContent = readFileSync(storyblokTypesPath, "utf-8");
     const typeDefs = [
       "// This file was generated by the Storyblok CLI.",
@@ -5794,7 +5823,7 @@ const generateStoryblokTypes = async (options = {}) => {
       `import type { ${STORY_TYPE} } from '@storyblok/js';`,
       storyblokTypesContent
     ].join("\n");
-    const resolvedPath = path ? resolve$1(process.cwd(), path, "types") : resolvePath(path, "types");
+    const resolvedPath = path ? resolve(process.cwd(), path, "types") : resolvePath(path, "types");
     await saveToFile(join(resolvedPath, `storyblok.d.ts`), typeDefs);
     return true;
   } catch (error) {
@@ -6113,7 +6142,7 @@ const fetchDatasource = async (spaceId, datasourceName) => {
 };
 const saveDatasourcesToFiles = async (space, datasources, options) => {
   const { filename = DEFAULT_DATASOURCES_FILENAME, suffix, path, separateFiles } = options;
-  const resolvedPath = path ? resolve$1(process.cwd(), path, "datasources", space) : resolvePath(path, `datasources/${space}`);
+  const resolvedPath = path ? resolve(process.cwd(), path, "datasources", space) : resolvePath(path, `datasources/${space}`);
   try {
     if (separateFiles) {
       for (const datasource of datasources) {
@@ -6181,17 +6210,17 @@ pullCmd$2.action(async (datasourceName, options, command) => {
         konsola.warn(`The --filename option is ignored when using --separate-files`);
       }
       const filePath = `${datasourcesOutputDir}/`;
-      const displayPath = path && isAbsolute(path) ? filePath : `${relative$1(process.cwd(), datasourcesOutputDir)}/`;
+      const displayPath = path && isAbsolute(path) ? filePath : `${relative(process.cwd(), datasourcesOutputDir)}/`;
       konsola.ok(`Datasources downloaded successfully to ${chalk.hex(colorPalette.PRIMARY)(displayPath)}`);
     } else if (datasourceName) {
       const fileName = suffix ? `${actualFilename}.${suffix}.json` : `${datasourceName}.json`;
-      const filePath = join$1(datasourcesOutputDir, fileName);
-      const displayPath = path && isAbsolute(path) ? filePath : relative$1(process.cwd(), filePath);
+      const filePath = join(datasourcesOutputDir, fileName);
+      const displayPath = path && isAbsolute(path) ? filePath : relative(process.cwd(), filePath);
       konsola.ok(`Datasource ${chalk.hex(colorPalette.PRIMARY)(datasourceName)} downloaded successfully in ${chalk.hex(colorPalette.PRIMARY)(displayPath)}`);
     } else {
       const fileName = suffix ? `${actualFilename}.${suffix}.json` : `${actualFilename}.json`;
-      const filePath = join$1(datasourcesOutputDir, fileName);
-      const displayPath = path && isAbsolute(path) ? filePath : relative$1(process.cwd(), filePath);
+      const filePath = join(datasourcesOutputDir, fileName);
+      const displayPath = path && isAbsolute(path) ? filePath : relative(process.cwd(), filePath);
       konsola.ok(`Datasources downloaded successfully to ${chalk.hex(colorPalette.PRIMARY)(displayPath)}`);
     }
     konsola.br();
@@ -6400,7 +6429,7 @@ const createOctokit = (token) => {
 
 const generateProject = async (blueprint, projectName, targetPath = process.cwd()) => {
   try {
-    const projectPath = path.join(targetPath, projectName);
+    const projectPath = join(targetPath, projectName);
     const templateRepo = `storyblok/blueprint-core-${blueprint}`;
     try {
       await fs.access(projectPath);
@@ -6437,7 +6466,7 @@ const generateProject = async (blueprint, projectName, targetPath = process.cwd(
 };
 const createEnvFile = async (projectPath, storyblokVars, additionalVars) => {
   try {
-    const envPath = path.join(projectPath, ".env");
+    const envPath = join(projectPath, ".env");
     let envContent = `# Storyblok Configuration
 ${Object.entries(storyblokVars).map(([key, value]) => `${key}=${value}`).join("\n")}
 `;
@@ -6655,7 +6684,7 @@ program$5.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
           if (!value.trim()) {
             return "Project path is required";
           }
-          const projectName2 = path.basename(value);
+          const projectName2 = basename(value);
           if (!/^[\w-]+$/.test(projectName2)) {
             return "Project name (last part of the path) can only contain letters, numbers, hyphens, and underscores";
           }
@@ -6663,9 +6692,9 @@ program$5.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
         }
       });
     }
-    const resolvedPath = path.resolve(finalProjectPath);
-    const targetDirectory = path.dirname(resolvedPath);
-    const projectName = path.basename(resolvedPath);
+    const resolvedPath = resolve(finalProjectPath);
+    const targetDirectory = dirname(resolvedPath);
+    const projectName = basename(resolvedPath);
     konsola.br();
     konsola.info(`Scaffolding your project using the ${chalk.hex(colorPalette.CREATE)(technologyTemplate)} template...`);
     await generateProject(technologyTemplate, projectName, targetDirectory);
@@ -7125,7 +7154,7 @@ const parseAssetData = (raw) => {
   }
 };
 const getSidecarFilename = (assetBinaryPath) => {
-  return join(dirname$1(assetBinaryPath), `${basename(assetBinaryPath, extname(assetBinaryPath))}.json`);
+  return join(dirname(assetBinaryPath), `${basename(assetBinaryPath, extname(assetBinaryPath))}.json`);
 };
 const loadSidecarAssetData = async (assetBinaryPath) => {
   const sidecarPath = getSidecarFilename(assetBinaryPath);
@@ -8187,23 +8216,8 @@ const mapReferencesStream = ({
     }
   });
 };
-const getRemoteStory = async ({ spaceId, storyId }) => {
-  const { data, response } = await getMapiClient().stories.get({
-    path: {
-      space_id: spaceId,
-      story_id: storyId
-    }
-  });
-  if (!response.ok && response.status !== 404) {
-    handleAPIError("pull_story", new FetchError(response.statusText, response));
-  }
-  if (data?.story?.deleted_at) {
-    return void 0;
-  }
-  return data?.story;
-};
 const makeCreateStoryAPITransport = ({ spaceId }) => async (localStory) => {
-  const { id: _id, uuid: _uuid, parent_id: _parentId, content, ...newStoryData } = localStory;
+  const { id: _id, uuid: _uuid, parent_id: _parentId, is_startpage: _isStartpage, 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.`);
   }
@@ -8234,7 +8248,8 @@ const makeAppendToManifestFSTransport = ({ manifestFile }) => async (localStory,
 };
 const createStoryPlaceholderStream = ({
   maps,
-  spaceId,
+  existingTargetStories,
+  isCrossSpace,
   transports,
   onIncrement,
   onStorySuccess,
@@ -8249,16 +8264,19 @@ const createStoryPlaceholderStream = ({
       const task = (async () => {
         try {
           const mappedStoryId = maps.stories?.get(localStory.id);
-          const mappedRemoteStory = mappedStoryId && await getRemoteStory({ spaceId, storyId: Number(mappedStoryId) });
+          const mappedRemoteStory = mappedStoryId ? existingTargetStories.byId.get(Number(mappedStoryId)) : void 0;
           if (mappedRemoteStory) {
             onStorySkipped?.(localStory, mappedRemoteStory);
             return;
           }
-          const existingRemoteStory = await getRemoteStory({ spaceId, storyId: localStory.id });
-          if (existingRemoteStory && existingRemoteStory.uuid === localStory.uuid) {
-            await transports.appendStoryManifest(localStory, existingRemoteStory);
-            onStorySkipped?.(localStory, existingRemoteStory);
-            return;
+          const existingBySlug = localStory.full_slug ? existingTargetStories.bySlug.get(localStory.full_slug) : void 0;
+          if (existingBySlug) {
+            const isMatchConfirmed = isCrossSpace || existingBySlug.uuid === localStory.uuid;
+            if (isMatchConfirmed) {
+              await transports.appendStoryManifest(localStory, existingBySlug);
+              onStorySkipped?.(localStory, existingBySlug);
+              return;
+            }
           }
           const newRemoteStory = await transports.createStory(localStory);
           await transports.appendStoryManifest(localStory, newRemoteStory);
@@ -8281,7 +8299,7 @@ const createStoryPlaceholderStream = ({
   });
 };
 const makeWriteStoryFSTransport = ({ directoryPath }) => async (story) => {
-  await saveToFile(resolve$1(directoryPath, getStoryFilename(story)), JSON.stringify(story, null, 2));
+  await saveToFile(resolve(directoryPath, getStoryFilename(story)), JSON.stringify(story, null, 2));
   return story;
 };
 const makeWriteStoryAPITransport = ({ spaceId, publish }) => (mappedLocalStory) => updateStory(spaceId, mappedLocalStory.id, {
@@ -8295,7 +8313,7 @@ const makeCleanupStoryFSTransport = ({ directoryPath, maps }) => async (mappedSt
     slug: mappedStory.slug,
     uuid: originalUuid
   });
-  const storyFilePath = resolve$1(directoryPath, storyFilename);
+  const storyFilePath = resolve(directoryPath, storyFilename);
   await unlink(storyFilePath);
 };
 const writeStoryStream = ({
@@ -8896,6 +8914,12 @@ pushCmd.action(async (options, command) => {
       logger.error(message);
       return;
     }
+    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 creationProgress = ui.createProgressBar({ title: "Creating Stories...".padEnd(21) });
     const processProgress = ui.createProgressBar({ title: "Processing Stories...".padEnd(21) });
@@ -8925,7 +8949,8 @@ pushCmd.action(async (options, command) => {
       // Create remote stories.
       createStoryPlaceholderStream({
         maps,
-        spaceId: space,
+        existingTargetStories,
+        isCrossSpace: fromSpace !== space,
         transports: {
           createStory: options.dryRun ? async (story) => story : makeCreateStoryAPITransport({
             spaceId: space