@fluidframework/tree 2.0.0-dev-rc.5.0.0.271045 → 2.0.0-dev-rc.5.0.0.271717

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/tree",
-  "version": "2.0.0-dev-rc.5.0.0.271045",
+  "version": "2.0.0-dev-rc.5.0.0.271717",
   "description": "Distributed tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -67,17 +67,17 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/container-runtime": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/core-interfaces": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/core-utils": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/datastore-definitions": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/driver-definitions": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/id-compressor": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/runtime-utils": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/shared-object-base": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.5.0.0.271045",
+    "@fluid-internal/client-utils": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/container-runtime": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/core-interfaces": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/core-utils": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/datastore-definitions": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/driver-definitions": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/id-compressor": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/runtime-utils": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/shared-object-base": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.5.0.0.271717",
     "@sinclair/typebox": "^0.32.29",
     "@tylerbu/sorted-btree-es6": "^1.8.0",
     "@ungap/structured-clone": "^1.2.0",
@@ -86,19 +86,19 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.2",
     "@biomejs/biome": "^1.7.3",
-    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluid-private/stochastic-test-utils": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluid-private/test-dds-utils": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluid-private/test-drivers": "2.0.0-dev-rc.5.0.0.271045",
+    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluid-private/stochastic-test-utils": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluid-private/test-dds-utils": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluid-private/test-drivers": "2.0.0-dev-rc.5.0.0.271717",
     "@fluid-tools/benchmark": "^0.48.0",
     "@fluid-tools/build-cli": "^0.39.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.39.0",
-    "@fluidframework/container-definitions": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/container-loader": "2.0.0-dev-rc.5.0.0.271045",
+    "@fluidframework/container-definitions": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/container-loader": "2.0.0-dev-rc.5.0.0.271717",
     "@fluidframework/eslint-config-fluid": "^5.3.0",
-    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.5.0.0.271045",
-    "@fluidframework/test-utils": "2.0.0-dev-rc.5.0.0.271045",
+    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.5.0.0.271717",
+    "@fluidframework/test-utils": "2.0.0-dev-rc.5.0.0.271717",
     "@microsoft/api-extractor": "^7.45.1",
     "@types/diff": "^3.5.1",
     "@types/easy-table": "^0.0.32",

package/src/codec/codec.ts

@@ -7,8 +7,8 @@ import { IsoBuffer, bufferToString } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils/internal";
 import type { Static, TAnySchema, TSchema } from "@sinclair/typebox";
 
