@ai-ecoverse/slicc-spectrum 1.89.1 → 1.90.0

package/dist/slicc-ui.js

@@ -34906,6 +34906,19 @@ function requiresText(item2, all2) {
   ].filter(Boolean);
   return parts2.length ? parts2.join("; ") : null;
 }
+var fetched = (progress) => progress.phase === "download" && (progress.bytes?.total ?? 0) > 0 ? progress.bytes : null;
+var phased = (progress) => {
+  const { done: done2, total } = fetched(progress) ?? progress;
+  const half = progress.phase === "link" ? 1 : 0;
+  return Math.round((half + (total ? Math.min(done2 / total, 1) : 0)) * 50);
+};
+var counted = (progress, unit = "") => {
+  const bytes = fetched(progress);
+  if (bytes) return `${size3(bytes.done)} of ${size3(bytes.total)}`;
+  return `${progress.done} of ${progress.total}${unit}`;
+};
+var itemBusy = (item2) => running.has(item2.state) || item2.state === "starting" || item2.progress !== null;
+var packageBusy = (item2) => packageRunning.has(item2.state) || item2.progress !== null;
 var snapshot = (items) => new Map(items.map(({ id, state: state2, error }) => [id, { state: state2, error }]));
 function settled2(failures, before, after) {
   return new Map(
@@ -34963,6 +34976,7 @@ var SliccUpdates = class extends ModelElement {
     problems: { state: true }
   };
   #logs = new ViewSet(this, "updates");
+  #reached = /* @__PURE__ */ new Map();
   constructor() {
     super();
     this.pending = /* @__PURE__ */ new Set();
@@ -35199,6 +35213,7 @@ var SliccUpdates = class extends ModelElement {
     this.failures = /* @__PURE__ */ new Map();
     this.busy = /* @__PURE__ */ new Map();
     this.problems = /* @__PURE__ */ new Map();
+    this.#reached.clear();
     const port = model.updates;
     if (!port) return [];
     let previous = snapshot(port.list());
@@ -35207,6 +35222,7 @@ var SliccUpdates = class extends ModelElement {
         const next = snapshot(items);
         this.failures = settled2(this.failures, previous, next);
         previous = next;
+        this.#prune("item", items, itemBusy);
         this.requestUpdate();
       })
     ];
@@ -35218,6 +35234,7 @@ var SliccUpdates = class extends ModelElement {
         const next = snapshot(items);
         this.problems = settled2(this.problems, packages, next);
         packages = next;
+        this.#prune("package", items, packageBusy);
         this.requestUpdate();
       })
     ];
@@ -35271,25 +35288,43 @@ var SliccUpdates = class extends ModelElement {
       }
     }
   }
-  #progress(item2) {
-    const progress = item2.progress;
-    if (progress) {
-      return b`<swc-progress-bar
-        size="s"
-        min-value="0"
-        max-value=${progress.total}
-        value=${progress.done}
-        value-label=${`${progress.done} of ${progress.total}`}
-        accessible-label=${`${item2.label}: ${progress.phase === "download" ? "downloading" : "linking"}`}
-      ></swc-progress-bar>`;
-    }
-    if (!running.has(item2.state) && item2.state !== "starting") return A;
+  #prune(kind, items, busy) {
+    const live = new Set(items.filter(busy).map((item2) => `${kind}:${item2.id}`));
+    for (const key2 of this.#reached.keys()) {
+      if (key2.startsWith(`${kind}:`) && !live.has(key2)) this.#reached.delete(key2);
+    }
+  }
+  #bar(key2, busy, progress, count2, accessible) {
+    if (!busy) {
+      this.#reached.delete(key2);
+      return A;
+    }
+    const before = this.#reached.get(key2);
+    const shown4 = progress ? { value: Math.max(before?.value ?? 0, phased(progress)), label: count2 } : before;
+    if (!shown4) {
+      return b`<swc-progress-bar size="s" indeterminate accessible-label=${accessible}></swc-progress-bar>`;
+    }
+    this.#reached.set(key2, shown4);
     return b`<swc-progress-bar
       size="s"
-      indeterminate
-      accessible-label=${`${item2.label}: ${states[item2.state][1].toLowerCase()}`}
+      min-value="0"
+      max-value="100"
+      value=${shown4.value}
+      value-label=${shown4.label}
+      accessible-label=${accessible}
     ></swc-progress-bar>`;
   }
+  #progress(item2) {
+    const progress = item2.progress;
+    const phase = progress ? progress.phase === "download" ? "downloading" : "linking" : null;
+    return this.#bar(
+      `item:${item2.id}`,
+      itemBusy(item2),
+      progress,
+      progress ? counted(progress) : "",
+      `${item2.label}: ${phase ?? states[item2.state][1].toLowerCase()}`
+    );
+  }
   #actions(item2) {
     if (!item2.actions.length) return A;
     const busy = this.pending.has(item2.id);
@@ -35353,22 +35388,14 @@ var SliccUpdates = class extends ModelElement {
   }
   #packageProgress(item2) {
     const progress = item2.progress;
-    if (progress) {
-      return b`<swc-progress-bar
-        size="s"
-        min-value="0"
-        max-value=${progress.total}
-        value=${progress.done}
-        value-label=${`${progress.done} of ${progress.total} packages`}
-        accessible-label=${`${item2.label}: ${progress.phase === "download" ? "downloading" : "linking"}`}
-      ></swc-progress-bar>`;
-    }
-    if (!packageRunning.has(item2.state)) return A;
-    return b`<swc-progress-bar
-      size="s"
-      indeterminate
-      accessible-label=${`${item2.label}: ${packageLight(item2)?.[1].toLowerCase()}`}
-    ></swc-progress-bar>`;
+    const phase = progress ? progress.phase === "download" ? "downloading" : "linking" : null;
+    return this.#bar(
+      `package:${item2.id}`,
+      packageBusy(item2),
+      progress,
+      progress ? counted(progress, " packages") : "",
+      `${item2.label}: ${phase ?? packageLight(item2)?.[1].toLowerCase()}`
+    );
   }
   #package(item2, all2, act2) {
     const light = packageLight(item2);