@public-ui/kolibri-cli 4.2.1 → 4.3.0-rc.0

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

@@ -19,8 +19,10 @@ const MIN_VERSION_OF_PUBLIC_UI = '1.4.2';
  */
 function displayProgressBar(current, total, title = '') {
     const barLength = 30;
-    const percentage = total === 0 ? 0 : (current / total) * 100;
-    const filledLength = Math.round((barLength * current) / total);
+    // Clamp to 100 % so the bar stays valid even if the counter overshoots `total`
+    // (e.g. when tasks are revisited during iteration). Prevents `String.repeat(-1)`.
+    const percentage = total === 0 ? 0 : Math.min(100, (current / total) * 100);
+    const filledLength = total === 0 ? 0 : Math.min(barLength, 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, ' ');
@@ -140,10 +142,18 @@ class TaskRunner {
         taskDependencies.forEach((dependentTask) => {
             this.dependentTaskRun(dependentTask, dependentTask.getTaskDependencies());
         });
-        if (taskDependencies.length === 0 || taskDependencies.every((dependentTask) => dependentTask.getStatus() === 'done')) {
+        // A dependency that is excluded for the current version range ends up as `'skipped'`.
+        // Such dependencies must not block an otherwise applicable dependent task from running.
+        if (taskDependencies.length === 0 || taskDependencies.every((dependentTask) => ['done', 'skipped'].includes(dependentTask.getStatus()))) {
             displayProgressBar(this.completedTasks, this.tasks.size, task.getTitle());
+            // Only count a task once and only if it is actually part of the progress total:
+            // tasks revisited by `Map.forEach`, or dependencies excluded from `this.tasks`,
+            // would otherwise push `completedTasks` past `tasks.size`.
+            const wasPending = task.getStatus() === 'pending';
             this.runTask(task);
-            this.completedTasks++;
+            if (wasPending && this.tasks.has(task.getIdentifier())) {
+                this.completedTasks++;
+            }
         }
     }
     run() {

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

@@ -32,7 +32,10 @@ class GitIgnoreAddRuleTask extends abstract_task_1.AbstractTask {
         }
         else {
             const fileContent = fs_1.default.readFileSync(gitignorePath, 'utf8');
-            if (!fileContent.split('\n').includes(lineToAdd)) {
+            if (!fileContent
+                .split(/\r?\n/)
+                .map((l) => l.trimEnd())
+                .includes(lineToAdd)) {
                 fs_1.default.appendFileSync(gitignorePath, '\n' + lineToAdd);
             }
         }

package/dist/migrate/runner/tasks/index.js

@@ -6,7 +6,7 @@ const NpmRcAddRuleTask_1 = require("./common/NpmRcAddRuleTask");
 const TsConfigReconfigureTask_1 = require("./common/TsConfigReconfigureTask");
 const VsCodeSettingsReconfigureTask_1 = require("./common/VsCodeSettingsReconfigureTask");
 exports.commonTasks = [];
-exports.commonTasks.push(GitIgnoreAddRuleTask_1.GitIgnoreAddRuleTask.getInstance('.kolibri.migrate.json', '*'));
+exports.commonTasks.push(GitIgnoreAddRuleTask_1.GitIgnoreAddRuleTask.getInstance('.kolibri.config.json', '*'));
 exports.commonTasks.push(NpmRcAddRuleTask_1.NpmRcAddRuleTask.getInstance('save-exact=true', '*'));
 exports.commonTasks.push(VsCodeSettingsReconfigureTask_1.VsCodeSettingsReconfigureTask.getInstance('html.customData', ['./node_modules/@public-ui/components/vscode-custom-data.json'], '*'));
 // unused

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@public-ui/kolibri-cli",
-  "version": "4.2.1",
+  "version": "4.3.0-rc.0",
   "license": "EUPL-1.2",
   "homepage": "https://public-ui.github.io",
   "repository": {
@@ -30,7 +30,7 @@
     "prettier-plugin-organize-imports": "4.3.0",
     "semver": "7.8.1",
     "typed-bem": "1.0.2",
-    "@public-ui/components": "4.2.1"
+    "@public-ui/components": "4.3.0-rc.0"
   },
   "devDependencies": {
     "@eslint/js": "9.39.4",
@@ -42,12 +42,12 @@
     "eslint": "9.39.4",
     "eslint-plugin-html": "8.1.4",
     "eslint-plugin-jsx-a11y": "6.10.2",
-    "knip": "6.14.2",
+    "knip": "6.15.0",
     "mocha": "11.7.6",
     "nodemon": "3.1.14",
     "ts-node": "10.9.2",
     "typescript": "5.9.3",
-    "@public-ui/components": "4.2.1"
+    "@public-ui/components": "4.3.0-rc.0"
   },
   "engines": {
     "node": ">=22"