-import { ChangeEncodingContext } from "../core/index.js";
-import { JsonCompatibleReadOnly, fail } from "../util/index.js";
+import type { ChangeEncodingContext } from "../core/index.js";
+import { type JsonCompatibleReadOnly, fail } from "../util/index.js";
 
 /**
  * Translates decoded data to encoded data.

package/src/codec/discriminatedUnions.ts

@@ -4,9 +4,9 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
-import { ObjectOptions } from "@sinclair/typebox";
+import type { ObjectOptions } from "@sinclair/typebox";
 
-import { InternalUtilTypes, fail, objectToMap } from "../util/index.js";
+import { type InternalUtilTypes, fail, objectToMap } from "../util/index.js";
 
 /**
  * This module contains utilities for an encoding of a discriminated union that is efficient to validate using

package/src/codec/noopValidator.ts

@@ -5,7 +5,7 @@
 
 import type { Static, TSchema } from "@sinclair/typebox";
 
-import { JsonValidator } from "./codec.js";
+import type { JsonValidator } from "./codec.js";
 
 /**
  * A {@link JsonValidator} implementation which performs no validation and accepts all data as valid.

package/src/codec/versioned/codec.ts

@@ -4,13 +4,13 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
-import { TSchema } from "@sinclair/typebox";
+import type { TSchema } from "@sinclair/typebox";
 
-import { JsonCompatibleReadOnly } from "../../util/index.js";
+import type { JsonCompatibleReadOnly } from "../../util/index.js";
 import {
 	type ICodecFamily,
-	ICodecOptions,
-	IJsonCodec,
+	type ICodecOptions,
+	type IJsonCodec,
 	withSchemaValidation,
 	type FormatVersion,
 } from "../codec.js";

package/src/codec/versioned/format.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { Static, Type } from "@sinclair/typebox";
+import { type Static, Type } from "@sinclair/typebox";
 
 export const Versioned = Type.Object({
 	version: Type.Number(),

package/src/core/change-family/changeFamily.ts

@@ -3,12 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
+import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 
-import { ICodecFamily, IJsonCodec } from "../../codec/index.js";
-import { SchemaAndPolicy } from "../../core/index.js";
-import { JsonCompatibleReadOnly } from "../../util/index.js";
-import { ChangeRebaser, RevisionTag } from "../rebase/index.js";
+import type { ICodecFamily, IJsonCodec } from "../../codec/index.js";
+import type { SchemaAndPolicy } from "../../core/index.js";
+import type { JsonCompatibleReadOnly } from "../../util/index.js";
+import type { ChangeRebaser, RevisionTag } from "../rebase/index.js";
 
 export interface ChangeFamily<TEditor extends ChangeFamilyEditor, TChange> {
 	buildEditor(changeReceiver: (change: TChange) => void): TEditor;

package/src/core/change-family/editBuilder.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ChangeFamily, ChangeFamilyEditor } from "./changeFamily.js";
+import type { ChangeFamily, ChangeFamilyEditor } from "./changeFamily.js";
 
 export abstract class EditBuilder<TChange> implements ChangeFamilyEditor {
 	public constructor(

package/src/core/forest/editableForest.ts

@@ -5,21 +5,21 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { RevisionTagCodec } from "../rebase/index.js";
-import { FieldKey } from "../schema-stored/index.js";
+import type { RevisionTagCodec } from "../rebase/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 import {
-	Anchor,
-	DeltaRoot,
-	DeltaVisitor,
-	DetachedField,
-	ITreeCursorSynchronous,
+	type Anchor,
+	type DeltaRoot,
+	type DeltaVisitor,
+	type DetachedField,
+	type ITreeCursorSynchronous,
 	applyDelta,
 	deltaForRootInitialization,
 	makeDetachedFieldIndex,
 } from "../tree/index.js";
 
-import { IForestSubscription, ITreeSubscriptionCursor } from "./forest.js";
-import { IIdCompressor } from "@fluidframework/id-compressor";
+import type { IForestSubscription, ITreeSubscriptionCursor } from "./forest.js";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 /**
  * Editing APIs.

package/src/core/forest/forest.ts

@@ -5,15 +5,15 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { Listenable } from "../../events/index.js";
-import { FieldKey, TreeStoredSchemaSubscription } from "../schema-stored/index.js";
+import type { Listenable } from "../../events/index.js";
+import type { FieldKey, TreeStoredSchemaSubscription } from "../schema-stored/index.js";
 import {
-	Anchor,
-	AnchorSet,
-	DetachedField,
-	ITreeCursor,
-	ITreeCursorSynchronous,
-	UpPath,
+	type Anchor,
+	type AnchorSet,
+	type DetachedField,
+	type ITreeCursor,
+	type ITreeCursorSynchronous,
+	type UpPath,
 	detachedFieldAsKey,
 	rootField,
 } from "../tree/index.js";

package/src/core/rebase/changeRebaser.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { Invariant } from "../../util/index.js";
+import type { Invariant } from "../../util/index.js";
 
 import type { RevisionTag } from "./types.js";
 

package/src/core/rebase/revisionTagCodec.ts

@@ -4,12 +4,12 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
-import { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
+import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 
-import { IJsonCodec } from "../../codec/index.js";
-import { ChangeEncodingContext } from "../change-family/index.js";
+import type { IJsonCodec } from "../../codec/index.js";
+import type { ChangeEncodingContext } from "../change-family/index.js";
 
-import { EncodedRevisionTag, RevisionTag } from "./types.js";
+import type { EncodedRevisionTag, RevisionTag } from "./types.js";
 
 export class RevisionTagCodec
 	implements

package/src/core/rebase/types.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import {
+import type {
 	OpSpaceCompressedId,
 	SessionId,
 	SessionSpaceCompressedId,
@@ -11,14 +11,14 @@ import {
 import { Type } from "@sinclair/typebox";
 
 import {
-	Brand,
-	NestedMap,
-	RangeMap,
+	type Brand,
+	type NestedMap,
+	type RangeMap,
 	brand,
 	brandedNumberType,
 	brandedStringType,
 } from "../../util/index.js";
-import { TaggedChange } from "./changeRebaser.js";
+import type { TaggedChange } from "./changeRebaser.js";
 
 /**
  * The identifier for a particular session/user/client that can generate `GraphCommit`s

package/src/core/rebase/utils.ts

@@ -5,19 +5,19 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { Mutable } from "../../util/index.js";
+import type { Mutable } from "../../util/index.js";
 
 import {
-	ChangeRebaser,
-	RevisionInfo,
-	RevisionMetadataSource,
-	TaggedChange,
+	type ChangeRebaser,
+	type RevisionInfo,
+	type RevisionMetadataSource,
+	type TaggedChange,
 	makeAnonChange,
 	mapTaggedChange,
 	tagChange,
 	tagRollbackInverse,
 } from "./changeRebaser.js";
-import { GraphCommit, RevisionTag, mintCommit } from "./types.js";
+import { type GraphCommit, type RevisionTag, mintCommit } from "./types.js";
 
 /**
  * Contains information about how the commit graph changed as the result of rebasing a source branch onto another target branch.

package/src/core/schema-stored/format.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { ObjectOptions, Static, Type } from "@sinclair/typebox";
+import { type ObjectOptions, type Static, Type } from "@sinclair/typebox";
 
 import { unionOptions } from "../../codec/index.js";
-import { Brand, brandedStringType } from "../../util/index.js";
+import { type Brand, brandedStringType } from "../../util/index.js";
 
 export const version = 1 as const;
 

package/src/core/schema-stored/schema.ts

@@ -5,16 +5,16 @@
 
 import type { ErasedType } from "@fluidframework/core-interfaces";
 import { DiscriminatedUnionDispatcher } from "../../codec/index.js";
-import { MakeNominal, brand, fail, invertMap } from "../../util/index.js";
+import { type MakeNominal, brand, fail, invertMap } from "../../util/index.js";
 import {
-	FieldKey,
-	FieldKindIdentifier,
-	FieldSchemaFormat,
+	type FieldKey,
+	type FieldKindIdentifier,
+	type FieldSchemaFormat,
 	PersistedValueSchema,
-	TreeNodeSchemaDataFormat,
-	TreeNodeSchemaIdentifier,
+	type TreeNodeSchemaDataFormat,
+	type TreeNodeSchemaIdentifier,
 } from "./format.js";
-import { Multiplicity } from "./multiplicity.js";
+import type { Multiplicity } from "./multiplicity.js";
 
 /**
  * Schema for what {@link TreeValue} is allowed on a Leaf node.

package/src/core/schema-stored/storedSchemaRepository.ts

@@ -5,15 +5,15 @@
 
 import { BTree } from "@tylerbu/sorted-btree-es6";
 
-import { Listenable, createEmitter } from "../../events/index.js";
+import { type Listenable, createEmitter } from "../../events/index.js";
 import { compareStrings } from "../../util/index.js";
 
-import { TreeNodeSchemaIdentifier } from "./format.js";
+import type { TreeNodeSchemaIdentifier } from "./format.js";
 import {
-	StoredSchemaCollection,
-	TreeFieldStoredSchema,
-	TreeNodeStoredSchema,
-	TreeStoredSchema,
+	type StoredSchemaCollection,
+	type TreeFieldStoredSchema,
+	type TreeNodeStoredSchema,
+	type TreeStoredSchema,
 	storedEmptyFieldSchema,
 } from "./schema.js";
 

package/src/core/schema-view/view.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { TreeNodeSchemaIdentifier, TreeStoredSchema } from "../schema-stored/index.js";
+import type { TreeNodeSchemaIdentifier, TreeStoredSchema } from "../schema-stored/index.js";
 
 /**
  * APIs for applying `view schema` to documents.

package/src/core/tree/anchorSet.ts

@@ -5,21 +5,21 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { Listenable, createEmitter } from "../../events/index.js";
+import { type Listenable, createEmitter } from "../../events/index.js";
 import {
-	Brand,
-	BrandedKey,
-	BrandedMapSubset,
-	Opaque,
+	type Brand,
+	type BrandedKey,
+	type BrandedMapSubset,
+	type Opaque,
 	ReferenceCountedBase,
 	brand,
 	brandedSlot,
 	fail,
 } from "../../util/index.js";
-import { FieldKey } from "../schema-stored/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 
-import * as Delta from "./delta.js";
-import {
+import type * as Delta from "./delta.js";
+import type {
 	DetachedPlaceUpPath,
 	DetachedRangeUpPath,
 	PlaceIndex,
@@ -28,10 +28,10 @@ import {
 	RangeUpPath,
 	UpPath,
 } from "./pathTree.js";
-import { EmptyKey, Value } from "./types.js";
-import { DeltaVisitor } from "./visitDelta.js";
-import { PathVisitor } from "./visitPath.js";
-import { AnnouncedVisitor } from "./visitorUtils.js";
+import { EmptyKey, type Value } from "./types.js";
+import type { DeltaVisitor } from "./visitDelta.js";
+import type { PathVisitor } from "./visitPath.js";
+import type { AnnouncedVisitor } from "./visitorUtils.js";
 
 /**
  * A way to refer to a particular tree location within an {@link AnchorSet}.
@@ -97,31 +97,54 @@ export interface AnchorEvents {
 	afterDestroy(anchor: AnchorNode): void;
 
 	/**
-	 * One or more of the children of this node is just about to change.
+	 * Emitted in the middle of applying a batch of changes (i.e. during a delta a visit), if one or more of this node's
+	 * direct children are about to change due to updates from the batch.
 	 *
 	 * @remarks
-	 * Does not include edits of child subtrees: instead only includes changes to nodes which are direct children in this node's fields.
+	 * Does not include edits of child subtrees: instead only includes changes to nodes which are direct children in this
+	 * node's fields.
 	 */
 	childrenChanging(anchor: AnchorNode): void;
 
 	/**
-	 * One or more of the children of this node has just changed.
+	 * Emitted in the middle of applying a batch of changes (i.e. during a delta a visit), if one or more of this node's
+	 * direct children just changed due to updates from the batch.
 	 *
 	 * @remarks
-	 * Does not include edits of child subtrees: instead only includes changes to nodes which are direct children in this node's fields.
+	 * Does not include edits of child subtrees: instead only includes changes to nodes which are direct children in this
+	 * node's fields.
+	 *
+	 * Compare to {@link AnchorEvents.childrenChangedAfterBatch} which is emitted after the whole batch has been applied.
 	 */
 	childrenChanged(anchor: AnchorNode): void;
 
 	/**
-	 * Something in this tree is changing.
+	 * Emitted after a batch of changes has been applied (i.e. when a delta visit completes), if one or more of this node's
+	 * direct children changed due to updates from the batch.
+	 *
+	 * @remarks
+	 * Does not include edits of child subtrees: instead only includes changes to nodes which are direct children in this
+	 * node's fields.
+	 *
+	 * This event is guaranteed to be emitted on a given node only once per batch.
+	 *
+	 * Compare to {@link AnchorEvents.childrenChanged} which is emitted in the middle of the batch/delta-visit.
+	 */
+	childrenChangedAfterBatch(anchor: AnchorNode): void;
+
+	/**
+	 * Emitted in the middle of applying a batch of changes (i.e. during a delta a visit), if something in the subtree
+	 * rooted at `anchor` _may_ be about to change due to updates from the batch.
+	 *
+	 * @remarks
 	 * The event can optionally return a {@link PathVisitor} to traverse the subtree.
 	 * Called on every parent (transitively) when a change is occurring.
-	 * Includes changes to this node itself.
 	 */
 	subtreeChanging(anchor: AnchorNode): PathVisitor | void;
 
 	/**
-	 * Emitted after the subtree rooted at `anchor` may have been changed.
+	 * Emitted in the middle of applying a batch of changes (i.e. during a delta a visit), if something in the subtree
+	 * rooted at `anchor` _may_ have just changed due to updates from the batch.
 	 *
 	 * @remarks
 	 * While this event is always emitted in the presence of changes to the subtree,
@@ -131,16 +154,33 @@ export interface AnchorEvents {
 	 * If this event is emitted by a node, it will later be emitted by all its ancestors up to the root as well, at
 	 * least once on each ancestor.
 	 *
+	 * Compare to {@link AnchorEvents.subtreeChangedAfterBatch} which is emitted after the whole batch has been applied.
+	 *
 	 * @privateRemarks
 	 * The delta visit algorithm is complicated and it may fire this event multiple times for the same change to a node.
 	 * The change to the tree may not be visible until the event fires for the last time.
 	 * Refer to the documentation of the delta visit algorithm for more details.
-	 *
-	 * TODO: can we make it so this event is guaranteed to only fire once during the delta visit? Specifically when
-	 * changes to the tree did happen and are visible to the listener.
 	 */
 	subtreeChanged(anchor: AnchorNode): void;
 
