@milaboratories/pl-tree 1.3.18 → 1.4.0

package/dist/index.mjs

@@ -1,9 +1,9 @@
 var J = Object.defineProperty;
 var q = (n, e, t) => e in n ? J(n, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : n[e] = t;
 var d = (n, e, t) => q(n, typeof e != "symbol" ? e + "" : e, t);
-import { resourceIdToString as C, resourceTypeToString as I, resourceTypesEqual as A, isNotNullResourceId as g, NullResourceId as S, isNullResourceId as V, stringifyWithResourceId as L, isTimeoutOrCancelError as M } from "@milaboratories/pl-client";
-import { ChangeSource as m, PollingComputableHooks as z } from "@milaboratories/computable";
-import { notEmpty as y, msToHumanReadable as B } from "@milaboratories/ts-helpers";
+import { resourceIdToString as C, resourceTypeToString as A, resourceTypesEqual as $, isNotNullResourceId as g, NullResourceId as F, isNullResourceId as b, stringifyWithResourceId as L, isTimeoutOrCancelError as B } from "@milaboratories/pl-client";
+import { ChangeSource as m, PollingComputableHooks as M } from "@milaboratories/computable";
+import { notEmpty as y, msToHumanReadable as z } from "@milaboratories/ts-helpers";
 import H from "denque";
 import * as j from "node:timers/promises";
 function se(n, e) {
@@ -46,7 +46,7 @@ class R {
     return `[ENTRY:${C(this.rid)}]`;
   }
 }
-function W(n, e, t, r, s) {
+function K(n, e, t, r, s) {
   const a = new Y(
     n,
     e,
@@ -57,12 +57,12 @@ function W(n, e, t, r, s) {
     const o = a.getError();
     if (o !== void 0)
       throw new N(
-        `error encountered on resource ${C(a.id)} (${I(a.resourceType)}): ${o.getDataAsString()}`
+        `error encountered on resource ${C(a.id)} (${A(a.resourceType)}): ${o.getDataAsString()}`
       );
   }
-  if (s.assertResourceType !== void 0 && (Array.isArray(s.assertResourceType) ? s.assertResourceType.findIndex((o) => A(o, a.resourceType)) === -1 : !A(s.assertResourceType, a.resourceType)))
+  if (s.assertResourceType !== void 0 && (Array.isArray(s.assertResourceType) ? s.assertResourceType.findIndex((o) => $(o, a.resourceType)) === -1 : !$(s.assertResourceType, a.resourceType)))
     throw new Error(
-      `wrong resource type ${I(a.resourceType)} but expected ${s.assertResourceType}`
+      `wrong resource type ${A(a.resourceType)} but expected ${s.assertResourceType}`
     );
   return a;
 }
@@ -72,7 +72,7 @@ class E {
     this.accessorData = e, this.tree = t, this.rid = r, this.instanceData = s;
   }
   node(e = {}) {
-    return this.instanceData.guard(), this.accessorData.hooks !== void 0 && this.instanceData.ctx.attacheHooks(this.accessorData.hooks), W(this.accessorData, this.tree, this.instanceData, this.rid, e);
+    return this.instanceData.guard(), this.accessorData.hooks !== void 0 && this.instanceData.ctx.attacheHooks(this.accessorData.hooks), K(this.accessorData, this.tree, this.instanceData, this.rid, e);
   }
 }
 function ue(n, e) {
@@ -99,7 +99,7 @@ class Y {
     return { id: this.id, type: this.resourceType };
   }
   getResourceFromTree(e, t) {
-    return W(this.accessorData, this.tree, this.instanceData, e, t);
+    return K(this.accessorData, this.tree, this.instanceData, e, t);
   }
   traverse(...e) {
     return this.traverseWithCommon({}, ...e);
@@ -223,26 +223,26 @@ class Y {
     return new R(this.accessorData, this.resource.id);
   }
 }
-class D extends Error {
+class S extends Error {
   constructor(e) {
     super(e);
   }
 }
-class $ {
+class x {
   constructor(e, t, r, s) {
     d(this, "change", new m());
     this.type = e, this.value = t, this.error = r, this.resourceVersion = s;
   }
 }
-const F = 0, x = new TextDecoder();
+const T = 0, O = new TextDecoder();
 class G {
   constructor(e, t) {
     /** Tracks number of other resources referencing this resource. Used to perform garbage collection in tree patching procedure */
     d(this, "refCount", 0);
     /** Increments each time resource is checked for difference with new state */
-    d(this, "version", F);
+    d(this, "version", T);
     /** Set to resource version when resource state, or it's fields have changed */
-    d(this, "dataVersion", F);
+    d(this, "dataVersion", T);
     d(this, "fields", /* @__PURE__ */ new Map());
     d(this, "kv", /* @__PURE__ */ new Map());
     d(this, "resourceRemoved", new m());
@@ -322,7 +322,7 @@ class G {
     return this.outputsLocked || (t = this.resourceStateChange) == null || t.attachWatcher(e), this.outputsLocked;
   }
   get isReadyOrError() {
-    return this.error !== S || this.resourceReady || this.originalResourceId !== S;
+    return this.error !== F || this.resourceReady || this.originalResourceId !== F;
   }
   getIsFinal(e) {
     var t;
@@ -334,7 +334,7 @@ class G {
   }
   getError(e) {
     var t;
-    if (V(this.error)) {
+    if (b(this.error)) {
       (t = this.resourceStateChange) == null || t.attachWatcher(e);
       return;
     } else
@@ -368,11 +368,11 @@ class G {
   getKeyValueString(e, t) {
     const r = this.getKeyValue(e, t);
     if (r !== void 0)
-      return x.decode(r);
+      return O.decode(r);
   }
   getDataAsString() {
     if (this.data !== void 0)
-      return this.dataAsString === void 0 && (this.dataAsString = x.decode(this.data)), this.dataAsString;
+      return this.dataAsString === void 0 && (this.dataAsString = O.decode(this.data)), this.dataAsString;
   }
   getDataAsJson() {
     if (this.data !== void 0)
@@ -405,7 +405,7 @@ class G {
     this.fields.forEach((l) => l.change.markChanged()), (e = this.finalChanged) == null || e.markChanged(), (t = this.resourceStateChange) == null || t.markChanged(), (r = this.lockedChange) == null || r.markChanged(), (s = this.inputAndServiceFieldListChanged) == null || s.markChanged(), (a = this.outputFieldListChanged) == null || a.markChanged(), (o = this.dynamicFieldListChanged) == null || o.markChanged(), (i = this.kvChanged) == null || i.markChanged(), this.resourceRemoved.markChanged();
   }
 }
-class O {
+class V {
   constructor(e, t = (r) => !1) {
     /** resource heap */
     d(this, "resources", /* @__PURE__ */ new Map());
@@ -436,7 +436,7 @@ class O {
       let i = this.resources.get(o.id);
       const l = i == null ? void 0 : i.state, c = (f) => {
         const { fields: k, ...u } = o;
-        throw this.invalidateTree(), new D(
+        throw this.invalidateTree(), new S(
           `Unexpected resource state transition (${f}): ${L(
             u
           )} -> ${L(l)}`
@@ -445,14 +445,14 @@ class O {
       if (i !== void 0) {
         i.final && c("resource state can	 be updated after it is marked as final");
         let f = !1;
-        i.version += 1, i.originalResourceId !== o.originalResourceId && (i.originalResourceId !== S && c("originalResourceId can't change after it is set"), i.originalResourceId = o.originalResourceId, y(i.resourceStateChange).markChanged(), f = !0), i.error !== o.error && (g(i.error) && c("resource can't change attached error after it is set"), i.error = o.error, r.push(i.error), y(i.resourceStateChange).markChanged(), f = !0);
+        i.version += 1, i.originalResourceId !== o.originalResourceId && (i.originalResourceId !== F && c("originalResourceId can't change after it is set"), i.originalResourceId = o.originalResourceId, y(i.resourceStateChange).markChanged(), f = !0), i.error !== o.error && (g(i.error) && c("resource can't change attached error after it is set"), i.error = o.error, r.push(i.error), y(i.resourceStateChange).markChanged(), f = !0);
         for (const u of o.fields) {
           let h = i.fields.get(u.name);
           h ? (h.type !== u.type && (h.type !== "Dynamic" && c(`field changed type ${h.type} -> ${u.type}`), y(i.dynamicFieldListChanged).markChanged(), (h.type === "Input" || h.type === "Service") && (i.inputsLocked && c(
             `adding input field "${u.name}", while corresponding list is locked`
           ), y(i.inputAndServiceFieldListChanged).markChanged()), h.type === "Output" && (i.outputsLocked && c(
             `adding output field "${u.name}", while corresponding list is locked`
-          ), y(i.outputFieldListChanged).markChanged()), h.type = u.type, h.change.markChanged(), f = !0), h.value !== u.value && (g(h.value) && s.push(h.value), h.value = u.value, g(u.value) && r.push(u.value), h.change.markChanged(), f = !0), h.error !== u.error && (g(h.error) && s.push(h.error), h.error = u.error, g(u.error) && r.push(u.error), h.change.markChanged(), f = !0), h.resourceVersion = i.version) : (h = new $(u.type, u.value, u.error, i.version), g(u.value) && r.push(u.value), g(u.error) && r.push(u.error), u.type === "Input" || u.type === "Service" ? (i.inputsLocked && c(
+          ), y(i.outputFieldListChanged).markChanged()), h.type = u.type, h.change.markChanged(), f = !0), h.value !== u.value && (g(h.value) && s.push(h.value), h.value = u.value, g(u.value) && r.push(u.value), h.change.markChanged(), f = !0), h.error !== u.error && (g(h.error) && s.push(h.error), h.error = u.error, g(u.error) && r.push(u.error), h.change.markChanged(), f = !0), h.resourceVersion = i.version) : (h = new x(u.type, u.value, u.error, i.version), g(u.value) && r.push(u.value), g(u.error) && r.push(u.error), u.type === "Input" || u.type === "Service" ? (i.inputsLocked && c(
             `adding ${u.type} (${u.name}) field while inputs locked`
           ), y(i.inputAndServiceFieldListChanged).markChanged()) : u.type === "Output" ? (i.outputsLocked && c(
             `adding ${u.type} (${u.name}) field while outputs locked`
@@ -481,17 +481,17 @@ class O {
       } else {
         i = new G(o), i.verifyReadyState(), g(i.error) && r.push(i.error);
         for (const f of o.fields) {
-          const k = new $(f.type, f.value, f.error, F);
+          const k = new x(f.type, f.value, f.error, T);
           g(f.value) && r.push(f.value), g(f.error) && r.push(f.error), i.fields.set(f.name, k);
         }
         for (const f of o.kv) i.kv.set(f.key, f.value);
-        this.resources.set(i.id, i), this.resourcesAdded.markChanged();
+        this.isFinalPredicate(i) && i.markFinal(), this.resources.set(i.id, i), this.resourcesAdded.markChanged();
       }
     }
     for (const o of r) {
       const i = this.resources.get(o);
       if (!i)
-        throw this.invalidateTree(), new D(`orphan resource ${o}`);
+        throw this.invalidateTree(), new S(`orphan resource ${o}`);
       i.refCount++;
     }
     let a = s;
@@ -500,7 +500,7 @@ class O {
       for (const i of a) {
         const l = this.resources.get(i);
         if (!l)
-          throw this.invalidateTree(), new D(`orphan resource ${i}`);
+          throw this.invalidateTree(), new S(`orphan resource ${i}`);
         l.refCount--, l.refCount === 0 && l.id !== this.root && (l.fields.forEach((c) => {
           g(c.value) && o.push(c.value), g(c.error) && o.push(c.error), c.change.markChanged();
         }), g(l.error) && o.push(l.error), l.resourceRemoved.markChanged(), this.resources.delete(i));
@@ -510,7 +510,7 @@ class O {
     if (!t) {
       for (const o of e)
         if (!this.resources.has(o.id))
-          throw this.invalidateTree(), new D(`orphan input resource ${o.id}`);
+          throw this.invalidateTree(), new S(`orphan input resource ${o.id}`);
     }
   }
   /** @deprecated use "entry" instead */
@@ -532,7 +532,7 @@ function Q(n, e) {
     s.final ? r.add(s.id) : t.push(s.id);
   }), t.length === 0 && r.size === 0 && t.push(n.root), { seedResources: t, finalResources: r, pruningFunction: e };
 }
-function b() {
+function D() {
   return {
     requests: 0,
     roundtrips: 0,
@@ -540,6 +540,7 @@ function b() {
     retrievedFields: 0,
     retrievedKeyValues: 0,
     retrievedResourceDataBytes: 0,
+    retrievedKeyValueBytes: 0,
     prunnedFields: 0,
     finalResourcesSkipped: 0,
     millisSpent: 0
@@ -548,12 +549,13 @@ function b() {
 function de(n) {
   let e = `Requests: ${n.requests}
 `;
-  return e += `Total time: ${B(n.millisSpent)}
+  return e += `Total time: ${z(n.millisSpent)}
 `, e += `Roundtrips: ${n.roundtrips}
 `, e += `Resources: ${n.retrievedResources}
 `, e += `Fields: ${n.retrievedFields}
 `, e += `KV: ${n.retrievedKeyValues}
 `, e += `Data Bytes: ${n.retrievedResourceDataBytes}
+`, e += `KV Bytes: ${n.retrievedKeyValueBytes}
 `, e += `Pruned fields: ${n.prunnedFields}
 `, e += `Final resources skipped: ${n.finalResourcesSkipped}`, e;
 }
@@ -564,7 +566,7 @@ async function X(n, e, t) {
   const { seedResources: s, finalResources: a, pruningFunction: o } = e, i = new H();
   let l = !0, c = 0;
   const f = /* @__PURE__ */ new Set(), k = (p) => {
-    if (V(p) || f.has(p)) return;
+    if (b(p) || f.has(p)) return;
     if (a.has(p)) {
       t && t.finalResourcesSkipped++;
       return;
@@ -573,10 +575,10 @@ async function X(n, e, t) {
     const v = n.getResourceDataIfExists(p, !0), w = n.listKeyValuesIfResourceExists(p), U = l;
     l && (l = !1), i.push(
       (async () => {
-        const [T, _] = await Promise.all([v, w]);
-        if (U && (c++, l = !0), T !== void 0) {
-          if (_ === void 0) throw new Error("Inconsistent replies");
-          return { ...T, kv: _ };
+        const [_, I] = await Promise.all([v, w]);
+        if (U && (c++, l = !0), _ !== void 0) {
+          if (I === void 0) throw new Error("Inconsistent replies");
+          return { ..._, kv: I };
         }
       })()
     );
@@ -596,7 +598,11 @@ async function X(n, e, t) {
       k(v.error);
       for (const w of v.fields)
         k(w.value), k(w.error);
-      t && (t.retrievedResources++, t.retrievedFields += v.fields.length, t.retrievedKeyValues += v.kv.length, t.retrievedResourceDataBytes += ((h = v.data) == null ? void 0 : h.length) ?? 0), u.push(v);
+      if (t) {
+        t.retrievedResources++, t.retrievedFields += v.fields.length, t.retrievedKeyValues += v.kv.length, t.retrievedResourceDataBytes += ((h = v.data) == null ? void 0 : h.length) ?? 0;
+        for (const w of v.kv) t.retrievedKeyValueBytes += w.value.length;
+      }
+      u.push(v);
     }
   }
   return t && (t.millisSpent += Date.now() - r, t.roundtrips += c), u;
@@ -654,7 +660,7 @@ function fe(n, e, t) {
     metadata: Object.fromEntries(a)
   };
 }
-class K {
+class W {
   constructor(e, t, r, s) {
     d(this, "finalPredicate");
     d(this, "state");
@@ -672,7 +678,7 @@ class K {
     d(this, "terminated", !1);
     this.pl = e, this.root = t, this.logger = s;
     const { finalPredicate: a, pruning: o, pollingInterval: i, stopPollingDelay: l, logStat: c } = r;
-    this.pruning = o, this.pollingInterval = i, this.finalPredicate = a, this.logStat = c, this.state = new O(t, a), this.hooks = new z(
+    this.pruning = o, this.pollingInterval = i, this.finalPredicate = a, this.logStat = c, this.state = new V(t, a), this.hooks = new M(
       () => this.startUpdating(),
       () => this.stopUpdating(),
       { stopDebounce: l },
@@ -713,16 +719,16 @@ class K {
   }
   async mainLoop() {
     var t, r;
-    let e = this.logStat ? b() : void 0;
+    let e = this.logStat ? D() : void 0;
     for (; this.keepRunning; ) {
       let s;
       this.scheduledOnNextState.length > 0 && (s = this.scheduledOnNextState, this.scheduledOnNextState = []);
       try {
-        if (this.logStat === "per-request" && (e = b()), await this.refresh(e), e && this.logger && this.logger.info(`Tree stat (success): ${JSON.stringify(e)}`), s !== void 0) for (const a of s) a.resolve();
+        if (this.logStat === "per-request" && (e = D()), await this.refresh(e), e && this.logger && this.logger.info(`Tree stat (success): ${JSON.stringify(e)}`), s !== void 0) for (const a of s) a.resolve();
       } catch (a) {
         if (e && this.logger && this.logger.info(`Tree stat (error): ${JSON.stringify(e)}`), s !== void 0) for (const o of s) o.reject(a);
-        if (a instanceof D) {
-          (t = this.logger) == null || t.error(a), this.state.invalidateTree("stat update error"), this.state = new O(this.root, this.finalPredicate);
+        if (a instanceof S) {
+          (t = this.logger) == null || t.error(a), this.state.invalidateTree("stat update error"), this.state = new V(this.root, this.finalPredicate);
           continue;
         } else (r = this.logger) == null || r.warn(a);
       }
@@ -730,7 +736,7 @@ class K {
       try {
         await j.setTimeout(this.pollingInterval, this.abortController.signal);
       } catch (a) {
-        if (!M(a)) throw new Error("Unexpected error", { cause: a });
+        if (!B(a)) throw new Error("Unexpected error", { cause: a });
         break;
       }
     }
@@ -748,8 +754,9 @@ class K {
     this.currentLoop !== void 0 && await this.currentLoop;
   }
   static async init(e, t, r, s) {
-    const a = new K(e, t, r, s);
-    return await a.refresh(), a;
+    const a = new W(e, t, r, s);
+    let o = r.logStat ? D() : void 0;
+    return await a.refresh(o), o && s && s.info(`Tree stat (initial load): ${JSON.stringify(o)}`), a;
   }
 }
 export {
@@ -758,12 +765,12 @@ export {
   E as PlTreeEntryAccessor,
   Y as PlTreeNodeAccessor,
   G as PlTreeResource,
-  O as PlTreeState,
-  K as SynchronizedTreeState,
-  D as TreeStateUpdateError,
+  V as PlTreeState,
+  W as SynchronizedTreeState,
+  S as TreeStateUpdateError,
   Q as constructTreeLoadingRequest,
   de as formatTreeLoadingStat,
-  b as initialTreeLoadingStat,
+  D as initialTreeLoadingStat,
   ne as isPlTreeEntry,
   oe as isPlTreeEntryAccessor,
   ae as isPlTreeNodeAccessor,