@public-ui/kolibri-cli 4.0.0-rc.2 → 4.0.0-rc.4

package/dist/migrate/index.js

@@ -64,10 +64,12 @@ Target version of @public-ui/*: ${options.overwriteTargetVersion}
 Source folder to migrate: ${baseDir}
 `);
             if (!fs_1.default.existsSync(baseDir)) {
-                throw (0, reuse_1.logAndCreateError)(`The specified source folder "${baseDir}" does not exist or is inaccessible. Please check the path and try again.`);
+                const absolutePath = path_1.default.resolve(process.cwd(), baseDir);
+                throw (0, reuse_1.logAndCreateError)(`The specified source folder "${absolutePath}" (${baseDir}) does not exist or is inaccessible. Please check the path and try again.`);
             }
             if (!(0, reuse_1.hasKoliBriTags)(baseDir)) {
-                console.log(chalk_1.default.yellow(`No KoliBri components (web or React) found under "${baseDir}". Check the path or your task configuration.`));
+                const absolutePath = path_1.default.resolve(process.cwd(), baseDir);
+                console.log(chalk_1.default.yellow(`No KoliBri components (web or React) found under "${absolutePath}" (${baseDir}). Check the path or your task configuration.`));
             }
             if (!options.ignoreGreaterVersion && semver_1.default.lt(options.overwriteTargetVersion, options.overwriteCurrentVersion)) {
                 throw (0, reuse_1.logAndCreateError)('Your current version of @public-ui/components is greater than the version of @public-ui/kolibri-cli. Please update @public-ui/kolibri-cli or force the migration with --ignore-greater-version.');
@@ -92,7 +94,6 @@ Source folder to migrate: ${baseDir}
             if (options.testTasks) {
                 runner.registerTasks(test_1.testTasks);
             }
-            let version = options.overwriteCurrentVersion;
             /**
              * Creates a replacer function for the package.json file.
              * @param {string} version Version to set
@@ -109,45 +110,44 @@ Source folder to migrate: ${baseDir}
             /**
              * Sets the version of the @public-ui/* packages in the package.json file.
              * @param {string} version Version to set
-             * @param {Function} cb Callback function
              */
-            function setVersionOfPublicUiPackages(version, cb) {
+            function setVersionOfPublicUiPackages(version) {
                 let packageJson = (0, reuse_1.getContentOfProjectPkgJson)();
                 packageJson = packageJson.replace(/"(@public-ui\/[^"]+)":\s*"(.*)"/g, createVersionReplacer(version));
                 fs_1.default.writeFileSync(path_1.default.resolve(process.cwd(), 'package.json'), packageJson);
                 runner.setProjectVersion(version);
                 console.log(`- Update @public-ui/* to version ${version}`);
-                (0, child_process_1.exec)((0, reuse_1.getPackageManagerCommand)('install'), (err) => {
-                    if (err) {
-                        console.error(`exec error: ${err.message}`);
-                        return;
-                    }
-                    cb();
-                });
             }
             /**
-             * Runs the task runner in a loop until all tasks are completed.
+             * Runs the task runner in batch mode with collected version steps.
              */