+	/**
+	 * Emitted after a batch of changes has been applied (i.e. when a delta visit completes), if something in the subtree
+	 * rooted at `anchor` changed due to updates from the batch.
+	 *
+	 * @remarks
+	 * If this event is emitted by a node, it will later be emitted by all its ancestors up to the root as well, from bottom to top.
+	 *
+	 * This event is guaranteed to be emitted on a given node only once per batch.
+	 *
+	 * Compare to {@link AnchorEvents.subtreeChanged} which is emitted in the middle of the batch/delta-visit.
+	 *
+	 * @privateRemarks
+	 * Note that because this is fired after the full batch of changes is applied, it guarantees that something in the
+	 * subtree changed, compared to {@link AnchorEvents.subtreeChanged} or {@link AnchorEvents.subtreeChanging} which
+	 * fire when something _may_ have changed or _may_ be about to change.
+	 */
+	subtreeChangedAfterBatch(anchor: AnchorNode): void;
+
 	/**
 	 * Value on this node is changing.
 	 */
@@ -668,6 +708,29 @@ export class AnchorSet implements Listenable<AnchorSetRootEvents>, AnchorLocator
 			pathVisitors: new Map<PathNode, Set<PathVisitor>>(),
 			parentField: undefined as FieldKey | undefined,
 			parent: undefined as UpPath | undefined,
