sb-mig 6.0.0-beta.6 → 6.0.0-beta.7

package/dist/api/data-migration/component-data-migration.js

@@ -246,7 +246,6 @@ const applySingleMigrationToItems = ({ itemType, itemsToMigrate, preparedMigrati
     };
 };
 export const runMigrationPipelineInMemory = ({ itemType, itemsToMigrate, preparedMigrationConfigs, }) => {
-    const originalItems = deepClone(itemsToMigrate);
     let workingItems = deepClone(itemsToMigrate);
     const stepReports = [];
     for (const preparedMigrationConfig of preparedMigrationConfigs) {
@@ -283,7 +282,7 @@ export const runMigrationPipelineInMemory = ({ itemType, itemsToMigrate, prepare
         stepReports.push(stepReport);
     }
     const changedItems = workingItems.filter((item, index) => {
-        const originalItem = originalItems[index];
+        const originalItem = itemsToMigrate[index];
         if (!originalItem) {
             return true;
         }

package/dist/api/stories/stories.js

@@ -1,9 +1,11 @@
 import chalk from "chalk";
+import { mapWithConcurrency } from "../../utils/async-utils.js";
 import Logger from "../../utils/logger.js";
 import { notNullish } from "../../utils/object-utils.js";
 import { getAllItemsWithPagination } from "../utils/request.js";
 const resolveStoryLabel = (content, storyId) => content?.full_slug || content?.slug || content?.name || String(storyId);
 const DEFAULT_PUBLISH_LANGUAGE = "[default]";
+const STORY_CONTENT_FETCH_CONCURRENCY = 10;
 const isDefaultLanguageToken = (language) => language.toLowerCase() === "default" ||
     language === DEFAULT_PUBLISH_LANGUAGE;
 const normalizePublishLanguageCodes = (languages) => {
@@ -144,7 +146,7 @@ export const getAllStories = async (args, config) => {
     });
     Logger.success(`Successfully pre-fetched ${allStoriesWithoutContent.length} stories.`);
     let heartBeat = 0;
-    const allStories = await Promise.all(allStoriesWithoutContent.map(async (story) => {
+    const allStories = await mapWithConcurrency(allStoriesWithoutContent, STORY_CONTENT_FETCH_CONCURRENCY, async (story) => {
         const result = await getStoryById(story.id, config);
         heartBeat++;
         if (heartBeat % 10 === 0 ||
@@ -152,7 +154,7 @@ export const getAllStories = async (args, config) => {
             Logger.success(`Successfully fetched ${heartBeat} stories with full content.`);
         }
         return result;
-    }));
+    });
     return allStories;
 };
 // GET

package/dist/config/helper.js

@@ -1,12 +1,12 @@
+import { pathToFileURL } from "url";
 import Logger from "../utils/logger.js";
+const toImportSpecifier = (filePath) => process.platform === "win32" ? pathToFileURL(filePath).href : filePath;
 export { defaultConfig } from "./defaultConfig.js";
 export { SCHEMA } from "./constants.js";
 export const getStoryblokConfigContent = (data) => {
-    let prefix = "";
-    if (process.platform === "win32") {
-        prefix = "file://";
-    }
-    return import(`${prefix}${data.filePath}${data.ext}`)
+    const configSpecifier = toImportSpecifier(`${data.filePath}${data.ext}`);
+    const fallbackConfigSpecifier = toImportSpecifier(`${data.filePath}.mjs`);
+    return import(/* @vite-ignore */ configSpecifier)
         .then((res) => {
         Logger.success("Found storyblok.config.js!");
         return res.default;
@@ -14,10 +14,9 @@ export const getStoryblokConfigContent = (data) => {
         .catch(() => {
         Logger.warning("Cannot find requested file with .js extension.");
         Logger.log("Trying .mjs extension\n");
-        return import(`${prefix}${data.filePath}.mjs`)
+        return import(/* @vite-ignore */ fallbackConfigSpecifier)
             .then((res) => {
             Logger.success("Found storyblok.config.mjs!");
-            console.log("res", res);
             return res.default;
         })
             .catch(() => {

package/dist/utils/async-utils.d.ts

@@ -11,3 +11,4 @@
  * await delay(1000); // Wait 1 second
  */
 export declare const delay: (time: number) => Promise<void>;
+export declare const mapWithConcurrency: <T, R>(items: T[], concurrency: number, mapper: (item: T, index: number) => Promise<R>) => Promise<R[]>;

package/dist/utils/async-utils.js

@@ -11,3 +11,19 @@
  * await delay(1000); // Wait 1 second
  */
 export const delay = (time) => new Promise((resolve) => setTimeout(resolve, time));
+export const mapWithConcurrency = async (items, concurrency, mapper) => {
+    if (items.length === 0) {
+        return [];
+    }
+    const limit = Math.max(1, Math.floor(concurrency));
+    const results = new Array(items.length);
+    let nextIndex = 0;
+    const workers = Array.from({ length: Math.min(limit, items.length) }, async () => {
+        while (nextIndex < items.length) {
+            const currentIndex = nextIndex++;
+            results[currentIndex] = await mapper(items[currentIndex], currentIndex);
+        }
+    });
+    await Promise.all(workers);
+    return results;
+};

package/dist/utils/files.d.ts

@@ -1,4 +1,5 @@
 import type { RequestBaseConfig } from "../api/utils/request.js";
+export declare const toImportSpecifier: (filePath: string, platform?: NodeJS.Platform) => string;
 /**
  * Asynchronously load a file using dynamic import
  * Returns the default export of the module

package/dist/utils/files.js

@@ -1,11 +1,25 @@
 import * as fs from "fs";
 import { writeFile } from "fs";
 import { createRequire } from "module";
-import path from "path";
+import nodePath from "path";
+import { pathToFileURL } from "url";
 import pkg from "ncp";
 import { generateDatestamp } from "./date-utils.js";
 import Logger from "./logger.js";
 const { ncp } = pkg;
+const resolveFromCwd = (filePath, pathApi = nodePath) => pathApi.isAbsolute(filePath)
+    ? filePath
+    : pathApi.resolve(process.cwd(), filePath);
+export const toImportSpecifier = (filePath, platform = process.platform) => {
+    if (/^(file|data|node):/.test(filePath)) {
+        return filePath;
+    }
+    const pathApi = platform === "win32" ? nodePath.win32 : nodePath;
+    const resolvedPath = resolveFromCwd(filePath, pathApi);
+    return platform === "win32"
+        ? pathToFileURL(resolvedPath, { windows: true }).href
+        : resolvedPath;
+};
 // ============================================================================
 // File Content Loading
 // ============================================================================
@@ -17,7 +31,7 @@ const { ncp } = pkg;
  * @returns The default export of the imported module
  */
 export const getFileContent = (data) => {
-    return import(data.file)
+    return import(/* @vite-ignore */ toImportSpecifier(data.file))
         .then((res) => {
         return res.default;
     })
@@ -56,14 +70,14 @@ export const getFilesContentWithRequire = (data) => {
  * @returns Parsed package.json object
  */
 export const getPackageJson = () => {
-    const packageJsonPath = path.join(process.cwd(), "package.json");
+    const packageJsonPath = nodePath.join(process.cwd(), "package.json");
     const packageJsonContent = fs.readFileSync(packageJsonPath, "utf-8");
     const packageJson = JSON.parse(packageJsonContent);
     return packageJson;
 };
 export const isDirectoryExists = (path) => fs.existsSync(path);
 export const createDir = async (dirPath) => {
-    await fs.promises.mkdir(`${process.cwd()}/${dirPath}`, {
+    await fs.promises.mkdir(resolveFromCwd(dirPath), {
         recursive: true,
     });
 };
@@ -103,10 +117,10 @@ export const copyFolder = async (src, dest) => {
     });
 };
 export const copyFile = async (src, dest) => {
-    const directory = dest.split("/").slice(0, dest.split("/").length - 1);
-    const fileName = src.split("/")[src.split("/").length - 1];
-    if (!isDirectoryExists(directory.join("/"))) {
-        await createDir(directory.join("/"));
+    const directory = nodePath.dirname(dest);
+    const fileName = nodePath.basename(src);
+    if (!isDirectoryExists(directory)) {
+        await createDir(directory);
     }
     fs.copyFile(src, dest, (err) => {
         if (err) {
@@ -141,10 +155,7 @@ export const createAndSaveToFile = async (args, config) => {
         Logger.success(`All response written to a file:  ${fullPath}`);
     }
     if (path) {
-        const folderPath = path
-            .split("/")
-            .slice(0, path.split("/").length - 1)
-            .join("/");
+        const folderPath = nodePath.dirname(path);
         await createDir(folderPath);
         await createJsonFile(JSON.stringify(res, undefined, 2), path);
         Logger.success(`All response written to a file:  ${path}`);
@@ -169,7 +180,7 @@ export const createAndSaveComponentListToFile = async ({ file, folder, res, time
     Logger.success(`All components written to a file:  ${filename}`);
 };
 export const readFile = async (pathToFile) => {
-    const absolutePath = path.join(process.cwd(), pathToFile);
+    const absolutePath = resolveFromCwd(pathToFile);
     try {
         const result = await fs.promises.readFile(absolutePath);
         return result.toString();
@@ -192,13 +203,13 @@ export const dumpToFile = async (path, content) => {
 };
 export const getConsumerPackageJson = async () => {
     const consumerPkg = await getFileContentWithRequire({
-        file: path.join(process.cwd(), "package.json"),
+        file: nodePath.join(process.cwd(), "package.json"),
     });
     return consumerPkg;
 };
 export const getSbMigPackageJson = async () => {
     const sbMigPkg = await getFileContentWithRequire({
-        file: path.join("..", "..", "package.json"),
+        file: nodePath.join("..", "..", "package.json"),
     });
     return sbMigPkg;
 };

package/dist-cjs/api/stories/stories.js

@@ -5,11 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deepUpsertStory = exports.upsertStory = exports.updateStories = exports.publishStoryLanguages = exports.updateStory = exports.createStory = exports.getStoryBySlug = exports.getStoryById = exports.getAllStories = exports.removeAllStories = exports.removeStory = exports.resolvePublishLanguageCodes = exports.parsePublishLanguagesOption = void 0;
 const chalk_1 = __importDefault(require("chalk"));
+const async_utils_js_1 = require("../../utils/async-utils.js");
 const logger_js_1 = __importDefault(require("../../utils/logger.js"));
 const object_utils_js_1 = require("../../utils/object-utils.js");
 const request_js_1 = require("../utils/request.js");
 const resolveStoryLabel = (content, storyId) => content?.full_slug || content?.slug || content?.name || String(storyId);
 const DEFAULT_PUBLISH_LANGUAGE = "[default]";
+const STORY_CONTENT_FETCH_CONCURRENCY = 10;
 const isDefaultLanguageToken = (language) => language.toLowerCase() === "default" ||
     language === DEFAULT_PUBLISH_LANGUAGE;
 const normalizePublishLanguageCodes = (languages) => {
@@ -154,7 +156,7 @@ const getAllStories = async (args, config) => {
     });
     logger_js_1.default.success(`Successfully pre-fetched ${allStoriesWithoutContent.length} stories.`);
     let heartBeat = 0;
-    const allStories = await Promise.all(allStoriesWithoutContent.map(async (story) => {
+    const allStories = await (0, async_utils_js_1.mapWithConcurrency)(allStoriesWithoutContent, STORY_CONTENT_FETCH_CONCURRENCY, async (story) => {
         const result = await (0, exports.getStoryById)(story.id, config);
         heartBeat++;
         if (heartBeat % 10 === 0 ||
@@ -162,7 +164,7 @@ const getAllStories = async (args, config) => {
             logger_js_1.default.success(`Successfully fetched ${heartBeat} stories with full content.`);
         }
         return result;
-    }));
+    });
     return allStories;
 };
 exports.getAllStories = getAllStories;

package/dist-cjs/utils/async-utils.js

@@ -0,0 +1,34 @@
+"use strict";
+/**
+ * Async utility functions
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapWithConcurrency = exports.delay = void 0;
+/**
+ * Delay execution for a specified time
+ *
+ * @param time - Time to delay in milliseconds
+ * @returns Promise that resolves after the delay
+ *
+ * @example
+ * await delay(1000); // Wait 1 second
+ */
+const delay = (time) => new Promise((resolve) => setTimeout(resolve, time));
+exports.delay = delay;
+const mapWithConcurrency = async (items, concurrency, mapper) => {
+    if (items.length === 0) {
+        return [];
+    }
+    const limit = Math.max(1, Math.floor(concurrency));
+    const results = new Array(items.length);
+    let nextIndex = 0;
+    const workers = Array.from({ length: Math.min(limit, items.length) }, async () => {
+        while (nextIndex < items.length) {
+            const currentIndex = nextIndex++;
+            results[currentIndex] = await mapper(items[currentIndex], currentIndex);
+        }
+    });
+    await Promise.all(workers);
+    return results;
+};
+exports.mapWithConcurrency = mapWithConcurrency;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sb-mig",
-  "version": "6.0.0-beta.6",
+  "version": "6.0.0-beta.7",
   "description": "CLI to rule the world. (and handle stuff related to Storyblok CMS)",
   "author": "Marcin Krawczyk <marckraw@icloud.com>",
   "license": "MIT",
@@ -42,7 +42,7 @@
   ],
   "scripts": {
     "lint-staged": "node ./src/scripts/fix-esm.js && lint-staged",
-    "build": "rm -rf dist dist-cjs && tsc -p tsconfig.json && tsc -p tsconfig.api-v2.cjs.json && node ./src/scripts/write-cjs-package.js && chmod +x ./dist/cli/index.js",
+    "build": "node ./src/scripts/clean-build.js && tsc -p tsconfig.json && tsc -p tsconfig.api-v2.cjs.json && node ./src/scripts/write-cjs-package.js && node ./src/scripts/make-cli-executable.js",
     "build:dev": "chokidar 'src/**/*.{js,ts,cjs,mjs}' -c 'npm run build'",
     "lint": "eslint . --max-warnings=0",
     "lint:fix": "eslint --fix",