@fluidframework/tree 2.102.0 → 2.110.0

package/dist/simple-tree/core/treeNodeKernel.js

@@ -3,20 +3,10 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _TreeNodeKernel_hydrationState, _TreeNodeKernel_eventBuffer, _KernelEventBuffer_instances, _KernelEventBuffer_disposed, _KernelEventBuffer_disposeOnFlushListener, _KernelEventBuffer_events, _KernelEventBuffer_eventSource, _KernelEventBuffer_disposeSourceListeners, _KernelEventBuffer_childrenChangedBuffer, _KernelEventBuffer_fieldMarksBuffer, _KernelEventBuffer_invalidatedFieldMarkKeys, _KernelEventBuffer_subTreeChangedBuffer, _KernelEventBuffer_emit, _KernelEventBuffer_handleChildrenChangedAfterBatch, _KernelEventBuffer_handleSubtreeChangedAfterBatch, _KernelEventBuffer_assertNotDisposed;
+var _TreeNodeKernel_hydrationState, _TreeNodeKernel_eventBuffer, _KernelEventBuffer_instances, _KernelEventBuffer_disposed, _KernelEventBuffer_events, _KernelEventBuffer_eventSource, _KernelEventBuffer_disposeSourceListeners, _KernelEventBuffer_childrenChangedBuffer, _KernelEventBuffer_fieldMarksBuffer, _KernelEventBuffer_invalidatedFieldMarkKeys, _KernelEventBuffer_subTreeChangedBuffer, _KernelEventBuffer_emit, _KernelEventBuffer_handleChildrenChangedAfterBatch, _KernelEventBuffer_handleSubtreeChangedAfterBatch, _KernelEventBuffer_assertNotDisposed;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimpleContextSlot = exports.createTreeNodeFromInner = exports.treeNodeFromAnchor = exports.getInnerNode = exports.getSimpleContextFromInnerNode = exports.getSimpleNodeSchemaFromInnerNode = exports.tryDisposeTreeNode = exports.simpleTreeNodeSlot = exports.splitInnerNodeType = exports.withBufferedTreeEvents = exports.TreeNodeKernel = exports.tryGetTreeNodeSchema = exports.isTreeNode = exports.getKernel = void 0;
+exports.SimpleContextSlot = exports.createTreeNodeFromInner = exports.treeNodeFromAnchor = exports.getInnerNode = exports.getSimpleContextFromInnerNode = exports.getSimpleNodeSchemaFromInnerNode = exports.tryDisposeTreeNode = exports.simpleTreeNodeSlot = exports.splitInnerNodeType = exports.TEST_activeBufferCount = exports.withBufferedTreeEvents = exports.TreeNodeKernel = exports.tryGetTreeNodeSchema = exports.isTreeNode = exports.getKernel = void 0;
+const tslib_1 = require("tslib");
 const client_utils_1 = require("@fluid-internal/client-utils");
 const internal_1 = require("@fluidframework/core-utils/internal");
 const internal_2 = require("@fluidframework/telemetry-utils/internal");
