@flowscripter/dynamic-cli-framework 7.0.5 → 7.0.7

package/dist/src/cli/BaseCLI.d.ts

@@ -31,6 +31,9 @@ import type BaseCLIFeatureOptions from "./BaseCLIFeatureOptions.ts";
  * * {@link UpgradeServiceProvider}
  * * {@link PluginServiceProvider}
  *
+ * Enabling the plugin service also registers {@link SpawnServiceProvider}, as plugin installation
+ * spawns the package manager via the spawn service.
+ *
  * `keyReader` is optional. If omitted, or if the stderr {@link Terminal} is not a TTY, prompting is
  * unavailable: {@link PrompterServiceProvider} (and {@link ArgumentPrompterServiceProvider}, if
  * enabled) are simply not registered. If `promptingEnabled` is `true` in that situation, {@link run}

package/dist/src/cli/BaseCLI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseCLI.d.ts","sourceRoot":"","sources":["../../../src/cli/BaseCLI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yCAAyC,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAGvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAsBzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAS3E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAC;AAGpD,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AAkBpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,YAAW,GAAG;;IAazC,YACE,SAAS,EAAE,SAAS,EACpB,oBAAoB,EAAE,cAAc,EACpC,oBAAoB,EAAE,cAAc,EACpC,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,QAAQ,EACxB,cAAc,EAAE,QAAQ,EACxB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,qBAAqB,EAoEhC;IAED;;;;;;;OAOG;IACI,kBAAkB,CAAC,eAAe,EAAE,eAAe,QAEzD;IAED;;;;;;;;OAQG;IACH;;;;;OAKG;IACI,cAAc,CAAC,IAAI,EAAE,WAAW,QAEtC;IAEM,UAAU,CAAC,OAAO,EAAE,OAAO,QAQjC;IAEK,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAsOzD;CACF"}
+{"version":3,"file":"BaseCLI.d.ts","sourceRoot":"","sources":["../../../src/cli/BaseCLI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yCAAyC,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAGvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAsBzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAS3E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAC;AAGpD,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AAkBpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,YAAW,GAAG;;IAazC,YACE,SAAS,EAAE,SAAS,EACpB,oBAAoB,EAAE,cAAc,EACpC,oBAAoB,EAAE,cAAc,EACpC,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,QAAQ,EACxB,cAAc,EAAE,QAAQ,EACxB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,qBAAqB,EAoEhC;IAED;;;;;;;OAOG;IACI,kBAAkB,CAAC,eAAe,EAAE,eAAe,QAEzD;IAED;;;;;;;;OAQG;IACH;;;;;OAKG;IACI,cAAc,CAAC,IAAI,EAAE,WAAW,QAEtC;IAEM,UAAU,CAAC,OAAO,EAAE,OAAO,QAQjC;IAEK,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAwOzD;CACF"}

package/dist/src/cli/BaseCLI.js

@@ -54,6 +54,9 @@ const logger = getLogger("BaseCLI");
  * * {@link UpgradeServiceProvider}
  * * {@link PluginServiceProvider}
  *
+ * Enabling the plugin service also registers {@link SpawnServiceProvider}, as plugin installation
+ * spawns the package manager via the spawn service.
+ *
  * `keyReader` is optional. If omitted, or if the stderr {@link Terminal} is not a TTY, prompting is
  * unavailable: {@link PrompterServiceProvider} (and {@link ArgumentPrompterServiceProvider}, if
  * enabled) are simply not registered. If `promptingEnabled` is `true` in that situation, {@link run}
@@ -213,7 +216,9 @@ export default class BaseCLI {
                 logger.debug("Skipping ImagePrinterServiceProvider: imagePrinterServiceEnabled is true but stdout is not a TTY");
             }
         }
