sb-mig 5.6.1-beta.2 → 5.6.2-beta.1

package/dist/cli/utils/discover.d.ts

@@ -28,7 +28,7 @@ interface DiscoverManyByPackageNameRequest {
 }
 type DiscoverResult = string[];
 export type { CompareResult, OneFileElement };
-export { normalizeDiscover, compare, filesPattern, } from "../../utils/path-utils.js";
+export { normalizeDiscover, compare, filesPattern, exactFilesPatterns, } from "../../utils/path-utils.js";
 export declare const discoverManyByPackageName: (request: DiscoverManyByPackageNameRequest) => DiscoverResult;
 export declare const discoverOneByPackageName: (request: DiscoverOneByPackageNameRequest) => DiscoverResult;
 export declare const discoverMany: (request: DiscoverManyRequest) => Promise<DiscoverResult>;

package/dist/cli/utils/discover.js

@@ -6,7 +6,7 @@ import storyblokConfig, { SCHEMA } from "../../config/config.js";
 import { buildOnTheFly } from "../../rollup/build-on-the-fly.js";
 import { getFileContentWithRequire, readFile } from "../../utils/files.js";
 import { safeGlobSync as globSync } from "../../utils/glob-utils.js";
-import { normalizeDiscover, filesPattern, compare, } from "../../utils/path-utils.js";
+import { normalizeDiscover, filesPattern, exactFilesPatterns, compare, } from "../../utils/path-utils.js";
 export var SCOPE;
 (function (SCOPE) {
     SCOPE["local"] = "local";
@@ -20,7 +20,7 @@ export var LOOKUP_TYPE;
     LOOKUP_TYPE["fileName"] = "fileName";
 })(LOOKUP_TYPE || (LOOKUP_TYPE = {}));
 // Re-export functions for backwards compatibility