+			bufferedEvents: [] as { node: PathNode; event: keyof AnchorEvents }[],
+
+			// 'currentDepth' and 'depthThresholdForSubtreeChanged' serve to keep track of when do we need to emit
+			// subtreeChangedAfterBatch events.
+			// The algorithm works as follows:
+			// - Initialize both to 0.
+			// - As we walk the tree from the root towards the leaves, when we enter a node increment currentDepth by 1.
+			// - When we edit a node, set depthThresholdForSubtreeChanged = currentDepth.
+			//   Intuitively, depthThresholdForSubtreeChanged means "as you walk the tree towards the root, when you exit a
+			//   node at this depth you should emit a subtreeChangedAfterBatch event".
+			// - When we exit a node, if d === currentDepth then emit a subtreeChangedAfterBatch and decrement d by 1.
+			//   Then decrement currentDepth unconditionally.
+			// Note that the event will be emitted when exiting a node that was edited (depthThresholdForSubtreeChanged will
+			// have been set to the current depth when the edit happened), it will be emitted when exiting a node that is the
+			// parent of a node that already emitted the event (because both depthThresholdForSubtreeChanged and currentDepth
+			// get decremented when exiting a node so they stay in sync), and if we're already emitting the event but start
+			// walking the tree back towards the leaves in a path where no edits happen, currentDepth will be increased again
+			// as we walk that path, depthThresholdForSubtreeChanged will not, and thus no event will be emitted when walking
+			// back up that path, until we get back to the depth where we were already emitting the event, and will continue
+			// emitting it on the way to the root.
+			currentDepth: 0,
+			depthThresholdForSubtreeChanged: 0,
+
 			free() {
 				assert(
 					this.anchorSet.activeVisitor !== undefined,
@@ -677,6 +740,18 @@ export class AnchorSet implements Listenable<AnchorSetRootEvents>, AnchorLocator
 					node.removeRef();
 				}
 				this.anchorSet.activeVisitor = undefined;
+				const alreadyEmitted = new Map<PathNode, string[]>();
+				for (const { node, event } of this.bufferedEvents) {
+					if (!alreadyEmitted.has(node)) {
+						alreadyEmitted.set(node, []);
+					}
+					const emittedEvents = alreadyEmitted.get(node);
+					if (emittedEvents?.includes(event) ?? false) {
+						continue;
+					}
+					emittedEvents?.push(event);
+					node.events.emit(event, node);
+				}
 			},
 			notifyChildrenChanging(): void {
 				this.maybeWithNode(
@@ -686,7 +761,13 @@ export class AnchorSet implements Listenable<AnchorSetRootEvents>, AnchorLocator
 			},
 			notifyChildrenChanged(): void {
 				this.maybeWithNode(
-					(p) => p.events.emit("childrenChanged", p),
+					(p) => {
+						p.events.emit("childrenChanged", p);
+						this.bufferedEvents.push({
+							node: p,
+							event: "childrenChangedAfterBatch",
+						});
+					},
 					() => {},
 				);
 			},
@@ -752,6 +833,7 @@ export class AnchorSet implements Listenable<AnchorSetRootEvents>, AnchorLocator
 					parentIndex: destination,
 				};
 				this.anchorSet.moveChildren(sourcePath, destinationPath, count);