-            function runLoop() {
+            async function runMigrationBatch() {
+                // Set execution mode to batch - tasks don't install immediately
+                runner.setExecutionMode('batch');
+                console.log(`\nStarting migration in batch mode...`);
+                // Start version is the current project version (from package.json or --overwrite-current-version)
+                const startVersion = options.overwriteCurrentVersion;
+                // Target version is --overwrite-target-version (CLI version = migration target)
+                const targetVersion = options.overwriteTargetVersion;
+                console.log(`Migration path: ${startVersion} → ${targetVersion}`);
+                // Run all tasks (they transform the code, not the dependencies)
                 runner.run();
-                if (version !== runner.getPendingMinVersion()) {
-                    // Tasks
-                    version = runner.getPendingMinVersion();
-                    setVersionOfPublicUiPackages(version, runLoop);
-                }
-                else if (semver_1.default.lt(version, options.overwriteTargetVersion)) {
-                    // CLI
-                    version = options.overwriteTargetVersion;
-                    setVersionOfPublicUiPackages(version, finish);
-                }
-                else if (semver_1.default.lt(version, options.overwriteCurrentVersion)) {
-                    // Components
-                    version = options.overwriteCurrentVersion;
-                    setVersionOfPublicUiPackages(version, finish);
-                }
-                else {
-                    finish();
-                }
+                // Write final target version to package.json (only once)
+                setVersionOfPublicUiPackages(targetVersion);
+                // Install only once at the end
+                console.log(`\nInstalling dependencies once...`);
+                await new Promise((resolve, reject) => {
+                    (0, child_process_1.exec)((0, reuse_1.getPackageManagerCommand)('install'), (err) => {
+                        if (err) {
+                            console.error(`exec error: ${err.message}`);
+                            reject(err);
+                            return;
+                        }
+                        resolve();
+                    });
+                });
+                console.log(`Dependencies installed successfully.`);
+                finish();
             }
             /**
              * Prints the status of the task runner and the modified files.
@@ -221,7 +221,11 @@ If something is wrong, the migration can be reverted with ${chalk_1.default.ital
             const status = runner.getStatus();
             console.log(`
 Execute ${status.total} registered tasks...`);
-            runLoop();
+            // Use optimized batch mode for single-pass installation
+            runMigrationBatch().catch((error) => {
+                console.error('Migration failed:', error);
+                process.exit(1);
+            });
         });
     });
 }

package/dist/migrate/runner/abstract-task.js

@@ -14,6 +14,8 @@ class AbstractTask {
     versionRange;
     taskDependencies;
     status = 'pending';
+    executionMode = 'immediate';
+    pendingExecutables = [];
     static instances = new Map();
     description;
     constructor(identifier, title, extensions, versionRange, taskDependencies = [], options = {}) {
@@ -49,5 +51,17 @@ class AbstractTask {
     getVersionRange() {
         return this.versionRange;
     }
+    setExecutionMode(mode) {
+        this.executionMode = mode;
+    }
+    getExecutionMode() {
+        return this.executionMode;
+    }
+    getPendingExecutables() {
+        return this.pendingExecutables;
+    }
+    clearPendingExecutables() {
+        this.pendingExecutables = [];
+    }
 }
 exports.AbstractTask = AbstractTask;

package/dist/migrate/runner/task-runner.js

@@ -5,21 +5,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRunner = void 0;
 const chalk_1 = __importDefault(require("chalk"));
+const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
 const reuse_1 = require("../shares/reuse");
 const MIN_VERSION_OF_PUBLIC_UI = '1.4.2';
+/**
+ * Displays a progress bar in the console.
+ * @param {number} current Current progress
+ * @param {number} total Total items
+ * @param {string} title Optional title
+ */
+function displayProgressBar(current, total, title = '') {
+    const barLength = 30;
+    const percentage = total === 0 ? 0 : (current / total) * 100;
+    const filledLength = Math.round((barLength * current) / total);
+    const emptyLength = barLength - filledLength;
+    const bar = chalk_1.default.green('█'.repeat(filledLength)) + chalk_1.default.gray('░'.repeat(emptyLength));
+    const percentStr = percentage.toFixed(0).padStart(3, ' ');
+    // Bestimme die maximale Ziffernzahl des totals
+    const totalDigits = total.toString().length;
+    const currentStr = current.toString().padStart(totalDigits, ' ');
+    const taskStr = `${currentStr}/${total}`;
+    const titleStr = title ? ` ${title}` : '';
+    process.stdout.write(`\r${bar} ${percentStr}% [${taskStr}]${titleStr}`);
+}
 class TaskRunner {
     tasks = new Map();
     baseDir = '/';
     cliVersion = '0.0.0';
     projectVersion = '0.0.0';
+    executionMode = 'immediate';
+    aggregatedCommands = new Map(); // taskId -> commands
     config = {
         migrate: {
             tasks: {},
         },
     };
+    completedTasks = 0;
     constructor(baseDir, cliVersion, projectVersion, config) {
         this.setBaseDir(baseDir);
         this.setCliVersion(cliVersion);
@@ -46,6 +70,12 @@ class TaskRunner {
             this.projectVersion = version;
         }
     }
+    setExecutionMode(mode) {
+        this.executionMode = mode;
+        this.tasks.forEach((task) => {
+            task.setExecutionMode(mode);
+        });
+    }
     setConfig(config) {
         if (config.migrate?.tasks) {
             this.config.migrate.tasks = {
@@ -86,15 +116,22 @@ class TaskRunner {
         }
         else {
             this.config.migrate.tasks[task.getIdentifier()] = true;
-            if (task.getStatus() === 'pending' &&
-                semver_1.default.satisfies(this.projectVersion, task.getVersionRange(), {
-                    includePrerelease: true,
-                })) {
+            const isProjectVersionGreater = semver_1.default.gtr(this.projectVersion, task.getVersionRange(), {
+                includePrerelease: true,
+            });
+            const isCliVersionLower = semver_1.default.ltr(this.cliVersion, task.getVersionRange(), {
+                includePrerelease: true,
+            });
+            if (task.getStatus() === 'pending' && !isProjectVersionGreater && !isCliVersionLower) {
                 // task.setStatus('running'); only of the task is async
                 if (!this.tasks.has(task.getIdentifier())) {
                     this.registerTask(task);
                 }
                 task.run(this.baseDir);
+                // Collect commands if in batch mode
+                if (this.executionMode === 'batch') {
+                    this.aggregateCommandsFromTask(task);
+                }
                 task.setStatus('done');
             }
         }
@@ -103,14 +140,59 @@ class TaskRunner {
         taskDependencies.forEach((dependentTask) => {
             this.dependentTaskRun(dependentTask, dependentTask.getTaskDependencies());
         });
-        if (taskDependencies.every((dependentTask) => dependentTask.getStatus() === 'done')) {
+        if (taskDependencies.length === 0 || taskDependencies.every((dependentTask) => dependentTask.getStatus() === 'done')) {
+            displayProgressBar(this.completedTasks, this.tasks.size, task.getTitle());
             this.runTask(task);
+            this.completedTasks++;
         }
     }
     run() {
+        this.completedTasks = 0;
+        this.aggregatedCommands.clear();
+        displayProgressBar(0, this.tasks.size);
         this.tasks.forEach((task) => {
             this.dependentTaskRun(task, task.getTaskDependencies());
         });
+        displayProgressBar(this.tasks.size, this.tasks.size);
+        if (this.tasks.size > 0) {
+            console.log(); // New line after progress bar
+        }
+        // If in batch mode, collect and execute all commands at the end
+        if (this.executionMode === 'batch') {
+            this.executeAggregatedCommands();
+        }
+    }
+    aggregateCommandsFromTask(task) {
+        // HandleDependencyTask has prepareExecutables method
+        if ('prepareExecutables' in task && typeof task.prepareExecutables === 'function') {
+            const taskWithPrepare = task;
+            const commands = taskWithPrepare.prepareExecutables();
+            if (commands.length > 0) {
+                this.aggregatedCommands.set(task.getIdentifier(), commands);
+            }
+        }
+    }
+    executeAggregatedCommands() {
+        const allCommands = [];
+        this.aggregatedCommands.forEach((commands) => {
+            allCommands.push(...commands);
+        });
+        if (allCommands.length === 0) {
+            return;
+        }
+        console.log('\nExecuting aggregated dependency commands...');
+        allCommands.forEach((command) => {
+            try {
+                console.log(`  Running: ${command}`);
+                (0, child_process_1.execSync)(command, {
+                    encoding: 'utf8',
+                    stdio: 'inherit',
+                });
+            }
+            catch (error) {
+                console.warn(`Warning: Failed to execute command: ${command}`, error);
+            }
+        });
     }
     getPendingMinVersion() {
         let version = this.cliVersion;

package/dist/migrate/runner/tasks/common/HandleDependencyTask.js

@@ -24,26 +24,39 @@ class HandleDependencyTask extends abstract_task_1.AbstractTask {
         }
         return this.instances.get(identifier);
     }
-    run() {
+    /**
+     * Collect dependency commands to be executed in batch mode.
+     * Does NOT execute immediately - returns commands for aggregation.
+     */
+    prepareExecutables() {
+        const commands = [];
         if (Object.keys(this.dependencies ?? {}).length > 0) {
             let command = `${(0, reuse_1.getPackageManagerCommand)(this.command)}`;
             Object.keys(this.dependencies ?? {}).forEach((dependency) => {
                 command += ` ${dependency}@${this.dependencies[dependency]}`;
             });
-            try {
-                (0, child_process_1.execSync)(command, {
-                    encoding: 'utf8',
-                });
-            }
-            catch (error) {
-                console.warn(error);
-            }
+            commands.push(command);
         }
         if (Object.keys(this.devDependencies ?? {}).length > 0) {
             let command = `${(0, reuse_1.getPackageManagerCommand)(this.command)} -D`;
             Object.keys(this.devDependencies ?? {}).forEach((dependency) => {
                 command += ` ${dependency}`;
             });
+            commands.push(command);
+        }
+        return commands;
+    }
+    run() {
+        // In batch mode, commands are collected and executed later
+        // This method is kept for backward compatibility but does nothing
+        // Actual execution happens in TaskRunner with aggregated commands
+    }
+    /**
+     * Execute collected commands immediately (used for backward compatibility).
+     */
+    executeImmediate() {
+        const commands = this.prepareExecutables();
+        commands.forEach((command) => {
             try {
                 (0, child_process_1.execSync)(command, {
                     encoding: 'utf8',
@@ -52,7 +65,7 @@ class HandleDependencyTask extends abstract_task_1.AbstractTask {
             catch (error) {
                 console.warn(error);
             }
-        }
+        });
     }
 }
 exports.HandleDependencyTask = HandleDependencyTask;

package/dist/migrate/shares/reuse.js

@@ -47,7 +47,7 @@ function filterFilesByExt(dir, ext) {
     let files = [];
     const dirPath = path_1.default.resolve(process.cwd(), dir);
     fs_1.default.readdirSync(dirPath).forEach((file) => {
-        const fullPath = path_1.default.resolve(dir, file);
+        const fullPath = path_1.default.resolve(dirPath, file);
         if (fs_1.default.lstatSync(fullPath).isDirectory()) {
             files = files.concat(filterFilesByExt(fullPath, ext));
         }
@@ -65,7 +65,8 @@ function filterFilesByExt(dir, ext) {
  */
 function hasKoliBriTags(dir) {
     const regexes = [types_1.WEB_TAG_REGEX, types_1.REACT_TAG_REGEX];
-    const files = filterFilesByExt(dir, types_1.MARKUP_EXTENSIONS);
+    const dirPath = path_1.default.resolve(process.cwd(), dir);
+    const files = filterFilesByExt(dirPath, types_1.MARKUP_EXTENSIONS);
     for (const file of files) {
         let fd;
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@public-ui/kolibri-cli",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.4",
   "license": "EUPL-1.2",
   "homepage": "https://public-ui.github.io",
   "repository": {
@@ -30,13 +30,12 @@
     "prettier-plugin-organize-imports": "4.3.0",
     "semver": "7.7.3",
     "typed-bem": "1.0.2",
-    "@public-ui/components": "4.0.0-rc.2"
+    "@public-ui/components": "4.0.0-rc.4"
   },
   "devDependencies": {
     "@types/node": "24.10.4",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
-    "cpy-cli": "6.0.0",
     "cross-env": "10.1.0",
     "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.2",
@@ -47,7 +46,6 @@
     "knip": "5.80.0",
     "mocha": "11.7.5",
     "nodemon": "3.1.11",
-    "rimraf": "6.1.2",
     "ts-node": "10.9.2",
     "typescript": "5.9.3"
   },
@@ -59,14 +57,12 @@
   ],
   "scripts": {
     "build": "tsc",
-    "reset": "pnpm i @public-ui/components@1.1.7",
     "format": "prettier -c src",
     "lint": "pnpm lint:eslint && pnpm lint:tsc",
     "lint:eslint": "eslint src",
     "lint:tsc": "tsc --noemit",
     "pretest:unit": "pnpm build",
-    "restart": "pnpm reset && pnpm start",
-    "start": "rimraf test && cpy \"../../samples/react/src/components\" test/src && cpy \"../../samples/react/public/*.html\" test/ && ts-node src/index.ts migrate --ignore-uncommitted-changes --test-tasks test",
+    "start": "ts-node src/index.ts migrate --ignore-uncommitted-changes --overwrite-current-version=2.2.19-rc.0 --overwrite-target-version=4.0.0 --test-tasks ../../../test-migration",
     "test:unit": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha --require ts-node/register test/**/*.ts --no-experimental-strip-types",
     "unused": "knip",
     "watch": "nodemon --ignore package.json src/index.ts migrate --ignore-uncommitted-changes --test-tasks test"