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

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.');

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

@@ -10,6 +10,26 @@ 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 = '/';
@@ -20,6 +40,7 @@ class TaskRunner {
             tasks: {},
         },
     };
+    completedTasks = 0;
     constructor(baseDir, cliVersion, projectVersion, config) {
         this.setBaseDir(baseDir);
         this.setCliVersion(cliVersion);
@@ -86,10 +107,13 @@ 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);
@@ -103,14 +127,22 @@ 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;
+        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
+        }
     }
     getPendingMinVersion() {
         let version = this.cliVersion;

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.3",
   "license": "EUPL-1.2",
   "homepage": "https://public-ui.github.io",
   "repository": {
@@ -30,7 +30,7 @@
     "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.3"
   },
   "devDependencies": {
     "@types/node": "24.10.4",