@milaboratories/pl-tree 1.6.8 → 1.6.10

package/dist/index.mjs

@@ -1,10 +1,10 @@
 var M = Object.defineProperty;
 var U = (n, e, t) => e in n ? M(n, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : n[e] = t;
 var d = (n, e, t) => U(n, typeof e != "symbol" ? e + "" : e, t);
-import { resourceIdToString as S, resourceTypesEqual as A, resourceTypeToString as J, isNotNullResourceId as g, NullResourceId as T, isNullResourceId as V, stringifyWithResourceId as D, isTimeoutOrCancelError as q } from "@milaboratories/pl-client";
+import { resourceIdToString as S, resourceTypesEqual as A, resourceTypeToString as J, isNotNullResourceId as g, NullResourceId as F, isNullResourceId as V, stringifyWithResourceId as L, isTimeoutOrCancelError as q } from "@milaboratories/pl-client";
 import { ChangeSource as m, PollingComputableHooks as z } from "@milaboratories/computable";
 import { parsePlError as P } from "@milaboratories/pl-errors";
-import { notEmpty as p, cachedDeserialize as $, msToHumanReadable as H } from "@milaboratories/ts-helpers";
+import { notEmpty as p, cachedDecode as $, cachedDeserialize as b, msToHumanReadable as H } from "@milaboratories/ts-helpers";
 import j from "denque";
 import * as Y from "node:timers/promises";
 function ne(n, e) {
@@ -47,29 +47,29 @@ class C {
     return `[ENTRY:${S(this.rid)}]`;
   }
 }
-function K(n, e, t, r, s) {
+function K(n, e, t, r, a) {
   const o = new G(
     n,
     e,
     e.get(t.ctx.watcher, r),
     t
   );
-  if (!s.ignoreError) {
-    const a = o.getError();
-    if (a !== void 0)
-      throw P(p(a.getDataAsString()), o.id, o.resourceType);
+  if (!a.ignoreError) {
+    const s = o.getError();
+    if (s !== void 0)
+      throw P(p(s.getDataAsString()), o.id, o.resourceType);
   }
-  if (s.assertResourceType !== void 0 && (Array.isArray(s.assertResourceType) ? s.assertResourceType.findIndex((a) => A(a, o.resourceType)) === -1 : !A(s.assertResourceType, o.resourceType)))
+  if (a.assertResourceType !== void 0 && (Array.isArray(a.assertResourceType) ? a.assertResourceType.findIndex((s) => A(s, o.resourceType)) === -1 : !A(a.assertResourceType, o.resourceType)))
     throw new Error(
       // eslint-disable-next-line @typescript-eslint/no-base-to-string
-      `wrong resource type ${J(o.resourceType)} but expected ${s.assertResourceType}`
+      `wrong resource type ${J(o.resourceType)} but expected ${a.assertResourceType}`
     );
   return o;
 }
 class E {
-  constructor(e, t, r, s) {
+  constructor(e, t, r, a) {
     d(this, "__pl_tree_type_marker__", "PlTreeEntryAccessor");
-    this.accessorData = e, this.tree = t, this.rid = r, this.instanceData = s;
+    this.accessorData = e, this.tree = t, this.rid = r, this.instanceData = a;
   }
   node(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);
@@ -79,12 +79,12 @@ function he(n, e) {
   return n instanceof C ? e.accessor(n).node().resourceInfo : n;
 }
 class G {
-  constructor(e, t, r, s) {
+  constructor(e, t, r, a) {
     d(this, "__pl_tree_type_marker__", "PlTreeNodeAccessor");
     d(this, "onUnstableLambda", (e) => {
       this.instanceData.ctx.markUnstable(e);
     });
-    this.accessorData = e, this.tree = t, this.resource = r, this.instanceData = s;
+    this.accessorData = e, this.tree = t, this.resource = r, this.instanceData = a;
   }
   get id() {
     return this.instanceData.guard(), this.resource.id;
@@ -116,25 +116,25 @@ class G {
   }
   traverseOrErrorWithCommon(e, ...t) {
     let r = this;
-    for (const s of t) {
-      const o = typeof s == "string" ? {
+    for (const a of t) {
+      const o = typeof a == "string" ? {
         ...e,
-        field: s
-      } : { ...e, ...s }, a = r.getField(s);
-      if (a === void 0 || o.pureFieldErrorToUndefined && a.value === void 0 && a.error !== void 0)
+        field: a
+      } : { ...e, ...a }, s = r.getField(a);
+      if (s === void 0 || o.pureFieldErrorToUndefined && s.value === void 0 && s.error !== void 0)
         return;
-      if ((!o.ignoreError || a.value === void 0) && a.error !== void 0)
+      if ((!o.ignoreError || s.value === void 0) && s.error !== void 0)
         return {
           ok: !1,
           // FIXME: in next tickets we'll allow Errors to be thrown.
           error: P(
-            p(a.error.getDataAsString()),
+            p(s.error.getDataAsString()),
             r.id,
             r.resourceType,
             o.field
           )
         };
-      if (a.value === void 0) {
+      if (s.value === void 0) {
         if (o.errorIfFieldNotSet)
           return {
             ok: !1,
@@ -143,7 +143,7 @@ class G {
         this.onUnstableLambda("unpopulated_field:" + o.field);
         return;
       }
-      r = a.value;
+      r = s.value;
     }
     return { ok: !0, value: r };
   }
@@ -151,7 +151,7 @@ class G {
     this.instanceData.guard();
     const t = typeof e == "string" ? { field: e } : e, r = this.resource.getField(this.instanceData.ctx.watcher, t, this.onUnstableLambda);
     if (r !== void 0)
-      return N(r, (s) => this.getResourceFromTree(s, { ignoreError: !0 }));
+      return N(r, (a) => this.getResourceFromTree(a, { ignoreError: !0 }));
   }
   getInputsLocked() {
     this.instanceData.guard();
@@ -235,9 +235,9 @@ class R extends Error {
   }
 }
 class x {
-  constructor(e, t, r, s, o, a, i) {
+  constructor(e, t, r, a, o, s, i) {
     d(this, "change", new m());
-    this.name = e, this.type = t, this.value = r, this.error = s, this.status = o, this.valueIsFinal = a, this.resourceVersion = i;
+    this.name = e, this.type = t, this.value = r, this.error = a, this.status = o, this.valueIsFinal = s, this.resourceVersion = i;
   }
   get state() {
     return {
@@ -250,15 +250,15 @@ class x {
     };
   }
 }
-const L = 0, b = new TextDecoder();
+const T = 0;
 class Q {
   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", L);
+    d(this, "version", T);
     /** Set to resource version when resource state, or it's fields have changed */
-    d(this, "dataVersion", L);
+    d(this, "dataVersion", T);
     d(this, "fieldsMap", /* @__PURE__ */ new Map());
     d(this, "kv", /* @__PURE__ */ new Map());
     d(this, "resourceRemoved", new m());
@@ -305,34 +305,34 @@ class Q {
   }
   getField(e, t, r = () => {
   }) {
-    var a, i, f;
-    const s = typeof t == "string" ? { field: t } : t, o = this.fieldsMap.get(s.field);
+    var s, i, f;
+    const a = typeof t == "string" ? { field: t } : t, o = this.fieldsMap.get(a.field);
     if (o === void 0) {
-      if (s.errorIfFieldNotFound || s.errorIfFieldNotSet)
+      if (a.errorIfFieldNotFound || a.errorIfFieldNotSet)
         throw new Error(
-          `Field "${s.field}" not found in resource ${S(this.id)}`
+          `Field "${a.field}" not found in resource ${S(this.id)}`
         );
-      if (!this.inputsLocked) (a = this.inputAndServiceFieldListChanged) == null || a.attachWatcher(e);
-      else if (s.assertFieldType === "Service" || s.assertFieldType === "Input") {
-        if (s.allowPermanentAbsence)
+      if (!this.inputsLocked) (s = this.inputAndServiceFieldListChanged) == null || s.attachWatcher(e);
+      else if (a.assertFieldType === "Service" || a.assertFieldType === "Input") {
+        if (a.allowPermanentAbsence)
           return;
-        throw new Error(`Service or input field not found ${s.field}.`);
+        throw new Error(`Service or input field not found ${a.field}.`);
       }
       if (!this.outputsLocked) (i = this.outputFieldListChanged) == null || i.attachWatcher(e);
-      else if (s.assertFieldType === "Output") {
-        if (s.allowPermanentAbsence)
+      else if (a.assertFieldType === "Output") {
+        if (a.allowPermanentAbsence)
           return;
-        throw new Error(`Output field not found ${s.field}.`);
+        throw new Error(`Output field not found ${a.field}.`);
       }
-      (f = this.dynamicFieldListChanged) == null || f.attachWatcher(e), !this._finalState && !s.stableIfNotFound && r("field_not_found:" + s.field);
+      (f = this.dynamicFieldListChanged) == null || f.attachWatcher(e), !this._finalState && !a.stableIfNotFound && r("field_not_found:" + a.field);
       return;
     } else {
-      if (s.assertFieldType !== void 0 && o.type !== s.assertFieldType)
+      if (a.assertFieldType !== void 0 && o.type !== a.assertFieldType)
         throw new Error(
-          `Unexpected field type: expected ${s.assertFieldType} but got ${o.type} for the field name ${s.field}`
+          `Unexpected field type: expected ${a.assertFieldType} but got ${o.type} for the field name ${a.field}`
         );
       const l = {};
-      return g(o.value) && (l.value = o.value), g(o.error) && (l.error = o.error), l.value === void 0 && l.error === void 0 && r("field_not_resolved:" + s.field), o.change.attachWatcher(e), l;
+      return g(o.value) && (l.value = o.value), g(o.error) && (l.error = o.error), l.value === void 0 && l.error === void 0 && r("field_not_resolved:" + a.field), o.change.attachWatcher(e), l;
     }
   }
   getInputsLocked(e) {
@@ -344,7 +344,7 @@ class Q {
     return this.outputsLocked || (t = this.resourceStateChange) == null || t.attachWatcher(e), this.outputsLocked;
   }
   get isReadyOrError() {
-    return this.error !== T || this.resourceReady || this.originalResourceId !== T;
+    return this.error !== F || this.resourceReady || this.originalResourceId !== F;
   }
   getIsFinal(e) {
     var t;
@@ -365,22 +365,22 @@ class Q {
   listInputFields(e) {
     var r;
     const t = [];
-    return this.fieldsMap.forEach((s, o) => {
-      (s.type === "Input" || s.type === "Service") && t.push(o);
+    return this.fieldsMap.forEach((a, o) => {
+      (a.type === "Input" || a.type === "Service") && t.push(o);
     }), this.inputsLocked || (r = this.inputAndServiceFieldListChanged) == null || r.attachWatcher(e), t;
   }
   listOutputFields(e) {
     var r;
     const t = [];
-    return this.fieldsMap.forEach((s, o) => {
-      s.type === "Output" && t.push(o);
+    return this.fieldsMap.forEach((a, o) => {
+      a.type === "Output" && t.push(o);
     }), this.outputsLocked || (r = this.outputFieldListChanged) == null || r.attachWatcher(e), t;
   }
   listDynamicFields(e) {
     var r;
     const t = [];
-    return this.fieldsMap.forEach((s, o) => {
-      s.type !== "Input" && s.type !== "Output" && t.push(o);
+    return this.fieldsMap.forEach((a, o) => {
+      a.type !== "Input" && a.type !== "Output" && t.push(o);
     }), (r = this.dynamicFieldListChanged) == null || r.attachWatcher(e), t;
   }
   getKeyValue(e, t) {
@@ -390,24 +390,24 @@ class Q {
   getKeyValueString(e, t) {
     const r = this.getKeyValue(e, t);
     if (r !== void 0)
-      return b.decode(r);
+      return $(r);
   }
   getKeyValueAsJson(e, t) {
     const r = this.getKeyValue(e, t);
     if (r !== void 0)
-      return $(r);
+      return b(r);
   }
   getDataAsString() {
     if (this.data !== void 0)
-      return this.dataAsString === void 0 && (this.dataAsString = b.decode(this.data)), this.dataAsString;
+      return this.dataAsString === void 0 && (this.dataAsString = $(this.data)), this.dataAsString;
   }
   getDataAsJson() {
     if (this.data !== void 0)
-      return this.dataAsJson === void 0 && (this.dataAsJson = $(this.data)), this.dataAsJson;
+      return this.dataAsJson === void 0 && (this.dataAsJson = b(this.data)), this.dataAsJson;
   }
   verifyReadyState() {
     if (this.resourceReady && !this.inputsLocked)
-      throw new Error(`ready without input or output lock: ${D(this.basicState)}`);
+      throw new Error(`ready without input or output lock: ${L(this.basicState)}`);
   }
   get basicState() {
     return {
@@ -436,8 +436,8 @@ class Q {
   }
   /** Used for invalidation */
   markAllChanged() {
-    var e, t, r, s, o, a, i;
-    this.fieldsMap.forEach((f) => f.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(), (o = this.outputFieldListChanged) == null || o.markChanged(), (a = this.dynamicFieldListChanged) == null || a.markChanged(), (i = this.kvChanged) == null || i.markChanged(), this.resourceRemoved.markChanged();
+    var e, t, r, a, o, s, i;
+    this.fieldsMap.forEach((f) => f.change.markChanged()), (e = this.finalChanged) == null || e.markChanged(), (t = this.resourceStateChange) == null || t.markChanged(), (r = this.lockedChange) == null || r.markChanged(), (a = this.inputAndServiceFieldListChanged) == null || a.markChanged(), (o = this.outputFieldListChanged) == null || o.markChanged(), (s = this.dynamicFieldListChanged) == null || s.markChanged(), (i = this.kvChanged) == null || i.markChanged(), this.resourceRemoved.markChanged();
   }
 }
 class O {
@@ -466,28 +466,28 @@ class O {
   }
   updateFromResourceData(e, t = !1) {
     this.checkValid();
-    const r = [], s = [];
-    for (const a of e) {
-      let i = this.resources.get(a.id);
+    const r = [], a = [];
+    for (const s of e) {
+      let i = this.resources.get(s.id);
       const f = i == null ? void 0 : i.basicState, l = (h) => {
-        const { fields: k, ...u } = a;
+        const { fields: k, ...u } = s;
         throw this.invalidateTree(), new R(
-          `Unexpected resource state transition (${h}): ${D(
+          `Unexpected resource state transition (${h}): ${L(
             u
-          )} -> ${D(f)}`
+          )} -> ${L(f)}`
         );
       };
       if (i !== void 0) {
         i.finalState && l("resource state can	 be updated after it is marked as final");
         let h = !1;
-        i.version += 1, i.originalResourceId !== a.originalResourceId && (i.originalResourceId !== T && l("originalResourceId can't change after it is set"), i.originalResourceId = a.originalResourceId, p(i.resourceStateChange).markChanged(), h = !0), i.error !== a.error && (g(i.error) && l("resource can't change attached error after it is set"), i.error = a.error, r.push(i.error), p(i.resourceStateChange).markChanged(), h = !0);
-        for (const u of a.fields) {
+        i.version += 1, i.originalResourceId !== s.originalResourceId && (i.originalResourceId !== F && l("originalResourceId can't change after it is set"), i.originalResourceId = s.originalResourceId, p(i.resourceStateChange).markChanged(), h = !0), i.error !== s.error && (g(i.error) && l("resource can't change attached error after it is set"), i.error = s.error, r.push(i.error), p(i.resourceStateChange).markChanged(), h = !0);
+        for (const u of s.fields) {
           let c = i.fieldsMap.get(u.name);
           c ? (c.type !== u.type && (c.type !== "Dynamic" && l(`field changed type ${c.type} -> ${u.type}`), p(i.dynamicFieldListChanged).markChanged(), (c.type === "Input" || c.type === "Service") && (i.inputsLocked && l(
             `adding input field "${u.name}", while corresponding list is locked`
           ), p(i.inputAndServiceFieldListChanged).markChanged()), c.type === "Output" && (i.outputsLocked && l(
             `adding output field "${u.name}", while corresponding list is locked`
-          ), p(i.outputFieldListChanged).markChanged()), c.type = u.type, c.change.markChanged(), h = !0), c.value !== u.value && (g(c.value) && s.push(c.value), c.value = u.value, g(u.value) && r.push(u.value), c.change.markChanged(), h = !0), c.error !== u.error && (g(c.error) && s.push(c.error), c.error = u.error, g(u.error) && r.push(u.error), c.change.markChanged(), h = !0), c.status !== u.status && (c.status = u.status, c.change.markChanged(), h = !0), c.valueIsFinal !== u.valueIsFinal && (c.valueIsFinal = u.valueIsFinal, c.change.markChanged(), h = !0), c.resourceVersion = i.version) : (c = new x(
+          ), p(i.outputFieldListChanged).markChanged()), c.type = u.type, c.change.markChanged(), h = !0), c.value !== u.value && (g(c.value) && a.push(c.value), c.value = u.value, g(u.value) && r.push(u.value), c.change.markChanged(), h = !0), c.error !== u.error && (g(c.error) && a.push(c.error), c.error = u.error, g(u.error) && r.push(u.error), c.change.markChanged(), h = !0), c.status !== u.status && (c.status = u.status, c.change.markChanged(), h = !0), c.valueIsFinal !== u.valueIsFinal && (c.valueIsFinal = u.valueIsFinal, c.change.markChanged(), h = !0), c.resourceVersion = i.version) : (c = new x(
             u.name,
             u.type,
             u.value,
@@ -502,28 +502,28 @@ class O {
           ), p(i.outputFieldListChanged).markChanged()) : p(i.dynamicFieldListChanged).markChanged(), i.fieldsMap.set(u.name, c), h = !0);
         }
         if (i.fieldsMap.forEach((u, c, v) => {
-          u.resourceVersion !== i.version && ((u.type === "Input" || u.type === "Service" || u.type === "Output") && l(`removal of ${u.type} field ${c}`), u.change.markChanged(), v.delete(c), g(u.value) && s.push(u.value), g(u.error) && s.push(u.error), p(i.dynamicFieldListChanged).markChanged());
-        }), i.inputsLocked !== a.inputsLocked && (i.inputsLocked && l("inputs unlocking is not permitted"), i.inputsLocked = a.inputsLocked, p(i.lockedChange).markChanged(), h = !0), i.outputsLocked !== a.outputsLocked && (i.outputsLocked && l("outputs unlocking is not permitted"), i.outputsLocked = a.outputsLocked, p(i.lockedChange).markChanged(), h = !0), i.resourceReady !== a.resourceReady) {
+          u.resourceVersion !== i.version && ((u.type === "Input" || u.type === "Service" || u.type === "Output") && l(`removal of ${u.type} field ${c}`), u.change.markChanged(), v.delete(c), g(u.value) && a.push(u.value), g(u.error) && a.push(u.error), p(i.dynamicFieldListChanged).markChanged());
+        }), i.inputsLocked !== s.inputsLocked && (i.inputsLocked && l("inputs unlocking is not permitted"), i.inputsLocked = s.inputsLocked, p(i.lockedChange).markChanged(), h = !0), i.outputsLocked !== s.outputsLocked && (i.outputsLocked && l("outputs unlocking is not permitted"), i.outputsLocked = s.outputsLocked, p(i.lockedChange).markChanged(), h = !0), i.resourceReady !== s.resourceReady) {
           const u = i.resourceReady;
-          i.resourceReady = a.resourceReady, i.verifyReadyState(), i.isReadyOrError || l(
+          i.resourceReady = s.resourceReady, i.verifyReadyState(), i.isReadyOrError || l(
             `resource can't lose it's ready or error state (ready state before ${u})`
           ), p(i.resourceStateChange).markChanged(), h = !0;
         }
         let k = !1;
-        for (const u of a.kv) {
+        for (const u of s.kv) {
           const c = i.kv.get(u.key);
           (c === void 0 || Buffer.compare(c, u.value) !== 0) && (i.kv.set(u.key, u.value), k = !0);
         }
-        if (i.kv.size > a.kv.length) {
-          const u = new Set(a.kv.map((c) => c.key));
+        if (i.kv.size > s.kv.length) {
+          const u = new Set(s.kv.map((c) => c.key));
           i.kv.forEach((c, v, y) => {
             u.has(v) || y.delete(v);
           }), k = !0;
         }
         k && p(i.kvChanged).markChanged(), h && (i.dataVersion = i.version, this.isFinalPredicate(i) && i.markFinal());
       } else {
-        i = new Q(a), i.verifyReadyState(), g(i.error) && r.push(i.error);
-        for (const h of a.fields) {
+        i = new Q(s), i.verifyReadyState(), g(i.error) && r.push(i.error);
+        for (const h of s.fields) {
           const k = new x(
             h.name,
             h.type,
@@ -531,37 +531,37 @@ class O {
             h.error,
             h.status,
             h.valueIsFinal,
-            L
+            T
           );
           g(h.value) && r.push(h.value), g(h.error) && r.push(h.error), i.fieldsMap.set(h.name, k);
         }
-        for (const h of a.kv) i.kv.set(h.key, h.value);
+        for (const h of s.kv) i.kv.set(h.key, h.value);
         this.isFinalPredicate(i) && i.markFinal(), this.resources.set(i.id, i), this.resourcesAdded.markChanged();
       }
     }
-    for (const a of r) {
-      const i = this.resources.get(a);
+    for (const s of r) {
+      const i = this.resources.get(s);
       if (!i)
-        throw this.invalidateTree(), new R(`orphan resource ${a}`);
+        throw this.invalidateTree(), new R(`orphan resource ${s}`);
       i.refCount++;
     }
-    let o = s;
+    let o = a;
     for (; o.length > 0; ) {
-      const a = [];
+      const s = [];
       for (const i of o) {
         const f = this.resources.get(i);
         if (!f)
           throw this.invalidateTree(), new R(`orphan resource ${i}`);
         f.refCount--, f.refCount === 0 && f.id !== this.root && (f.fieldsMap.forEach((l) => {
-          g(l.value) && a.push(l.value), g(l.error) && a.push(l.error), l.change.markChanged();
-        }), g(f.error) && a.push(f.error), f.resourceRemoved.markChanged(), this.resources.delete(i));
+          g(l.value) && s.push(l.value), g(l.error) && s.push(l.error), l.change.markChanged();
+        }), g(f.error) && s.push(f.error), f.resourceRemoved.markChanged(), this.resources.delete(i));
       }
-      o = a;
+      o = s;
     }
     if (!t) {
-      for (const a of e)
-        if (!this.resources.has(a.id))
-          throw this.invalidateTree(), new R(`orphan input resource ${a.id}`);
+      for (const s of e)
+        if (!this.resources.has(s.id))
+          throw this.invalidateTree(), new R(`orphan input resource ${s.id}`);
     }
   }
   /** @deprecated use "entry" instead */
@@ -582,11 +582,11 @@ class O {
 }
 function X(n, e) {
   const t = [], r = /* @__PURE__ */ new Set();
-  return n.forEachResource((s) => {
-    s.finalState ? r.add(s.id) : t.push(s.id);
+  return n.forEachResource((a) => {
+    a.finalState ? r.add(a.id) : t.push(a.id);
   }), t.length === 0 && r.size === 0 && t.push(n.root), { seedResources: t, finalResources: r, pruningFunction: e };
 }
-function F() {
+function D() {
   return {
     requests: 0,
     roundTrips: 0,
@@ -617,7 +617,7 @@ async function Z(n, e, t) {
   var c;
   const r = Date.now();
   t && t.requests++;
-  const { seedResources: s, finalResources: o, pruningFunction: a } = e, i = new j();
+  const { seedResources: a, finalResources: o, pruningFunction: s } = e, i = new j();
   let f = !0, l = 0;
   const h = /* @__PURE__ */ new Set(), k = (v) => {
     if (V(v) || h.has(v)) return;
@@ -637,7 +637,7 @@ async function Z(n, e, t) {
       })()
     );
   };
-  s.forEach((v) => k(v));
+  a.forEach((v) => k(v));
   const u = [];
   for (; ; ) {
     const v = i.shift();
@@ -645,8 +645,8 @@ async function Z(n, e, t) {
       break;
     let y = await v;
     if (y !== void 0) {
-      if (a !== void 0) {
-        const w = a(y);
+      if (s !== void 0) {
+        const w = s(y);
         t && (t.prunedFields += y.fields.length - w.length), y = { ...y, fields: w };
       }
       k(y.error);
@@ -665,16 +665,16 @@ function fe(n) {
   return n;
 }
 function ge(n, e, t) {
-  var a;
+  var s;
   const r = n instanceof C ? p(t).accessor(n).node() : n instanceof E ? n.node() : n, o = { ...r.resourceInfo };
   if (e.data !== void 0 && (e.data === "raw" ? o.data = r.getData() : o.data = e.data.parse(r.getDataAsJson())), e.fields !== void 0) {
     const i = {};
     for (const [f, l] of Object.entries(e.fields))
-      i[f] = (a = r.traverse({
+      i[f] = (s = r.traverse({
         field: f,
         errorIfFieldNotSet: l,
         stableIfNotFound: !l
-      })) == null ? void 0 : a.id;
+      })) == null ? void 0 : s.id;
     o.fields = i;
   }
   if (e.kv !== void 0) {
@@ -691,15 +691,15 @@ function ge(n, e, t) {
 }
 function pe(n, e, t) {
   if (n instanceof C) {
-    const r = t.accessor(n).node(), s = r.resourceInfo, o = e.map((a) => {
+    const r = t.accessor(n).node(), a = r.resourceInfo, o = e.map((s) => {
       var i, f;
       return [
-        a,
-        (f = (i = r.getField(a)) == null ? void 0 : i.value) == null ? void 0 : f.id
+        s,
+        (f = (i = r.getField(s)) == null ? void 0 : i.value) == null ? void 0 : f.id
       ];
     });
     return {
-      ...s,
+      ...a,
       fields: new Map(o),
       data: r.getData() ?? new Uint8Array()
     };
@@ -708,14 +708,14 @@ function pe(n, e, t) {
 }
 function ve(n, e, t) {
   if (!(n instanceof C)) return n;
-  const r = t.accessor(n).node(), s = r.resourceInfo, o = e.map((a) => [a, r.getKeyValue(a)]);
+  const r = t.accessor(n).node(), a = r.resourceInfo, o = e.map((s) => [s, r.getKeyValue(s)]);
   return {
-    ...s,
+    ...a,
     metadata: Object.fromEntries(o)
   };
 }
 class B {
-  constructor(e, t, r, s) {
+  constructor(e, t, r, a) {
     d(this, "finalPredicate");
     d(this, "state");
     d(this, "pollingInterval");
@@ -723,6 +723,7 @@ class B {
     d(this, "logStat");
     d(this, "hooks");
     d(this, "abortController", new AbortController());
+    d(this, "currentLoopDelayInterrupt");
     d(this, "scheduledOnNextState", []);
     /** If true, main loop will continue polling pl state. */
     d(this, "keepRunning", !1);
@@ -730,9 +731,9 @@ class B {
     d(this, "currentLoop");
     /** If true this tree state is permanently terminaed. */
     d(this, "terminated", !1);
-    this.pl = e, this.root = t, this.logger = s;
-    const { finalPredicateOverride: o, pruning: a, pollingInterval: i, stopPollingDelay: f, logStat: l } = r;
-    this.pruning = a, this.pollingInterval = i, this.finalPredicate = o ?? e.finalPredicate, this.logStat = l, this.state = new O(t, this.finalPredicate), this.hooks = new z(
+    this.pl = e, this.root = t, this.logger = a;
+    const { finalPredicateOverride: o, pruning: s, pollingInterval: i, stopPollingDelay: f, logStat: l } = r;
+    this.pruning = s, this.pollingInterval = i, this.finalPredicate = o ?? e.finalPredicate, this.logStat = l, this.state = new O(t, this.finalPredicate), this.hooks = new z(
       () => this.startUpdating(),
       () => this.stopUpdating(),
       { stopDebounce: f },
@@ -754,8 +755,9 @@ class B {
     if (this.terminated) throw new Error("tree synchronization is terminated");
     await this.hooks.refreshState();
   }
+  /** Called from computable hooks when external observer asks for state refresh */
   scheduleOnNextState(e, t) {
-    this.terminated ? t(new Error("tree synchronization is terminated")) : this.scheduledOnNextState.push({ resolve: e, reject: t });
+    this.terminated ? t(new Error("tree synchronization is terminated")) : (this.scheduledOnNextState.push({ resolve: e, reject: t }), this.currentLoopDelayInterrupt && (this.currentLoopDelayInterrupt.abort(), this.currentLoopDelayInterrupt = void 0));
   }
   /** Called from observer */
   startUpdating() {
@@ -768,31 +770,37 @@ class B {
   /** Executed from the main loop, and initialization procedure. */
   async refresh(e, t) {
     if (this.terminated) throw new Error("tree synchronization is terminated");
-    const r = X(this.state, this.pruning), s = await this.pl.withReadTx("ReadingTree", async (o) => await Z(o, r, e), t);
-    this.state.updateFromResourceData(s, !0);
+    const r = X(this.state, this.pruning), a = await this.pl.withReadTx("ReadingTree", async (o) => await Z(o, r, e), t);
+    this.state.updateFromResourceData(a, !0);
   }
   async mainLoop() {
-    var t, r;
-    let e = this.logStat ? F() : void 0;
-    for (; this.keepRunning; ) {
-      let s;
-      this.scheduledOnNextState.length > 0 && (s = this.scheduledOnNextState, this.scheduledOnNextState = []);
+    var r, a;
+    let e = this.logStat ? D() : void 0, t = Date.now();
+    for (; !(!this.keepRunning || this.terminated); ) {
+      let o;
+      this.scheduledOnNextState.length > 0 && (o = this.scheduledOnNextState, this.scheduledOnNextState = []);
       try {
-        if (this.logStat === "per-request" && (e = F()), await this.refresh(e), e && this.logger && this.logger.info(`Tree stat (success): ${JSON.stringify(e)}`), s !== void 0) for (const o of s) o.resolve();
-      } catch (o) {
-        if (e && this.logger && this.logger.info(`Tree stat (error): ${JSON.stringify(e)}`), s !== void 0) for (const a of s) a.reject(o);
-        if (o instanceof R) {
-          (t = this.logger) == null || t.error(o), this.state.invalidateTree("stat update error"), this.state = new O(this.root, this.finalPredicate);
+        if (this.logStat === "per-request" && (e = D()), await this.refresh(e), e && this.logger && this.logger.info(`Tree stat (success, after ${Date.now() - t}ms): ${JSON.stringify(e)}`), t = Date.now(), o !== void 0) for (const s of o) s.resolve();
+      } catch (s) {
+        if (e && this.logger && this.logger.info(`Tree stat (error, after ${Date.now() - t}ms): ${JSON.stringify(e)}`), t = Date.now(), o !== void 0) for (const i of o) i.reject(s);
+        if (s instanceof R) {
+          (r = this.logger) == null || r.error(s), this.state.invalidateTree("stat update error"), this.state = new O(this.root, this.finalPredicate);
           continue;
-        } else (r = this.logger) == null || r.warn(o);
+        } else (a = this.logger) == null || a.warn(s);
       }
       if (!this.keepRunning || this.terminated) break;
-      try {
-        await Y.setTimeout(this.pollingInterval, this.abortController.signal);
-      } catch (o) {
-        if (!q(o)) throw new Error("Unexpected error", { cause: o });
-        break;
-      }
+      if (this.scheduledOnNextState.length === 0)
+        try {
+          this.currentLoopDelayInterrupt = new AbortController(), await Y.setTimeout(
+            this.pollingInterval,
+            AbortSignal.any([this.abortController.signal, this.currentLoopDelayInterrupt.signal])
+          );
+        } catch (s) {
+          if (!q(s)) throw new Error("Unexpected error", { cause: s });
+          break;
+        } finally {
+          this.currentLoopDelayInterrupt = void 0;
+        }
     }
     this.currentLoop = void 0;
   }
@@ -814,16 +822,16 @@ class B {
   async awaitSyncLoopTermination() {
     this.currentLoop !== void 0 && await this.currentLoop;
   }
-  static async init(e, t, r, s) {
-    const o = new B(e, t, r, s), a = r.logStat ? F() : void 0;
+  static async init(e, t, r, a) {
+    const o = new B(e, t, r, a), s = r.logStat ? D() : void 0;
     let i = !1;
     try {
-      await o.refresh(a, {
+      await o.refresh(s, {
         timeout: r.initialTreeLoadingTimeout
       }), i = !0;
     } finally {
-      a && s && s.info(
-        `Tree stat (initial load, ${i ? "success" : "failure"}): ${JSON.stringify(a)}`
+      s && a && a.info(
+        `Tree stat (initial load, ${i ? "success" : "failure"}): ${JSON.stringify(s)}`
       );
     }
     return o;
@@ -843,8 +851,8 @@ function ye(n) {
     byResourceType: {}
   };
   for (const r of n) {
-    const s = `${r.type.name}/${r.type.version}`;
-    e.byResourceType[s] || (e.byResourceType[s] = {
+    const a = `${r.type.name}/${r.type.version}`;
+    e.byResourceType[a] || (e.byResourceType[a] = {
       count: 0,
       fieldNameBytes: 0,
       fieldsCount: 0,
@@ -852,17 +860,17 @@ function ye(n) {
       kvCount: 0,
       kvBytes: 0
     });
-    const o = e.byResourceType[s];
+    const o = e.byResourceType[a];
     o.count++, e.total.count++;
-    for (const a of r.fields)
-      o.fieldNameBytes += a.name.length, o.fieldsCount++, e.total.fieldNameBytes += a.name.length, e.total.fieldsCount++;
+    for (const s of r.fields)
+      o.fieldNameBytes += s.name.length, o.fieldsCount++, e.total.fieldNameBytes += s.name.length, e.total.fieldsCount++;
     if (r.data) {
-      const a = ((t = r.data) == null ? void 0 : t.length) ?? 0;
-      o.dataBytes += a, e.total.dataBytes += a;
+      const s = ((t = r.data) == null ? void 0 : t.length) ?? 0;
+      o.dataBytes += s, e.total.dataBytes += s;
     }
     o.kvCount += r.kv.length, e.total.kvCount += r.kv.length;
-    for (const a of r.kv) {
-      const i = a.key.length + a.value.length;
+    for (const s of r.kv) {
+      const i = s.key.length + s.value.length;
       o.kvBytes += i, e.total.kvBytes += i;
     }
   }
@@ -879,7 +887,7 @@ export {
   R as TreeStateUpdateError,
   X as constructTreeLoadingRequest,
   le as formatTreeLoadingStat,
-  F as initialTreeLoadingStat,
+  D as initialTreeLoadingStat,
   ue as isPlTreeEntry,
   de as isPlTreeEntryAccessor,
   ce as isPlTreeNodeAccessor,