-        if (this.#options.spawnServiceEnabled) {
+        // The plugin service routes package manager output through SpawnService so that it is
+        // quoted, marked and cleared on success; enabling plugins therefore also enables spawning.
+        if (this.#options.spawnServiceEnabled || this.#options.pluginServiceEnabled) {
             this.addServiceProvider(new SpawnServiceProvider(58));
         }
         if (this.#options.fetchServiceEnabled) {

package/dist/src/service/printer/terminal/Progress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Progress.d.ts","sourceRoot":"","sources":["../../../../../src/service/printer/terminal/Progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAU1D,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAmBxE,MAAM,CAAC,OAAO,OAAO,QAAQ;;IAe3B,YAAmB,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAGpD;IAEM,GAAG,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,EACjC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GACnC,MAAM,CA6BR;IA4BM,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAyBrE;IAEY,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAe/C;IAEY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAKpC;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAqBlC;IAEM,MAAM,IAAI,IAAI,CAapB;IAkID,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,EAE9B;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,EAE/B;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAE3B;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAE3B;IAED,IAAI,aAAa,CAAC,KAAK,EAAE,aAAa,EAErC;CAmDF"}
+{"version":3,"file":"Progress.d.ts","sourceRoot":"","sources":["../../../../../src/service/printer/terminal/Progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAe1D,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAoBxE,MAAM,CAAC,OAAO,OAAO,QAAQ;;IAe3B,YAAmB,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAGpD;IAEM,GAAG,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,EACjC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GACnC,MAAM,CAgCR;IA6BM,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAyBrE;IAEY,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAe/C;IAEY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAKpC;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAqBlC;IAEM,MAAM,IAAI,IAAI,CAapB;IAkID,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,EAE9B;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,EAE/B;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAE3B;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAE3B;IAED,IAAI,aAAa,CAAC,KAAK,EAAE,aAAa,EAErC;CAmDF"}

package/dist/src/service/printer/terminal/Progress.js

@@ -1,6 +1,10 @@
 // Weight given to each new rate sample in the exponential moving average - time constant is
-// roughly 1/RATE_SMOOTHING_FACTOR * 100ms (the render interval).
+// roughly 1/RATE_SMOOTHING_FACTOR * RATE_SAMPLE_INTERVAL_MILLIS.
 const RATE_SMOOTHING_FACTOR = 0.3;
+// Minimum time between rate samples. Updates arriving more often than this only advance the
+// current value; the next sample then measures the total progress made across the whole window,
+// so rapid, fine-grained or coarsely stepped updates still yield an accurate rate.
+const RATE_SAMPLE_INTERVAL_MILLIS = 100;
 // A rate this close to zero (units/s) produces a meaningless (and, past a certain point,
 // non-finite) "time remaining" estimate - treat it the same as no rate at all.
 const MAX_REMAINING_MILLIS = 999 * 24 * 60 * 60 * 1000;
@@ -38,13 +42,16 @@ export default class Progress {
         if (current > total) {
             current = total;
         }
+        const now = Date.now();
         this.#bars.set(this.#bars.size + 1, {
             name: message,
             current,
             total,
             format,
             formatRate,
-            startMillis: Date.now(),
+            sampleMillis: now,
+            sampleCurrent: current,
+            startMillis: now,
         });
         // force render on next timeout
         this.#isDirty = true;
@@ -67,17 +74,17 @@ export default class Progress {
     }
     #updateRate(bar, current) {
         const now = Date.now();
-        if (bar.lastMillis === undefined) {
-            bar.rate = ((current - bar.current) * 1000) / (now - bar.startMillis);
-        }
-        else {
-            let currentRate = ((current - bar.current) * 1000) / (now - bar.lastMillis);
-            if (!isFinite(currentRate)) {
-                currentRate = 0;
-            }
-            bar.rate = currentRate * RATE_SMOOTHING_FACTOR + bar.rate * (1 - RATE_SMOOTHING_FACTOR);
+        const elapsed = now - bar.sampleMillis;
+        if (elapsed < RATE_SAMPLE_INTERVAL_MILLIS) {
+            return;
         }
-        bar.lastMillis = now;
+        const sampleRate = ((current - bar.sampleCurrent) * 1000) / elapsed;
+        bar.rate =
+            bar.rate === undefined
+                ? sampleRate
+                : sampleRate * RATE_SMOOTHING_FACTOR + bar.rate * (1 - RATE_SMOOTHING_FACTOR);
+        bar.sampleMillis = now;
+        bar.sampleCurrent = current;
     }
     update(handle, current, message) {
         if (!this.#bars.has(handle)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "7.0.5",
+  "version": "7.0.7",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@flowscripter/dynamic-cli-framework-api": "^4.0.4",
-    "@flowscripter/dynamic-plugin-framework": "^2.2.12",
+    "@flowscripter/dynamic-plugin-framework": "^2.2.14",
     "emphasize": "^7.0.0",
     "fastest-levenshtein": "^1.0.16",
     "figlet": "^1.12.0",

package/src/cli/BaseCLI.ts

@@ -84,6 +84,9 @@ const logger = getLogger("BaseCLI");
  * * {@link UpgradeServiceProvider}
  * * {@link PluginServiceProvider}
  *
+ * Enabling the plugin service also registers {@link SpawnServiceProvider}, as plugin installation
+ * spawns the package manager via the spawn service.
+ *
  * `keyReader` is optional. If omitted, or if the stderr {@link Terminal} is not a TTY, prompting is
  * unavailable: {@link PrompterServiceProvider} (and {@link ArgumentPrompterServiceProvider}, if
  * enabled) are simply not registered. If `promptingEnabled` is `true` in that situation, {@link run}
@@ -299,7 +302,9 @@ export default class BaseCLI implements CLI {
       }
     }
 
-    if (this.#options.spawnServiceEnabled) {
+    // The plugin service routes package manager output through SpawnService so that it is
+    // quoted, marked and cleared on success; enabling plugins therefore also enables spawning.
+    if (this.#options.spawnServiceEnabled || this.#options.pluginServiceEnabled) {
       this.addServiceProvider(new SpawnServiceProvider(58));
     }
 

package/src/service/printer/terminal/Progress.ts

@@ -2,9 +2,14 @@ import type Styler from "../../../terminal/Styler.ts";
 import type Terminal from "../../../terminal/Terminal.ts";
 
 // Weight given to each new rate sample in the exponential moving average - time constant is
-// roughly 1/RATE_SMOOTHING_FACTOR * 100ms (the render interval).
+// roughly 1/RATE_SMOOTHING_FACTOR * RATE_SAMPLE_INTERVAL_MILLIS.
 const RATE_SMOOTHING_FACTOR = 0.3;
 
+// Minimum time between rate samples. Updates arriving more often than this only advance the
+// current value; the next sample then measures the total progress made across the whole window,
+// so rapid, fine-grained or coarsely stepped updates still yield an accurate rate.
+const RATE_SAMPLE_INTERVAL_MILLIS = 100;
+
 // A rate this close to zero (units/s) produces a meaningless (and, past a certain point,
 // non-finite) "time remaining" estimate - treat it the same as no rate at all.
 const MAX_REMAINING_MILLIS = 999 * 24 * 60 * 60 * 1000;
@@ -23,8 +28,9 @@ interface Bar {
   total: number;
   format: (value: number) => string;
   formatRate: (rate: number) => string;
-  lastMillis?: number;
-  startMillis?: number;
+  sampleMillis: number;
+  sampleCurrent: number;
+  startMillis: number;
   endMillis?: number;
   rate?: number;
 }
@@ -66,13 +72,16 @@ export default class Progress {
       current = total;
     }
 
+    const now = Date.now();
     this.#bars.set(this.#bars.size + 1, {
       name: message,
       current,
       total,
       format,
       formatRate,
-      startMillis: Date.now(),
+      sampleMillis: now,
+      sampleCurrent: current,
+      startMillis: now,
     });
 
     // force render on next timeout
@@ -100,16 +109,17 @@ export default class Progress {
 
   #updateRate(bar: Bar, current: number): void {
     const now = Date.now();
-    if (bar.lastMillis === undefined) {
-      bar.rate = ((current - bar.current) * 1000) / (now - bar.startMillis!);
-    } else {
-      let currentRate = ((current - bar.current) * 1000) / (now - bar.lastMillis!);
-      if (!isFinite(currentRate)) {
-        currentRate = 0;
-      }
-      bar.rate = currentRate * RATE_SMOOTHING_FACTOR + bar.rate! * (1 - RATE_SMOOTHING_FACTOR);
+    const elapsed = now - bar.sampleMillis;
+    if (elapsed < RATE_SAMPLE_INTERVAL_MILLIS) {
+      return;
     }
-    bar.lastMillis = now;
+    const sampleRate = ((current - bar.sampleCurrent) * 1000) / elapsed;
+    bar.rate =
+      bar.rate === undefined
+        ? sampleRate
+        : sampleRate * RATE_SMOOTHING_FACTOR + bar.rate * (1 - RATE_SMOOTHING_FACTOR);
+    bar.sampleMillis = now;
+    bar.sampleCurrent = current;
   }
 
   public update(handle: number, current: number, message?: string): void {
@@ -244,7 +254,7 @@ export default class Progress {
 
       let suffix = `${this.#styler.colorText("]", this.#labColor)} ${percent} `;
       if (bar.current === bar.total) {
-        const taken = this.#formatTime(bar.endMillis! - bar.startMillis!);
+        const taken = this.#formatTime(bar.endMillis! - bar.startMillis);
         const totalText = bar.format(bar.total);
         suffix += `${this.#styler.colorText(totalText, this.#valColor)}${this.#styler.colorText(
           ", rate:",