-export { normalizeDiscover, compare, filesPattern, } from "../../utils/path-utils.js";
+export { normalizeDiscover, compare, filesPattern, exactFilesPatterns, } from "../../utils/path-utils.js";
 export const discoverManyByPackageName = (request) => {
     const rootDirectory = "./";
     const directory = path.resolve(process.cwd(), rootDirectory);
@@ -320,21 +320,17 @@ export const discoverStories = (request) => {
 export const discoverMigrationConfig = (request) => {
     const rootDirectory = "./";
     const directory = path.resolve(process.cwd(), rootDirectory);
-    let pattern;
-    let listOfFiles = [""];
+    let listOfFiles = [];
     switch (request.scope) {
         case SCOPE.local:
-            // ### MANY - LOCAL - fileName ###
-            // const onlyLocalComponentsDirectories =
-            //     storyblokConfig.componentsDirectories.filter(
-            //         (p: string) => !p.includes("node_modules")
-            //     );
-            pattern = path.join(`${directory}`, `${normalizeDiscover({
-                segments: storyblokConfig.componentsDirectories,
-            })}`, "**", `${normalizeDiscover({ segments: request.fileNames })}.${storyblokConfig.migrationConfigExt}`);
-            listOfFiles = globSync(pattern.replace(/\\/g, "/"), {
+            listOfFiles = exactFilesPatterns({
+                mainDirectory: directory,
+                componentDirectories: storyblokConfig.componentsDirectories,
+                fileNames: request.fileNames,
+                ext: storyblokConfig.migrationConfigExt,
+            }).flatMap((pattern) => globSync(pattern.replace(/\\/g, "/"), {
                 follow: true,
-            });
+            }));
             break;
         default:
             break;
@@ -384,18 +380,17 @@ export const discoverAllMigrationConfigs = (request) => {
 export const discoverVersionMapping = (request) => {
     const rootDirectory = "./";
     const directory = path.resolve(process.cwd(), rootDirectory);
-    let pattern;
-    let listOfFiles = [""];
+    let listOfFiles = [];
     switch (request.scope) {
         case SCOPE.all:
-            pattern = path.join(`${directory}`, `${normalizeDiscover({
-                segments: storyblokConfig.componentsDirectories,
-            })}`, "**", `${normalizeDiscover({
-                segments: request.fileNames,
-            })}.${"sb.migrations.cjs"}`);
-            listOfFiles = globSync(pattern.replace(/\\/g, "/"), {
+            listOfFiles = exactFilesPatterns({
+                mainDirectory: directory,
+                componentDirectories: storyblokConfig.componentsDirectories,
+                fileNames: request.fileNames,
+                ext: "sb.migrations.cjs",
+            }).flatMap((pattern) => globSync(pattern.replace(/\\/g, "/"), {
                 follow: true,
-            });
+            }));
             break;
         default:
             break;

package/dist/rollup/build-on-the-fly.js

@@ -13,27 +13,35 @@ export const buildOnTheFly = async ({ files }) => {
     }
     const projectDir = process.cwd();
     const cacheDir = path.join(`${projectDir}`, `${storyblokConfig.cacheDir}`, `sb-mig`);
-    await Promise.all(files.map(async (filePath) => {
-        const inputOptions = {
-            input: filePath,
-            plugins: [
-                ts({
-                    transpileOnly: true,
-                    transpiler: "swc",
-                }),
-            ],
-        };
-        const outputOptionsList = [
-            {
-                file: path.join(`${cacheDir}`, `${_extractComponentName(filePath)}.cjs`),
-                format: "cjs",
-            },
-            {
-                file: path.join(`${cacheDir}`, `${_extractComponentName(filePath)}.js`),
-                format: "es",
-            },
-        ];
-        await build({ inputOptions, outputOptionsList });
-    }));
-    Logger.success("Precompile successfull!.");
+    const BATCH_SIZE = 5;
+    const total = files.length;
+    Logger.log(`Compiling ${total} schema files...`);
+    for (let i = 0; i < total; i += BATCH_SIZE) {
+        const batch = files.slice(i, i + BATCH_SIZE);
+        const batchEnd = Math.min(i + BATCH_SIZE, total);
+        Logger.log(`[${i + 1}-${batchEnd}/${total}] Compiling batch...`);
+        await Promise.all(batch.map(async (filePath) => {
+            const inputOptions = {
+                input: filePath,
+                plugins: [
+                    ts({
+                        transpileOnly: true,
+                        transpiler: "swc",
+                    }),
+                ],
+            };
+            const outputOptionsList = [
+                {
+                    file: path.join(`${cacheDir}`, `${_extractComponentName(filePath)}.cjs`),
+                    format: "cjs",
+                },
+                {
+                    file: path.join(`${cacheDir}`, `${_extractComponentName(filePath)}.js`),
+                    format: "es",
+                },
+            ];
+            await build({ inputOptions, outputOptionsList });
+        }));
+    }
+    Logger.success(`Precompile successful! (${total} files)`);
 };

package/dist/rollup/setup-rollup.js

@@ -1,20 +1,20 @@
 import { rollup } from "rollup";
 export async function build({ inputOptions, outputOptionsList }) {
     let bundle;
-    let buildFailed = false;
     try {
         bundle = await rollup(inputOptions);
         await generateOutputs({ bundle, outputOptionsList });
         return [];
     }
     catch (error) {
-        buildFailed = true;
         console.error(error);
+        throw error;
     }
-    if (bundle) {
-        await bundle.close();
+    finally {
+        if (bundle) {
+            await bundle.close();
+        }
     }
-    process.exit(buildFailed ? 1 : 0);
 }
 async function generateOutputs({ bundle, outputOptionsList }) {
     for (const outputOptions of outputOptionsList) {

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

@@ -79,6 +79,17 @@ export declare const filesPattern: ({ mainDirectory, componentDirectories, ext,
     componentDirectories: string[];
     ext: string;
 }) => string;
+/**
+ * Builds glob file patterns for discovering exact file names across directories.
+ * Uses one pattern per directory/name pair so relative paths like ../../node_modules
+ * are preserved and not corrupted by path.join on brace-expanded segments.
+ */
+export declare const exactFilesPatterns: ({ mainDirectory, componentDirectories, fileNames, ext, }: {
+    mainDirectory: string;
+    componentDirectories: string[];
+    fileNames: string[];
+    ext: string;
+}) => string[];
 /**
  * Compares local and external file path arrays.
  * Splits paths to extract file names, filters out duplicates from external

package/dist/utils/path-utils.js

@@ -70,6 +70,14 @@ export const filesPattern = ({ mainDirectory, componentDirectories, ext, }) => {
         ? path.join(`${mainDirectory}`, `${componentDirectories[0]}`, "**", `[^_]*.${ext}`)
         : path.join(`${mainDirectory}`, `{${componentDirectories.join(",")}}`, "**", `[^_]*.${ext}`);
 };
+/**
+ * Builds glob file patterns for discovering exact file names across directories.
+ * Uses one pattern per directory/name pair so relative paths like ../../node_modules
+ * are preserved and not corrupted by path.join on brace-expanded segments.
+ */
+export const exactFilesPatterns = ({ mainDirectory, componentDirectories, fileNames, ext, }) => {
+    return componentDirectories.flatMap((componentDirectory) => fileNames.map((fileName) => path.join(`${mainDirectory}`, `${componentDirectory}`, "**", `${fileName}.${ext}`)));
+};
 /**
  * Compares local and external file path arrays.
  * Splits paths to extract file names, filters out duplicates from external

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

@@ -6,7 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compare = exports.filesPattern = exports.normalizeDiscover = exports.extractComponentName = void 0;
+exports.compare = exports.exactFilesPatterns = exports.filesPattern = exports.normalizeDiscover = exports.extractComponentName = void 0;
 const path_1 = __importDefault(require("path"));
 /**
  * Extracts the component name from a file path.
@@ -79,6 +79,15 @@ const filesPattern = ({ mainDirectory, componentDirectories, ext, }) => {
         : path_1.default.join(`${mainDirectory}`, `{${componentDirectories.join(",")}}`, "**", `[^_]*.${ext}`);
 };
 exports.filesPattern = filesPattern;
+/**
+ * Builds glob file patterns for discovering exact file names across directories.
+ * Uses one pattern per directory/name pair so relative paths like ../../node_modules
+ * are preserved and not corrupted by path.join on brace-expanded segments.
+ */
+const exactFilesPatterns = ({ mainDirectory, componentDirectories, fileNames, ext, }) => {
+    return componentDirectories.flatMap((componentDirectory) => fileNames.map((fileName) => path_1.default.join(`${mainDirectory}`, `${componentDirectory}`, "**", `${fileName}.${ext}`)));
+};
+exports.exactFilesPatterns = exactFilesPatterns;
 /**
  * Compares local and external file path arrays.
  * Splits paths to extract file names, filters out duplicates from external

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sb-mig",
-  "version": "5.6.1-beta.2",
+  "version": "5.6.2-beta.1",
   "description": "CLI to rule the world. (and handle stuff related to Storyblok CMS)",
   "author": "Marcin Krawczyk <marckraw@icloud.com>",
   "license": "MIT",