@milaboratories/pl-tree 1.4.1 → 1.4.3

package/dist/index.mjs

@@ -1,32 +1,32 @@
-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 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";
+var U = Object.defineProperty;
+var J = (a, e, t) => e in a ? U(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
+var d = (a, e, t) => J(a, typeof e != "symbol" ? e + "" : e, t);
+import { resourceIdToString as C, resourceTypeToString as A, resourceTypesEqual as $, isNotNullResourceId as g, NullResourceId as D, isNullResourceId as P, stringifyWithResourceId as L, isTimeoutOrCancelError as q } from "@milaboratories/pl-client";
+import { ChangeSource as m, PollingComputableHooks as B } 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) {
-  if (n !== void 0)
-    return P(n, e);
+function se(a, e) {
+  if (a !== void 0)
+    return b(a, e);
 }
-function P(n, e) {
+function b(a, e) {
   const t = {};
-  return n.value !== void 0 && (t.value = e(n.value)), n.error !== void 0 && (t.error = e(n.error)), t;
+  return a.value !== void 0 && (t.value = e(a.value)), a.error !== void 0 && (t.error = e(a.error)), t;
 }
 class N extends Error {
   constructor(e) {
     super(e);
   }
 }
-function ne(n) {
-  return typeof n == "object" && n !== null && n.__pl_tree_type_marker__ === "PlTreeEntry";
+function ae(a) {
+  return typeof a == "object" && a !== null && a.__pl_tree_type_marker__ === "PlTreeEntry";
 }
-function oe(n) {
-  return typeof n == "object" && n !== null && n.__pl_tree_type_marker__ === "PlTreeEntryAccessor";
+function ne(a) {
+  return typeof a == "object" && a !== null && a.__pl_tree_type_marker__ === "PlTreeEntryAccessor";
 }
-function ae(n) {
-  return typeof n == "object" && n !== null && n.__pl_tree_type_marker__ === "PlTreeNodeAccessor";
+function oe(a) {
+  return typeof a == "object" && a !== null && a.__pl_tree_type_marker__ === "PlTreeNodeAccessor";
 }
 class R {
   constructor(e, t) {
@@ -46,45 +46,45 @@ class R {
     return `[ENTRY:${C(this.rid)}]`;
   }
 }
-function K(n, e, t, r, s) {
-  const a = new Y(
-    n,
+function K(a, e, t, i, s) {
+  const o = new Y(
+    a,
     e,
-    e.get(t.ctx.watcher, r),
+    e.get(t.ctx.watcher, i),
     t
   );
   if (!s.ignoreError) {
-    const o = a.getError();
-    if (o !== void 0)
+    const n = o.getError();
+    if (n !== void 0)
       throw new N(
-        `error encountered on resource ${C(a.id)} (${A(a.resourceType)}): ${o.getDataAsString()}`
+        `error encountered on resource ${C(o.id)} (${A(o.resourceType)}): ${n.getDataAsString()}`
       );
   }
-  if (s.assertResourceType !== void 0 && (Array.isArray(s.assertResourceType) ? s.assertResourceType.findIndex((o) => $(o, a.resourceType)) === -1 : !$(s.assertResourceType, a.resourceType)))
+  if (s.assertResourceType !== void 0 && (Array.isArray(s.assertResourceType) ? s.assertResourceType.findIndex((n) => $(n, o.resourceType)) === -1 : !$(s.assertResourceType, o.resourceType)))
     throw new Error(
-      `wrong resource type ${A(a.resourceType)} but expected ${s.assertResourceType}`
+      `wrong resource type ${A(o.resourceType)} but expected ${s.assertResourceType}`
     );
-  return a;
+  return o;
 }
 class E {
-  constructor(e, t, r, s) {
+  constructor(e, t, i, s) {
     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 = i, this.instanceData = s;
   }
   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);
   }
 }
-function ue(n, e) {
-  return n instanceof R ? e.accessor(n).node().resourceInfo : n;
+function ue(a, e) {
+  return a instanceof R ? e.accessor(a).node().resourceInfo : a;
 }
 class Y {
-  constructor(e, t, r, s) {
+  constructor(e, t, i, s) {
     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 = i, this.instanceData = s;
   }
   get id() {
     return this.instanceData.guard(), this.resource.id;
@@ -108,44 +108,44 @@ class Y {
     return this.traverseOrErrorWithCommon({}, ...e);
   }
   traverseWithCommon(e, ...t) {
-    const r = this.traverseOrErrorWithCommon(e, ...t);
-    if (r !== void 0) {
-      if (!r.ok) throw new N(r.error);
-      return r.value;
+    const i = this.traverseOrErrorWithCommon(e, ...t);
+    if (i !== void 0) {
+      if (!i.ok) throw new N(i.error);
+      return i.value;
     }
   }
   traverseOrErrorWithCommon(e, ...t) {
-    let r = this;
+    let i = this;
     for (const s of t) {
-      const a = typeof s == "string" ? {
+      const o = typeof s == "string" ? {
         ...e,
         field: s
-      } : { ...e, ...s }, o = r.getField(s);
-      if (o === void 0 || a.pureFieldErrorToUndefined && o.value === void 0 && o.error !== void 0)
+      } : { ...e, ...s }, n = i.getField(s);
+      if (n === void 0 || o.pureFieldErrorToUndefined && n.value === void 0 && n.error !== void 0)
         return;
-      if ((!a.ignoreError || o.value === void 0) && o.error !== void 0)
+      if ((!o.ignoreError || n.value === void 0) && n.error !== void 0)
         return {
           ok: !1,
-          error: `error in field ${a.field} of ${C(r.id)}: ${o.error.getDataAsString()}`
+          error: `error in field ${o.field} of ${C(i.id)}: ${n.error.getDataAsString()}`
         };
-      if (o.value === void 0) {
-        if (a.errorIfFieldNotSet)
+      if (n.value === void 0) {
+        if (o.errorIfFieldNotSet)
           return {
             ok: !1,
-            error: `field have no assigned value ${a.field} of ${C(r.id)}`
+            error: `field have no assigned value ${o.field} of ${C(i.id)}`
           };
-        this.onUnstableLambda("unpopulated_field:" + a.field);
+        this.onUnstableLambda("unpopulated_field:" + o.field);
         return;
       }
-      r = o.value;
+      i = n.value;
     }
-    return { ok: !0, value: r };
+    return { ok: !0, value: i };
   }
   getField(e) {
     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 P(r, (s) => this.getResourceFromTree(s, { ignoreError: !0 }));
+    const t = typeof e == "string" ? { field: e } : e, i = this.resource.getField(this.instanceData.ctx.watcher, t, this.onUnstableLambda);
+    if (i !== void 0)
+      return b(i, (s) => this.getResourceFromTree(s, { ignoreError: !0 }));
   }
   getInputsLocked() {
     this.instanceData.guard();
@@ -191,8 +191,8 @@ class Y {
   }
   getKeyValue(e, t = !1) {
     this.instanceData.guard();
-    const r = this.resource.getKeyValue(this.instanceData.ctx.watcher, e);
-    return r === void 0 && t && this.instanceData.ctx.markUnstable("key_not_found_b:" + e), r;
+    const i = this.resource.getKeyValue(this.instanceData.ctx.watcher, e);
+    return i === void 0 && t && this.instanceData.ctx.markUnstable("key_not_found_b:" + e), i;
   }
   /** @deprecated */
   getKeyValueString(e) {
@@ -200,16 +200,16 @@ class Y {
   }
   getKeyValueAsString(e, t = !1) {
     this.instanceData.guard();
-    const r = this.resource.getKeyValueString(this.instanceData.ctx.watcher, e);
-    return r === void 0 && t && this.instanceData.ctx.markUnstable("key_not_found_s:" + e), r;
+    const i = this.resource.getKeyValueString(this.instanceData.ctx.watcher, e);
+    return i === void 0 && t && this.instanceData.ctx.markUnstable("key_not_found_s:" + e), i;
   }
   getKeyValueAsJson(e, t = !1) {
-    const r = this.resource.getKeyValueString(this.instanceData.ctx.watcher, e);
-    if (r === void 0) {
+    const i = this.resource.getKeyValueString(this.instanceData.ctx.watcher, e);
+    if (i === void 0) {
       t && this.instanceData.ctx.markUnstable("key_not_found_j:" + e);
       return;
     }
-    return JSON.parse(r);
+    return JSON.parse(i);
   }
   /**
    * Can be used to passe a higher level accessor that will wrap the resource and throw its
@@ -229,9 +229,9 @@ class S extends Error {
   }
 }
 class x {
-  constructor(e, t, r, s) {
+  constructor(e, t, i, s, o, n, r) {
     d(this, "change", new m());
-    this.type = e, this.value = t, this.error = r, this.resourceVersion = s;
+    this.name = e, this.type = t, this.value = i, this.error = s, this.status = o, this.valueIsFinal = n, this.resourceVersion = r;
   }
 }
 const T = 0, O = new TextDecoder();
@@ -243,7 +243,7 @@ class G {
     d(this, "version", T);
     /** Set to resource version when resource state, or it's fields have changed */
     d(this, "dataVersion", T);
-    d(this, "fields", /* @__PURE__ */ new Map());
+    d(this, "fieldsMap", /* @__PURE__ */ new Map());
     d(this, "kv", /* @__PURE__ */ new Map());
     d(this, "resourceRemoved", new m());
     // following change source are removed when resource is marked as final
@@ -266,8 +266,8 @@ class G {
     d(this, "outputsLocked");
     d(this, "resourceReady");
     d(this, "finalFlag");
-    /** Set externally by the tree, using {@link FinalPredicate} */
-    d(this, "_final", !1);
+    /** Set externally by the tree, using {@link FinalResourceDataPredicate} */
+    d(this, "_finalState", !1);
     d(this, "logger");
     this.id = e.id, this.originalResourceId = e.originalResourceId, this.kind = e.kind, this.type = e.type, this.data = e.data, this.error = e.error, this.inputsLocked = e.inputsLocked, this.outputsLocked = e.outputsLocked, this.resourceReady = e.resourceReady, this.finalFlag = e.final, this.logger = t;
   }
@@ -279,38 +279,44 @@ class G {
     this.logger !== void 0 && this.logger.warn(e);
   }
   get final() {
-    return this._final;
+    return this.finalFlag;
+  }
+  get finalState() {
+    return this._finalState;
   }
-  getField(e, t, r = () => {
+  get fields() {
+    return [...this.fieldsMap.values()];
+  }
+  getField(e, t, i = () => {
   }) {
-    var o, i, l;
-    const s = typeof t == "string" ? { field: t } : t, a = this.fields.get(s.field);
-    if (a === void 0) {
+    var n, r, f;
+    const s = typeof t == "string" ? { field: t } : t, o = this.fieldsMap.get(s.field);
+    if (o === void 0) {
       if (s.errorIfFieldNotFound || s.errorIfFieldNotSet)
         throw new Error(
           `Field "${s.field}" not found in resource ${C(this.id)}`
         );
-      if (!this.inputsLocked) (o = this.inputAndServiceFieldListChanged) == null || o.attachWatcher(e);
+      if (!this.inputsLocked) (n = this.inputAndServiceFieldListChanged) == null || n.attachWatcher(e);
       else if (s.assertFieldType === "Service" || s.assertFieldType === "Input") {
         if (s.allowPermanentAbsence)
           return;
         throw new Error(`Service or input field not found ${s.field}.`);
       }
-      if (!this.outputsLocked) (i = this.outputFieldListChanged) == null || i.attachWatcher(e);
+      if (!this.outputsLocked) (r = this.outputFieldListChanged) == null || r.attachWatcher(e);
       else if (s.assertFieldType === "Output") {
         if (s.allowPermanentAbsence)
           return;
         throw new Error(`Output field not found ${s.field}.`);
       }
-      (l = this.dynamicFieldListChanged) == null || l.attachWatcher(e), !this._final && !s.stableIfNotFound && r("field_not_found:" + s.field);
+      (f = this.dynamicFieldListChanged) == null || f.attachWatcher(e), !this._finalState && !s.stableIfNotFound && i("field_not_found:" + s.field);
       return;
     } else {
-      if (s.assertFieldType !== void 0 && a.type !== s.assertFieldType)
+      if (s.assertFieldType !== void 0 && o.type !== s.assertFieldType)
         throw new Error(
-          `Unexpected field type: expected ${s.assertFieldType} but got ${a.type} for the field name ${s.field}`
+          `Unexpected field type: expected ${s.assertFieldType} but got ${o.type} for the field name ${s.field}`
         );
-      const c = {};
-      return g(a.value) && (c.value = a.value), g(a.error) && (c.error = a.error), c.value === void 0 && c.error === void 0 && r("field_not_resolved:" + s.field), a.change.attachWatcher(e), c;
+      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 && i("field_not_resolved:" + s.field), o.change.attachWatcher(e), l;
     }
   }
   getInputsLocked(e) {
@@ -322,11 +328,11 @@ class G {
     return this.outputsLocked || (t = this.resourceStateChange) == null || t.attachWatcher(e), this.outputsLocked;
   }
   get isReadyOrError() {
-    return this.error !== F || this.resourceReady || this.originalResourceId !== F;
+    return this.error !== D || this.resourceReady || this.originalResourceId !== D;
   }
   getIsFinal(e) {
     var t;
-    return (t = this.finalChanged) == null || t.attachWatcher(e), this._final;
+    return (t = this.finalChanged) == null || t.attachWatcher(e), this._finalState;
   }
   getIsReadyOrError(e) {
     var t;
@@ -334,41 +340,41 @@ class G {
   }
   getError(e) {
     var t;
-    if (b(this.error)) {
+    if (P(this.error)) {
       (t = this.resourceStateChange) == null || t.attachWatcher(e);
       return;
     } else
       return this.error;
   }
   listInputFields(e) {
-    var r;
+    var i;
     const t = [];
-    return this.fields.forEach((s, a) => {
-      (s.type === "Input" || s.type === "Service") && t.push(a);
-    }), this.inputsLocked || (r = this.inputAndServiceFieldListChanged) == null || r.attachWatcher(e), t;
+    return this.fieldsMap.forEach((s, o) => {
+      (s.type === "Input" || s.type === "Service") && t.push(o);
+    }), this.inputsLocked || (i = this.inputAndServiceFieldListChanged) == null || i.attachWatcher(e), t;
   }
   listOutputFields(e) {
-    var r;
+    var i;
     const t = [];
-    return this.fields.forEach((s, a) => {
-      s.type === "Output" && t.push(a);
-    }), this.outputsLocked || (r = this.outputFieldListChanged) == null || r.attachWatcher(e), t;
+    return this.fieldsMap.forEach((s, o) => {
+      s.type === "Output" && t.push(o);
+    }), this.outputsLocked || (i = this.outputFieldListChanged) == null || i.attachWatcher(e), t;
   }
   listDynamicFields(e) {
-    var r;
+    var i;
     const t = [];
-    return this.fields.forEach((s, a) => {
-      s.type !== "Input" && s.type !== "Output" && t.push(a);
-    }), (r = this.dynamicFieldListChanged) == null || r.attachWatcher(e), t;
+    return this.fieldsMap.forEach((s, o) => {
+      s.type !== "Input" && s.type !== "Output" && t.push(o);
+    }), (i = this.dynamicFieldListChanged) == null || i.attachWatcher(e), t;
   }
   getKeyValue(e, t) {
-    var r;
-    return (r = this.kvChanged) == null || r.attachWatcher(e), this.kv.get(t);
+    var i;
+    return (i = this.kvChanged) == null || i.attachWatcher(e), this.kv.get(t);
   }
   getKeyValueString(e, t) {
-    const r = this.getKeyValue(e, t);
-    if (r !== void 0)
-      return O.decode(r);
+    const i = this.getKeyValue(e, t);
+    if (i !== void 0)
+      return O.decode(i);
   }
   getDataAsString() {
     if (this.data !== void 0)
@@ -396,17 +402,18 @@ class G {
       final: this.finalFlag
     };
   }
+  /** Called when {@link FinalResourceDataPredicate} returns true for the state. */
   markFinal() {
-    this._final || (this._final = !0, y(this.finalChanged).markChanged(), this.finalChanged = void 0, this.resourceStateChange = void 0, this.dynamicFieldListChanged = void 0, this.inputAndServiceFieldListChanged = void 0, this.outputFieldListChanged = void 0, this.lockedChange = void 0);
+    this._finalState || (this._finalState = !0, y(this.finalChanged).markChanged(), this.finalChanged = void 0, this.resourceStateChange = void 0, this.dynamicFieldListChanged = void 0, this.inputAndServiceFieldListChanged = void 0, this.outputFieldListChanged = void 0, this.lockedChange = void 0);
   }
   /** Used for invalidation */
   markAllChanged() {
-    var e, t, r, s, a, o, i;
-    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();
+    var e, t, i, s, o, n, r;
+    this.fieldsMap.forEach((f) => f.change.markChanged()), (e = this.finalChanged) == null || e.markChanged(), (t = this.resourceStateChange) == null || t.markChanged(), (i = this.lockedChange) == null || i.markChanged(), (s = this.inputAndServiceFieldListChanged) == null || s.markChanged(), (o = this.outputFieldListChanged) == null || o.markChanged(), (n = this.dynamicFieldListChanged) == null || n.markChanged(), (r = this.kvChanged) == null || r.markChanged(), this.resourceRemoved.markChanged();
   }
 }
 class V {
-  constructor(e, t = (r) => !1) {
+  constructor(e, t) {
     /** resource heap */
     d(this, "resources", /* @__PURE__ */ new Map());
     d(this, "resourcesAdded", new m());
@@ -424,93 +431,109 @@ class V {
   }
   get(e, t) {
     this.checkValid();
-    const r = this.resources.get(t);
-    if (r === void 0)
+    const i = this.resources.get(t);
+    if (i === void 0)
       throw this.resourcesAdded.attachWatcher(e), new Error(`resource ${C(t)} not found in the tree`);
-    return r.resourceRemoved.attachWatcher(e), r;
+    return i.resourceRemoved.attachWatcher(e), i;
   }
   updateFromResourceData(e, t = !1) {
     this.checkValid();
-    const r = [], s = [];
-    for (const o of e) {
-      let i = this.resources.get(o.id);
-      const l = i == null ? void 0 : i.state, c = (f) => {
-        const { fields: k, ...u } = o;
+    const i = [], s = [];
+    for (const n of e) {
+      let r = this.resources.get(n.id);
+      const f = r == null ? void 0 : r.state, l = (h) => {
+        const { fields: k, ...u } = n;
         throw this.invalidateTree(), new S(
-          `Unexpected resource state transition (${f}): ${L(
+          `Unexpected resource state transition (${h}): ${L(
             u
-          )} -> ${L(l)}`
+          )} -> ${L(f)}`
         );
       };
-      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 !== 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(
+      if (r !== void 0) {
+        r.finalState && l("resource state can	 be updated after it is marked as final");
+        let h = !1;
+        r.version += 1, r.originalResourceId !== n.originalResourceId && (r.originalResourceId !== D && l("originalResourceId can't change after it is set"), r.originalResourceId = n.originalResourceId, y(r.resourceStateChange).markChanged(), h = !0), r.error !== n.error && (g(r.error) && l("resource can't change attached error after it is set"), r.error = n.error, i.push(r.error), y(r.resourceStateChange).markChanged(), h = !0);
+        for (const u of n.fields) {
+          let c = r.fieldsMap.get(u.name);
+          c ? (c.type !== u.type && (c.type !== "Dynamic" && l(`field changed type ${c.type} -> ${u.type}`), y(r.dynamicFieldListChanged).markChanged(), (c.type === "Input" || c.type === "Service") && (r.inputsLocked && l(
             `adding input field "${u.name}", while corresponding list is locked`
-          ), y(i.inputAndServiceFieldListChanged).markChanged()), h.type === "Output" && (i.outputsLocked && c(
+          ), y(r.inputAndServiceFieldListChanged).markChanged()), c.type === "Output" && (r.outputsLocked && l(
             `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 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(
+          ), y(r.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) && i.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) && i.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 = r.version) : (c = new x(
+            u.name,
+            u.type,
+            u.value,
+            u.error,
+            u.status,
+            u.valueIsFinal,
+            r.version
+          ), g(u.value) && i.push(u.value), g(u.error) && i.push(u.error), u.type === "Input" || u.type === "Service" ? (r.inputsLocked && l(
             `adding ${u.type} (${u.name}) field while inputs locked`
-          ), y(i.inputAndServiceFieldListChanged).markChanged()) : u.type === "Output" ? (i.outputsLocked && c(
+          ), y(r.inputAndServiceFieldListChanged).markChanged()) : u.type === "Output" ? (r.outputsLocked && l(
             `adding ${u.type} (${u.name}) field while outputs locked`
-          ), y(i.outputFieldListChanged).markChanged()) : y(i.dynamicFieldListChanged).markChanged(), i.fields.set(u.name, h), f = !0);
+          ), y(r.outputFieldListChanged).markChanged()) : y(r.dynamicFieldListChanged).markChanged(), r.fieldsMap.set(u.name, c), h = !0);
         }
-        if (i.fields.forEach((u, h, p) => {
-          u.resourceVersion !== i.version && ((u.type === "Input" || u.type === "Service" || u.type === "Output") && c(`removal of ${u.type} field ${h}`), u.change.markChanged(), p.delete(h), g(u.value) && s.push(u.value), g(u.error) && s.push(u.error), y(i.dynamicFieldListChanged).markChanged());
-        }), i.inputsLocked !== o.inputsLocked && (i.inputsLocked && c("inputs unlocking is not permitted"), i.inputsLocked = o.inputsLocked, y(i.lockedChange).markChanged(), f = !0), i.outputsLocked !== o.outputsLocked && (i.outputsLocked && c("outputs unlocking is not permitted"), i.outputsLocked = o.outputsLocked, y(i.lockedChange).markChanged(), f = !0), i.resourceReady !== o.resourceReady) {
-          const u = i.resourceReady;
-          i.resourceReady = o.resourceReady, i.verifyReadyState(), i.isReadyOrError || c(
+        if (r.fieldsMap.forEach((u, c, p) => {
+          u.resourceVersion !== r.version && ((u.type === "Input" || u.type === "Service" || u.type === "Output") && l(`removal of ${u.type} field ${c}`), u.change.markChanged(), p.delete(c), g(u.value) && s.push(u.value), g(u.error) && s.push(u.error), y(r.dynamicFieldListChanged).markChanged());
+        }), r.inputsLocked !== n.inputsLocked && (r.inputsLocked && l("inputs unlocking is not permitted"), r.inputsLocked = n.inputsLocked, y(r.lockedChange).markChanged(), h = !0), r.outputsLocked !== n.outputsLocked && (r.outputsLocked && l("outputs unlocking is not permitted"), r.outputsLocked = n.outputsLocked, y(r.lockedChange).markChanged(), h = !0), r.resourceReady !== n.resourceReady) {
+          const u = r.resourceReady;
+          r.resourceReady = n.resourceReady, r.verifyReadyState(), r.isReadyOrError || l(
             `resource can't lose it's ready or error state (ready state before ${u})`
-          ), y(i.resourceStateChange).markChanged(), f = !0;
+          ), y(r.resourceStateChange).markChanged(), h = !0;
         }
         let k = !1;
-        for (const u of o.kv) {
-          const h = i.kv.get(u.key);
-          (h === void 0 || Buffer.compare(h, u.value) !== 0) && (i.kv.set(u.key, u.value), k = !0);
+        for (const u of n.kv) {
+          const c = r.kv.get(u.key);
+          (c === void 0 || Buffer.compare(c, u.value) !== 0) && (r.kv.set(u.key, u.value), k = !0);
         }
-        if (i.kv.size > o.kv.length) {
-          const u = new Set(o.kv.map((h) => h.key));
-          i.kv.forEach((h, p, v) => {
+        if (r.kv.size > n.kv.length) {
+          const u = new Set(n.kv.map((c) => c.key));
+          r.kv.forEach((c, p, v) => {
             u.has(p) || v.delete(p);
           }), k = !0;
         }
-        k && y(i.kvChanged).markChanged(), f && (i.dataVersion = i.version, this.isFinalPredicate(i) && i.markFinal());
+        k && y(r.kvChanged).markChanged(), h && (r.dataVersion = r.version, this.isFinalPredicate(r) && r.markFinal());
       } else {
-        i = new G(o), i.verifyReadyState(), g(i.error) && r.push(i.error);
-        for (const f of o.fields) {
-          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);
+        r = new G(n), r.verifyReadyState(), g(r.error) && i.push(r.error);
+        for (const h of n.fields) {
+          const k = new x(
+            h.name,
+            h.type,
+            h.value,
+            h.error,
+            h.status,
+            h.valueIsFinal,
+            T
+          );
+          g(h.value) && i.push(h.value), g(h.error) && i.push(h.error), r.fieldsMap.set(h.name, k);
         }
-        for (const f of o.kv) i.kv.set(f.key, f.value);
-        this.isFinalPredicate(i) && i.markFinal(), this.resources.set(i.id, i), this.resourcesAdded.markChanged();
+        for (const h of n.kv) r.kv.set(h.key, h.value);
+        this.isFinalPredicate(r) && r.markFinal(), this.resources.set(r.id, r), this.resourcesAdded.markChanged();
       }
     }
-    for (const o of r) {
-      const i = this.resources.get(o);
-      if (!i)
-        throw this.invalidateTree(), new S(`orphan resource ${o}`);
-      i.refCount++;
+    for (const n of i) {
+      const r = this.resources.get(n);
+      if (!r)
+        throw this.invalidateTree(), new S(`orphan resource ${n}`);
+      r.refCount++;
     }
-    let a = s;
-    for (; a.length > 0; ) {
-      const o = [];
-      for (const i of a) {
-        const l = this.resources.get(i);
-        if (!l)
-          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));
+    let o = s;
+    for (; o.length > 0; ) {
+      const n = [];
+      for (const r of o) {
+        const f = this.resources.get(r);
+        if (!f)
+          throw this.invalidateTree(), new S(`orphan resource ${r}`);
+        f.refCount--, f.refCount === 0 && f.id !== this.root && (f.fieldsMap.forEach((l) => {
+          g(l.value) && n.push(l.value), g(l.error) && n.push(l.error), l.change.markChanged();
+        }), g(f.error) && n.push(f.error), f.resourceRemoved.markChanged(), this.resources.delete(r));
       }
-      a = o;
+      o = n;
     }
     if (!t) {
-      for (const o of e)
-        if (!this.resources.has(o.id))
-          throw this.invalidateTree(), new S(`orphan input resource ${o.id}`);
+      for (const n of e)
+        if (!this.resources.has(n.id))
+          throw this.invalidateTree(), new S(`orphan input resource ${n.id}`);
     }
   }
   /** @deprecated use "entry" instead */
@@ -526,59 +549,59 @@ class V {
     });
   }
 }
-function Q(n, e) {
-  const t = [], r = /* @__PURE__ */ new Set();
-  return n.forEachResource((s) => {
-    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 Q(a, e) {
+  const t = [], i = /* @__PURE__ */ new Set();
+  return a.forEachResource((s) => {
+    s.finalState ? i.add(s.id) : t.push(s.id);
+  }), t.length === 0 && i.size === 0 && t.push(a.root), { seedResources: t, finalResources: i, pruningFunction: e };
 }
-function D() {
+function F() {
   return {
     requests: 0,
-    roundtrips: 0,
+    roundTrips: 0,
     retrievedResources: 0,
     retrievedFields: 0,
     retrievedKeyValues: 0,
     retrievedResourceDataBytes: 0,
     retrievedKeyValueBytes: 0,
-    prunnedFields: 0,
+    prunedFields: 0,
     finalResourcesSkipped: 0,
     millisSpent: 0
   };
 }
-function de(n) {
-  let e = `Requests: ${n.requests}
+function de(a) {
+  let e = `Requests: ${a.requests}
 `;
-  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;
+  return e += `Total time: ${z(a.millisSpent)}
+`, e += `Round-trips: ${a.roundTrips}
+`, e += `Resources: ${a.retrievedResources}
+`, e += `Fields: ${a.retrievedFields}
+`, e += `KV: ${a.retrievedKeyValues}
+`, e += `Data Bytes: ${a.retrievedResourceDataBytes}
+`, e += `KV Bytes: ${a.retrievedKeyValueBytes}
+`, e += `Pruned fields: ${a.prunedFields}
+`, e += `Final resources skipped: ${a.finalResourcesSkipped}`, e;
 }
-async function X(n, e, t) {
-  var h;
-  const r = Date.now();
+async function X(a, e, t) {
+  var c;
+  const i = Date.now();
   t && t.requests++;
-  const { seedResources: s, finalResources: a, pruningFunction: o } = e, i = new H();
-  let l = !0, c = 0;
-  const f = /* @__PURE__ */ new Set(), k = (p) => {
-    if (b(p) || f.has(p)) return;
-    if (a.has(p)) {
+  const { seedResources: s, finalResources: o, pruningFunction: n } = e, r = new H();
+  let f = !0, l = 0;
+  const h = /* @__PURE__ */ new Set(), k = (p) => {
+    if (P(p) || h.has(p)) return;
+    if (o.has(p)) {
       t && t.finalResourcesSkipped++;
       return;
     }
-    f.add(p);
-    const v = n.getResourceDataIfExists(p, !0), w = n.listKeyValuesIfResourceExists(p), U = l;
-    l && (l = !1), i.push(
+    h.add(p);
+    const v = a.getResourceDataIfExists(p, !0), w = a.listKeyValuesIfResourceExists(p), M = f;
+    f && (f = !1), r.push(
       (async () => {
-        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 };
+        const [I, _] = await Promise.all([v, w]);
+        if (M && (l++, f = !0), I !== void 0) {
+          if (_ === void 0) throw new Error("Inconsistent replies");
+          return { ...I, kv: _ };
         }
       })()
     );
@@ -586,82 +609,82 @@ async function X(n, e, t) {
   s.forEach((p) => k(p));
   const u = [];
   for (; ; ) {
-    const p = i.shift();
+    const p = r.shift();
     if (p === void 0)
       break;
     let v = await p;
     if (v !== void 0) {
-      if (o !== void 0) {
-        const w = o(v);
-        t && (t.prunnedFields += v.fields.length - w.length), v = { ...v, fields: w };
+      if (n !== void 0) {
+        const w = n(v);
+        t && (t.prunedFields += v.fields.length - w.length), v = { ...v, fields: w };
       }
       k(v.error);
       for (const w of v.fields)
         k(w.value), k(w.error);
       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;
+        t.retrievedResources++, t.retrievedFields += v.fields.length, t.retrievedKeyValues += v.kv.length, t.retrievedResourceDataBytes += ((c = v.data) == null ? void 0 : c.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;
+  return t && (t.millisSpent += Date.now() - i, t.roundTrips += l), u;
 }
-function ce(n) {
-  return n;
+function ce(a) {
+  return a;
 }
-function he(n, e, t) {
-  var o;
-  const r = n instanceof R ? y(t).accessor(n).node() : n instanceof E ? n.node() : n, a = { ...r.resourceInfo };
-  if (e.data !== void 0 && (e.data === "raw" ? a.data = r.getData() : a.data = e.data.parse(r.getDataAsJson())), e.fields !== void 0) {
-    const i = {};
-    for (const [l, c] of Object.entries(e.fields))
-      i[l] = (o = r.traverse({
-        field: l,
-        errorIfFieldNotSet: c,
-        stableIfNotFound: !c
-      })) == null ? void 0 : o.id;
-    a.fields = i;
+function he(a, e, t) {
+  var n;
+  const i = a instanceof R ? y(t).accessor(a).node() : a instanceof E ? a.node() : a, o = { ...i.resourceInfo };
+  if (e.data !== void 0 && (e.data === "raw" ? o.data = i.getData() : o.data = e.data.parse(i.getDataAsJson())), e.fields !== void 0) {
+    const r = {};
+    for (const [f, l] of Object.entries(e.fields))
+      r[f] = (n = i.traverse({
+        field: f,
+        errorIfFieldNotSet: l,
+        stableIfNotFound: !l
+      })) == null ? void 0 : n.id;
+    o.fields = r;
   }
   if (e.kv !== void 0) {
-    const i = {};
-    for (const [l, c] of Object.entries(e.kv)) {
-      const f = r.getKeyValue(l);
-      if (f === void 0)
-        throw new Error(`Key not found ${l}`);
-      c === "raw" ? i[l] = f : i[l] = c.parse(JSON.parse(Buffer.from(f).toString("utf-8")));
+    const r = {};
+    for (const [f, l] of Object.entries(e.kv)) {
+      const h = i.getKeyValue(f);
+      if (h === void 0)
+        throw new Error(`Key not found ${f}`);
+      l === "raw" ? r[f] = h : r[f] = l.parse(JSON.parse(Buffer.from(h).toString("utf-8")));
     }
-    a.kv = i;
+    o.kv = r;
   }
-  return a;
+  return o;
 }
-function le(n, e, t) {
-  if (n instanceof R) {
-    const r = t.accessor(n).node(), s = r.resourceInfo, a = e.map((o) => {
-      var i, l;
+function le(a, e, t) {
+  if (a instanceof R) {
+    const i = t.accessor(a).node(), s = i.resourceInfo, o = e.map((n) => {
+      var r, f;
       return [
-        o,
-        (l = (i = r.getField(o)) == null ? void 0 : i.value) == null ? void 0 : l.id
+        n,
+        (f = (r = i.getField(n)) == null ? void 0 : r.value) == null ? void 0 : f.id
       ];
     });
     return {
       ...s,
-      fields: new Map(a),
-      data: r.getData() ?? new Uint8Array()
+      fields: new Map(o),
+      data: i.getData() ?? new Uint8Array()
     };
   }
-  return n;
+  return a;
 }
-function fe(n, e, t) {
-  if (!(n instanceof R)) return n;
-  const r = t.accessor(n).node(), s = r.resourceInfo, a = e.map((o) => [o, r.getKeyValue(o)]);
+function fe(a, e, t) {
+  if (!(a instanceof R)) return a;
+  const i = t.accessor(a).node(), s = i.resourceInfo, o = e.map((n) => [n, i.getKeyValue(n)]);
   return {
     ...s,
-    metadata: Object.fromEntries(a)
+    metadata: Object.fromEntries(o)
   };
 }
 class W {
-  constructor(e, t, r, s) {
+  constructor(e, t, i, s) {
     d(this, "finalPredicate");
     d(this, "state");
     d(this, "pollingInterval");
@@ -677,12 +700,12 @@ class W {
     /** If true this tree state is permanently terminaed. */
     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 V(t, a), this.hooks = new M(
+    const { finalPredicateOverride: o, pruning: n, pollingInterval: r, stopPollingDelay: f, logStat: l } = i;
+    this.pruning = n, this.pollingInterval = r, this.finalPredicate = o ?? e.finalPredicate, this.logStat = l, this.state = new V(t, this.finalPredicate), this.hooks = new B(
       () => this.startUpdating(),
       () => this.stopUpdating(),
-      { stopDebounce: l },
-      (f, k) => this.scheduleOnNextState(f, k)
+      { stopDebounce: f },
+      (h, k) => this.scheduleOnNextState(h, k)
     );
   }
   /** @deprecated use "entry" instead */
@@ -714,29 +737,29 @@ class W {
   /** Executed from the main loop, and initialization procedure. */
   async refresh(e) {
     if (this.terminated) throw new Error("tree synchronization is terminated");
-    const t = Q(this.state, this.pruning), r = await this.pl.withReadTx("ReadingTree", async (s) => await X(s, t, e));
-    this.state.updateFromResourceData(r, !0);
+    const t = Q(this.state, this.pruning), i = await this.pl.withReadTx("ReadingTree", async (s) => await X(s, t, e));
+    this.state.updateFromResourceData(i, !0);
   }
   async mainLoop() {
-    var t, r;
-    let e = this.logStat ? D() : void 0;
+    var t, i;
+    let e = this.logStat ? F() : void 0;
     for (; this.keepRunning; ) {
       let s;
       this.scheduledOnNextState.length > 0 && (s = this.scheduledOnNextState, this.scheduledOnNextState = []);
       try {
-        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 S) {
-          (t = this.logger) == null || t.error(a), this.state.invalidateTree("stat update error"), this.state = new V(this.root, this.finalPredicate);
+        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 n of s) n.reject(o);
+        if (o instanceof S) {
+          (t = this.logger) == null || t.error(o), this.state.invalidateTree("stat update error"), this.state = new V(this.root, this.finalPredicate);
           continue;
-        } else (r = this.logger) == null || r.warn(a);
+        } else (i = this.logger) == null || i.warn(o);
       }
       if (!this.keepRunning || this.terminated) break;
       try {
         await j.setTimeout(this.pollingInterval, this.abortController.signal);
-      } catch (a) {
-        if (!B(a)) throw new Error("Unexpected error", { cause: a });
+      } catch (o) {
+        if (!q(o)) throw new Error("Unexpected error", { cause: o });
         break;
       }
     }
@@ -753,10 +776,10 @@ class W {
   async awaitSyncLoopTermination() {
     this.currentLoop !== void 0 && await this.currentLoop;
   }
-  static async init(e, t, r, s) {
-    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;
+  static async init(e, t, i, s) {
+    const o = new W(e, t, i, s);
+    let n = i.logStat ? F() : void 0;
+    return await o.refresh(n), n && s && s.info(`Tree stat (initial load): ${JSON.stringify(n)}`), o;
   }
 }
 export {
@@ -770,13 +793,13 @@ export {
   S as TreeStateUpdateError,
   Q as constructTreeLoadingRequest,
   de as formatTreeLoadingStat,
-  D as initialTreeLoadingStat,
-  ne as isPlTreeEntry,
-  oe as isPlTreeEntryAccessor,
-  ae as isPlTreeNodeAccessor,
+  F as initialTreeLoadingStat,
+  ae as isPlTreeEntry,
+  ne as isPlTreeEntryAccessor,
+  oe as isPlTreeNodeAccessor,
   X as loadTreeState,
   he as makeResourceSnapshot,
-  P as mapValueAndError,
+  b as mapValueAndError,
   se as mapValueAndErrorIfDefined,
   ce as rsSchema,
   ue as treeEntryToResourceInfo,