@nmakarov/cli-toolkit 0.77.0 → 0.78.0

package/dist/init.js

@@ -2515,6 +2515,8 @@ var Logger = class _Logger {
   options;
   transport;
   startTimes = {};
+  /** Count at the first progress sample for each prefix (rate baseline). */
+  startCounts = {};
   lastProgressTimes = {};
   constructor(context, options = {}) {
     this.context = context;
@@ -2650,15 +2652,17 @@ var Logger = class _Logger {
       total,
       prefix
     };
-    if (!this.startTimes[prefix ?? ""]) {
-      this.startTimes[prefix ?? ""] = Date.now();
+    const key = prefix ?? "";
+    if (this.startTimes[key] === void 0) {
+      this.startTimes[key] = Date.now();
+      this.startCounts[key] = count;
     }
     const wantTimes = this.options.progressTimes;
     const wantRate = this.options.progressRate;
     if (wantTimes || wantRate) {
-      const elapsedSeconds = (Date.now() - this.startTimes[prefix ?? ""]) / 1e3;
-      const intervals = count > 1 ? count - 1 : 0;
-      const itemsPerSec = intervals > 0 && elapsedSeconds > 0 ? intervals / elapsedSeconds : -1;
+      const elapsedSeconds = (Date.now() - this.startTimes[key]) / 1e3;
+      const done = count - (this.startCounts[key] ?? count);
+      const itemsPerSec = done > 0 && elapsedSeconds > 0 ? done / elapsedSeconds : -1;
       if (wantTimes) {
         let remaining = -1;
         if (itemsPerSec > 0) {
@@ -2672,8 +2676,9 @@ var Logger = class _Logger {
       }
     }
     if (count >= total) {
-      delete this.startTimes[prefix ?? ""];
-      delete this.lastProgressTimes[prefix ?? ""];
+      delete this.startTimes[key];
+      delete this.startCounts[key];
+      delete this.lastProgressTimes[key];
     }
     if (this.shouldOutputProgress(prefix ?? "", count, total)) {
       this.out(payload);