+				this.depthThresholdForSubtreeChanged = this.currentDepth;
 			},
 			beforeDetach(source: Range, destination: FieldKey): void {
 				assert(
@@ -815,6 +897,7 @@ export class AnchorSet implements Listenable<AnchorSetRootEvents>, AnchorLocator
 					parentIndex: 0,
 				};
 				this.anchorSet.moveChildren(sourcePath, destinationPath, source.end - source.start);
+				this.depthThresholdForSubtreeChanged = this.currentDepth;
 			},
 			beforeReplace(newContent: FieldKey, oldContent: Range, destination: FieldKey): void {
 				assert(
@@ -953,17 +1036,26 @@ export class AnchorSet implements Listenable<AnchorSetRootEvents>, AnchorLocator
 						}
 					}
 				});
+				this.currentDepth++;
 			},
 			exitNode(index: number): void {
 				assert(this.parent !== undefined, 0x3ac /* Must have parent node */);
 				this.maybeWithNode((p) => {
 					p.events.emit("subtreeChanged", p);
+					if (this.depthThresholdForSubtreeChanged === this.currentDepth) {
+						this.bufferedEvents.push({
+							node: p,
+							event: "subtreeChangedAfterBatch",
+						});
+						this.depthThresholdForSubtreeChanged--;
+					}
 					// Remove subtree path visitors added at this node if there are any
 					this.pathVisitors.delete(p);
 				});
 				const parent = this.parent;
 				this.parentField = parent.parentField;
 				this.parent = parent.parent;
+				this.currentDepth--;
 			},
 			enterField(key: FieldKey): void {
 				this.parentField = key;

package/src/core/tree/cursor.ts

@@ -5,10 +5,10 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { FieldKey } from "../schema-stored/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 
-import { FieldUpPath, UpPath } from "./pathTree.js";
-import { TreeType, Value } from "./types.js";
+import type { FieldUpPath, UpPath } from "./pathTree.js";
+import type { TreeType, Value } from "./types.js";
 
 /**
  * A symbol for marking an object as an {@link ITreeCursor}.

package/src/core/tree/delta.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { RevisionTag } from "../rebase/index.js";
-import { FieldKey } from "../schema-stored/index.js";
+import type { RevisionTag } from "../rebase/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 
-import { ITreeCursorSynchronous } from "./cursor.js";
+import type { ITreeCursorSynchronous } from "./cursor.js";
 
 /**
  * This format describes changes that must be applied to a forest in order to update it.