@@ -114,19 +104,19 @@ class TreeNodeKernel {
             // Unhydrated case
             (0, internal_1.debugAssert)(() => innerNode.treeNode === undefined);
             innerNode.treeNode = node;
-            __classPrivateFieldSet(this, _TreeNodeKernel_hydrationState, {
+            tslib_1.__classPrivateFieldSet(this, _TreeNodeKernel_hydrationState, {
                 innerNode,
             }, "f");
         }
         else {
             // Hydrated case
-            __classPrivateFieldSet(this, _TreeNodeKernel_hydrationState, this.createHydratedState(innerNode), "f");
+            tslib_1.__classPrivateFieldSet(this, _TreeNodeKernel_hydrationState, this.createHydratedState(innerNode), "f");
         }
     }
     get context() {
-        if (isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
+        if (isHydrated(tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
             // This can't be cached on this.#hydrated during hydration since initial tree is hydrated before the context is cached on the anchorSet.
-            return (__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.anchorNode.anchorSet.slots.get(exports.SimpleContextSlot) ??
+            return (tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.anchorNode.anchorSet.slots.get(exports.SimpleContextSlot) ??
                 (0, internal_1.fail)(0xb40 /* missing simple-tree context */));
         }
         return this.initialContext;
@@ -140,12 +130,12 @@ class TreeNodeKernel {
      */
     hydrate(inner) {
         (0, internal_1.assert)(!this.disposed, 0xa2a /* cannot hydrate a disposed node */);
-        (0, internal_1.assert)(!isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f")), 0xa2b /* hydration should only happen once */);
-        __classPrivateFieldSet(this, _TreeNodeKernel_hydrationState, this.createHydratedState(inner), "f");
+        (0, internal_1.assert)(!isHydrated(tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f")), 0xa2b /* hydration should only happen once */);
+        tslib_1.__classPrivateFieldSet(this, _TreeNodeKernel_hydrationState, this.createHydratedState(inner), "f");
         // Lazily migrate existing event listeners to the anchor node.
         // If no one ever subscribed to this kernel's events, the buffer was never allocated
         // and there is nothing to migrate.
-        __classPrivateFieldGet(this, _TreeNodeKernel_eventBuffer, "f")?.migrateEventSource(inner.anchorNode.events);
+        tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_eventBuffer, "f")?.migrateEventSource(inner.anchorNode.events);
     }
     createHydratedState(innerNode) {
         (0, internal_1.assert)(!innerNode.anchorNode.slots.has(exports.simpleTreeNodeSlot), 0x7f5 /* Cannot associate an flex node with multiple simple-tree nodes */);
@@ -165,47 +155,47 @@ class TreeNodeKernel {
         if (this.disposed) {
             return index_js_3.TreeStatus.Deleted;
         }
-        if (!isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
+        if (!isHydrated(tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
             return index_js_3.TreeStatus.New;
         }
         // TODO: Replace this check with the proper check against the cursor state when the cursor becomes part of the kernel
-        const flex = __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.anchorNode.slots.get(index_js_3.flexTreeSlot);
+        const flex = tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.anchorNode.slots.get(index_js_3.flexTreeSlot);
         if (flex !== undefined) {
             (0, internal_1.assert)(flex instanceof index_js_3.LazyEntity, 0x9b4 /* Unexpected flex node implementation */);
             if (flex.isFreed()) {
                 return index_js_3.TreeStatus.Deleted;
             }
         }
-        return (0, index_js_3.treeStatusFromAnchorCache)(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.anchorNode);
+        return (0, index_js_3.treeStatusFromAnchorCache)(tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.anchorNode);
     }
     get events() {
         (0, internal_1.assert)(!this.disposed, 0xcfa /* Cannot register events on a disposed node */);
         // Allocate the buffer on first access. See {@link TreeNodeKernel.#eventBuffer} for rationale.
-        if (__classPrivateFieldGet(this, _TreeNodeKernel_eventBuffer, "f") === undefined) {
-            const eventSource = isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))
-                ? __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.anchorNode.events
-                : __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.events;
-            __classPrivateFieldSet(this, _TreeNodeKernel_eventBuffer, new KernelEventBuffer(eventSource), "f");
+        if (tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_eventBuffer, "f") === undefined) {
+            const eventSource = isHydrated(tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))
+                ? tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.anchorNode.events
+                : tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.events;
+            tslib_1.__classPrivateFieldSet(this, _TreeNodeKernel_eventBuffer, new KernelEventBuffer(eventSource), "f");
         }
-        return __classPrivateFieldGet(this, _TreeNodeKernel_eventBuffer, "f");
+        return tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_eventBuffer, "f");
     }
     dispose() {
         (0, internal_1.debugAssert)(() => !this.disposed || "Cannot dispose a disposed node");
         this.disposed = true;
-        if (isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
-            for (const off of __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").offAnchorNode) {
+        if (isHydrated(tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
+            for (const off of tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").offAnchorNode) {
                 off();
             }
         }
-        __classPrivateFieldGet(this, _TreeNodeKernel_eventBuffer, "f")?.dispose();
+        tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_eventBuffer, "f")?.dispose();
         // TODO: go to the context and remove myself from withAnchors
     }
     isHydrated() {
-        return isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"));
+        return isHydrated(tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"));
     }
     get anchorNode() {
-        return isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))
-            ? __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.anchorNode
+        return isHydrated(tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))
+            ? tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode.anchorNode
             : undefined;
     }
     /**
@@ -218,24 +208,24 @@ class TreeNodeKernel {
      * @throws A {@link @fluidframework/telemetry-utils#UsageError} if the node has been deleted.
      */
     getInnerNode() {
-        if (!isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
-            (0, internal_1.debugAssert)(() => __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode?.context.isDisposed() === false ||
+        if (!isHydrated(tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
+            (0, internal_1.debugAssert)(() => tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode?.context.isDisposed() === false ||
                 "Unhydrated node should never be disposed");
-            return __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode; // Unhydrated case
+            return tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode; // Unhydrated case
         }
         if (this.disposed) {
             throw new internal_2.UsageError("Cannot access a deleted node.");
         }
-        return __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode;
+        return tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode;
     }
     /**
      * Retrieves the {@link UnhydratedFlexTreeNode} if unhydrated. otherwise undefined.
      */
     getInnerNodeIfUnhydrated() {
-        if (isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
+        if (isHydrated(tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
             return undefined;
         }
-        return __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode;
+        return tslib_1.__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").innerNode;
     }
 }
 exports.TreeNodeKernel = TreeNodeKernel;
@@ -264,23 +254,48 @@ function withBufferedTreeEvents(callback) {
     }
     else {
         bufferTreeEvents = true;
+        const toFlush = [];
         try {
             callback();
         }
         finally {
             bufferTreeEvents = false;
-            flushEventsEmitter.emit("flush");
+            // Snapshot-and-clear before flushing to safely handle reentrant `withBufferedTreeEvents`
+            // calls made by listeners that fire during `buffer.flush()` below:
+            // - Iterating an array means a reentrant call's `clear()` cannot truncate our loop
+            //   and cause buffers later in `activeBuffers` to be skipped (and their events dropped).
+            // - Clearing up front means the reentrant call starts from an empty set, so its own
+            //   finally block only flushes what it buffered - not a re-flush of our remaining buffers.
+            toFlush.push(...activeBuffers);
+            activeBuffers.clear();
+        }
+        // Don't flush/emit events in the case of an error
+        for (const buffer of toFlush) {
+            buffer.flush();
         }
     }
 }
 exports.withBufferedTreeEvents = withBufferedTreeEvents;
 /**
- * Event emitter to notify subscribers when tree events buffered due to {@link withBufferedTreeEvents} should be flushed.
+ * Set of {@link KernelEventBuffer}s that have accumulated buffered events during the current
+ * {@link withBufferedTreeEvents} window and therefore need to be flushed when it ends.
+ *
+ * @remarks
+ * The set should be empty whenever no buffering window is in progress.
+ */
+const activeBuffers = new Set();
+/**
+ * Test-only accessor for the current size of {@link activeBuffers}.
+ * @remarks Only exported for testing purposes. Not intended for any other use.
  */
-const flushEventsEmitter = (0, client_utils_1.createEmitter)();
+function TEST_activeBufferCount() {
+    return activeBuffers.size;
+}
+exports.TEST_activeBufferCount = TEST_activeBufferCount;
 /**
  * Event emitter for {@link TreeNodeKernel}, which optionally buffers events based on {@link bufferTreeEvents}.
- * @remarks Listens to {@link flushEventsEmitter} to know when to flush any buffered events.
+ * @remarks When buffering is active, this adds itself to {@link activeBuffers} so that
+ * {@link withBufferedTreeEvents} can flush it at the end of the buffering window.
  */
 class KernelEventBuffer {
     constructor(
@@ -292,10 +307,6 @@ class KernelEventBuffer {
     eventSource) {
         _KernelEventBuffer_instances.add(this);
         _KernelEventBuffer_disposed.set(this, false);
-        /**
-         * Listen to {@link flushEventsEmitter} to know when to flush buffered events.
-         */
-        _KernelEventBuffer_disposeOnFlushListener.set(this, flushEventsEmitter.on("flush", this.flush.bind(this)));
         _KernelEventBuffer_events.set(this, (0, client_utils_1.createEmitter)());
         _KernelEventBuffer_eventSource.set(this, void 0);
         _KernelEventBuffer_disposeSourceListeners.set(this, new Map());
@@ -323,7 +334,7 @@ class KernelEventBuffer {
          * if the subtree has changed.
          */
         _KernelEventBuffer_subTreeChangedBuffer.set(this, false);
-        __classPrivateFieldSet(this, _KernelEventBuffer_eventSource, eventSource, "f");
+        tslib_1.__classPrivateFieldSet(this, _KernelEventBuffer_eventSource, eventSource, "f");
     }
     /**
      * Migrate this event buffer to a new event source.
@@ -334,91 +345,92 @@ class KernelEventBuffer {
      */
     migrateEventSource(newSource) {
         // Unsubscribe from the old source
-        for (const off of __classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").values()) {
+        for (const off of tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").values()) {
             off();
         }
-        __classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").clear();
-        __classPrivateFieldSet(this, _KernelEventBuffer_eventSource, newSource, "f");
-        if (__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").hasListeners("childrenChangedAfterBatch")) {
-            const off = __classPrivateFieldGet(this, _KernelEventBuffer_eventSource, "f").on("childrenChangedAfterBatch", ({ changedFields, fieldMarks }) => __classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_emit).call(this, "childrenChangedAfterBatch", { changedFields, fieldMarks }));
-            __classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").set("childrenChangedAfterBatch", off);
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").clear();
+        tslib_1.__classPrivateFieldSet(this, _KernelEventBuffer_eventSource, newSource, "f");
+        if (tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").hasListeners("childrenChangedAfterBatch")) {
+            const off = tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_eventSource, "f").on("childrenChangedAfterBatch", ({ changedFields, fieldMarks }) => tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_emit).call(this, "childrenChangedAfterBatch", { changedFields, fieldMarks }));
+            tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").set("childrenChangedAfterBatch", off);
         }
-        if (__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").hasListeners("subtreeChangedAfterBatch")) {
-            const off = __classPrivateFieldGet(this, _KernelEventBuffer_eventSource, "f").on("subtreeChangedAfterBatch", () => __classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_emit).call(this, "subtreeChangedAfterBatch"));
-            __classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").set("subtreeChangedAfterBatch", off);
+        if (tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").hasListeners("subtreeChangedAfterBatch")) {
+            const off = tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_eventSource, "f").on("subtreeChangedAfterBatch", () => tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_emit).call(this, "subtreeChangedAfterBatch"));
+            tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").set("subtreeChangedAfterBatch", off);
         }
     }
     on(eventName, listener) {
-        __classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_assertNotDisposed).call(this);
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_assertNotDisposed).call(this);
         // Lazily bind event listeners to the source.
         // If we do not have any existing listeners for this event, then we need to bind to the source.
-        if (!__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").hasListeners(eventName)) {
-            (0, internal_1.assert)(!__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").has(eventName), 0xc4f /* Should not have a dispose function without listeners */);
+        if (!tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").hasListeners(eventName)) {
+            (0, internal_1.assert)(!tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").has(eventName), 0xc4f /* Should not have a dispose function without listeners */);
             const off = eventName === "childrenChangedAfterBatch"
-                ? __classPrivateFieldGet(this, _KernelEventBuffer_eventSource, "f").on(eventName, (args) => __classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_emit).call(this, eventName, args))
-                : __classPrivateFieldGet(this, _KernelEventBuffer_eventSource, "f").on(eventName, () => __classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_emit).call(this, eventName));
-            __classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").set(eventName, off);
+                ? tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_eventSource, "f").on(eventName, (args) => tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_emit).call(this, eventName, args))
+                : tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_eventSource, "f").on(eventName, () => tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_emit).call(this, eventName));
+            tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").set(eventName, off);
         }
-        __classPrivateFieldGet(this, _KernelEventBuffer_events, "f").on(eventName, listener);
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").on(eventName, listener);
         // Return a bound method instead of an arrow closure. A bound function captures
         // (target, thisArg, ...boundArgs) in a fixed shape that V8 can optimize more
         // uniformly than a closure that captures its lexical context.
         return this.off.bind(this, eventName, listener);
     }
     off(eventName, listener) {
-        __classPrivateFieldGet(this, _KernelEventBuffer_events, "f").off(eventName, listener);
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").off(eventName, listener);
         // If there are no remaining listeners for the event, unbind from the source
-        if (!__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").hasListeners(eventName)) {
-            const off = __classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").get(eventName);
+        if (!tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").hasListeners(eventName)) {
+            const off = tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").get(eventName);
             off?.();
-            __classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").delete(eventName);
+            tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").delete(eventName);
         }
     }
     /**
      * Flushes any events buffered due to {@link withBufferedTreeEvents}.
      */
     flush() {
-        __classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_assertNotDisposed).call(this);
-        if (__classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f").size > 0) {
-            __classPrivateFieldGet(this, _KernelEventBuffer_events, "f").emit("childrenChangedAfterBatch", {
-                changedFields: __classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f"),
-                fieldMarks: __classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f"),
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_assertNotDisposed).call(this);
+        if (tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f").size > 0) {
+            tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").emit("childrenChangedAfterBatch", {
+                changedFields: tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f"),
+                fieldMarks: tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f"),
             });
-            __classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f").clear();
-            __classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f").clear();
-            __classPrivateFieldGet(this, _KernelEventBuffer_invalidatedFieldMarkKeys, "f").clear();
+            tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f").clear();
+            tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f").clear();
+            tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_invalidatedFieldMarkKeys, "f").clear();
         }
-        if (__classPrivateFieldGet(this, _KernelEventBuffer_subTreeChangedBuffer, "f")) {
-            __classPrivateFieldGet(this, _KernelEventBuffer_events, "f").emit("subtreeChangedAfterBatch");
-            __classPrivateFieldSet(this, _KernelEventBuffer_subTreeChangedBuffer, false, "f");
+        if (tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_subTreeChangedBuffer, "f")) {
+            tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").emit("subtreeChangedAfterBatch");
+            tslib_1.__classPrivateFieldSet(this, _KernelEventBuffer_subTreeChangedBuffer, false, "f");
         }
     }
     dispose() {
-        if (__classPrivateFieldGet(this, _KernelEventBuffer_disposed, "f")) {
+        if (tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposed, "f")) {
             return;
         }
-        (0, internal_1.assert)(__classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f").size === 0 && !__classPrivateFieldGet(this, _KernelEventBuffer_subTreeChangedBuffer, "f"), 0xc52 /* Buffered kernel events should have been flushed before disposing. */);
-        __classPrivateFieldGet(this, _KernelEventBuffer_disposeOnFlushListener, "f").call(this);
-        for (const off of __classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").values()) {
+        (0, internal_1.debugAssert)(() => (tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f").size === 0 && !tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_subTreeChangedBuffer, "f")) ||
+            "Buffered kernel events should have been flushed before disposing.");
+        (0, internal_1.debugAssert)(() => !activeBuffers.has(this) || "Disposed buffer should not be in activeBuffers.");
+        for (const off of tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").values()) {
             off();
         }
-        __classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").clear();
-        __classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f").clear();
-        __classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f").clear();
-        __classPrivateFieldGet(this, _KernelEventBuffer_invalidatedFieldMarkKeys, "f").clear();
-        __classPrivateFieldSet(this, _KernelEventBuffer_subTreeChangedBuffer, false, "f");
-        __classPrivateFieldSet(this, _KernelEventBuffer_disposed, true, "f");
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposeSourceListeners, "f").clear();
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f").clear();
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f").clear();
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_invalidatedFieldMarkKeys, "f").clear();
+        tslib_1.__classPrivateFieldSet(this, _KernelEventBuffer_subTreeChangedBuffer, false, "f");
+        tslib_1.__classPrivateFieldSet(this, _KernelEventBuffer_disposed, true, "f");
     }
 }
-_KernelEventBuffer_disposed = new WeakMap(), _KernelEventBuffer_disposeOnFlushListener = new WeakMap(), _KernelEventBuffer_events = new WeakMap(), _KernelEventBuffer_eventSource = new WeakMap(), _KernelEventBuffer_disposeSourceListeners = new WeakMap(), _KernelEventBuffer_childrenChangedBuffer = new WeakMap(), _KernelEventBuffer_fieldMarksBuffer = new WeakMap(), _KernelEventBuffer_invalidatedFieldMarkKeys = new WeakMap(), _KernelEventBuffer_subTreeChangedBuffer = new WeakMap(), _KernelEventBuffer_instances = new WeakSet(), _KernelEventBuffer_emit = function _KernelEventBuffer_emit(eventName, arg) {
-    __classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_assertNotDisposed).call(this);
+_KernelEventBuffer_disposed = new WeakMap(), _KernelEventBuffer_events = new WeakMap(), _KernelEventBuffer_eventSource = new WeakMap(), _KernelEventBuffer_disposeSourceListeners = new WeakMap(), _KernelEventBuffer_childrenChangedBuffer = new WeakMap(), _KernelEventBuffer_fieldMarksBuffer = new WeakMap(), _KernelEventBuffer_invalidatedFieldMarkKeys = new WeakMap(), _KernelEventBuffer_subTreeChangedBuffer = new WeakMap(), _KernelEventBuffer_instances = new WeakSet(), _KernelEventBuffer_emit = function _KernelEventBuffer_emit(eventName, arg) {
+    tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_assertNotDisposed).call(this);
     switch (eventName) {
         case "childrenChangedAfterBatch": {
             (0, internal_1.assert)(arg !== undefined, 0xcea /* childrenChangedAfterBatch requires arg */);
-            return __classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_handleChildrenChangedAfterBatch).call(this, arg.changedFields, arg.fieldMarks);
+            return tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_handleChildrenChangedAfterBatch).call(this, arg.changedFields, arg.fieldMarks);
         }
         case "subtreeChangedAfterBatch": {
-            return __classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_handleSubtreeChangedAfterBatch).call(this);
+            return tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_instances, "m", _KernelEventBuffer_handleSubtreeChangedAfterBatch).call(this);
         }
         default: {
             (0, internal_1.unreachableCase)(eventName);
@@ -426,40 +438,42 @@ _KernelEventBuffer_disposed = new WeakMap(), _KernelEventBuffer_disposeOnFlushLi
     }
 }, _KernelEventBuffer_handleChildrenChangedAfterBatch = function _KernelEventBuffer_handleChildrenChangedAfterBatch(changedFields, fieldMarks) {
     if (bufferTreeEvents) {
+        activeBuffers.add(this);
         for (const fieldKey of changedFields) {
-            __classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f").add(fieldKey);
+            tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_childrenChangedBuffer, "f").add(fieldKey);
         }
         for (const [key, marks] of fieldMarks) {
-            if (__classPrivateFieldGet(this, _KernelEventBuffer_invalidatedFieldMarkKeys, "f").has(key)) {
+            if (tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_invalidatedFieldMarkKeys, "f").has(key)) {
                 // Already permanently invalidated by an earlier collision; ignore this batch too.
                 // TODO: Once the eventing stack is rewritten to walk the composed delta at flush
                 // time, this collision path will be unreachable and can be removed entirely.
                 continue;
             }
-            if (__classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f").has(key)) {
+            if (tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f").has(key)) {
                 // A second batch of marks arrived for the same field before the buffer was flushed.
                 // We have no delta composition logic, so permanently invalidate this field so that
                 // any further batches are also discarded rather than incorrectly surfaced.
-                __classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f").delete(key);
-                __classPrivateFieldGet(this, _KernelEventBuffer_invalidatedFieldMarkKeys, "f").add(key);
+                tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f").delete(key);
+                tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_invalidatedFieldMarkKeys, "f").add(key);
             }
             else {
-                __classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f").set(key, marks);
+                tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_fieldMarksBuffer, "f").set(key, marks);
             }
         }
     }
     else {
-        __classPrivateFieldGet(this, _KernelEventBuffer_events, "f").emit("childrenChangedAfterBatch", { changedFields, fieldMarks });
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").emit("childrenChangedAfterBatch", { changedFields, fieldMarks });
     }
 }, _KernelEventBuffer_handleSubtreeChangedAfterBatch = function _KernelEventBuffer_handleSubtreeChangedAfterBatch() {
     if (bufferTreeEvents) {
-        __classPrivateFieldSet(this, _KernelEventBuffer_subTreeChangedBuffer, true, "f");
+        activeBuffers.add(this);
+        tslib_1.__classPrivateFieldSet(this, _KernelEventBuffer_subTreeChangedBuffer, true, "f");
     }
     else {
-        __classPrivateFieldGet(this, _KernelEventBuffer_events, "f").emit("subtreeChangedAfterBatch");
+        tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_events, "f").emit("subtreeChangedAfterBatch");
     }
 }, _KernelEventBuffer_assertNotDisposed = function _KernelEventBuffer_assertNotDisposed() {
-    (0, internal_1.assert)(!__classPrivateFieldGet(this, _KernelEventBuffer_disposed, "f"), 0xc51 /* Event handler disposed. */);
+    (0, internal_1.assert)(!tslib_1.__classPrivateFieldGet(this, _KernelEventBuffer_disposed, "f"), 0xc51 /* Event handler disposed. */);
 };
 /**
  * Narrows innerNode to either {@link UnhydratedFlexTreeNode} or {@link HydratedFlexTreeNode}.