Avoid depending on runtime inside of SharedTreeKernel (#23855)

## Description

Use IIDCompressor instead of IFluidDataStoreRuntime in SharedTreeKernel

Author: CraigMacomber

packages/dds/tree/src/feature-libraries/schema-index/schemaSummarizer.ts

@@ -5,10 +5,7 @@
 
 import { bufferToString } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils/internal";
-import type {
-	IFluidDataStoreRuntime,
-	IChannelStorageService,
-} from "@fluidframework/datastore-definitions/internal";
+import type { IChannelStorageService } from "@fluidframework/datastore-definitions/internal";
 import { SummaryType } from "@fluidframework/driver-definitions";
 import type {
 	IExperimentalIncrementalSummaryContext,
@@ -45,7 +42,6 @@ export class SchemaSummarizer implements Summarizable {
 	private schemaIndexLastChangedSeq: number | undefined;
 
 	public constructor(
-		private readonly runtime: IFluidDataStoreRuntime,
 		private readonly schema: MutableTreeStoredSchema,
 		options: ICodecOptions,
 		collabWindow: CollabWindow,

packages/dds/tree/src/shared-tree-core/sharedTreeCore.ts

@@ -4,10 +4,7 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
-import type {
-	IFluidDataStoreRuntime,
-	IChannelStorageService,
-} from "@fluidframework/datastore-definitions/internal";
+import type { IChannelStorageService } from "@fluidframework/datastore-definitions/internal";
 import type { IIdCompressor } from "@fluidframework/id-compressor";
 import type { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
 import type {
@@ -99,8 +96,6 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 		MessageEncodingContext
 	>;
 
-	private readonly idCompressor: IIdCompressor;
-
 	private readonly resubmitMachine: ResubmitMachine<TChange>;
 	public readonly commitEnricher: BranchCommitEnricher<TChange>;
 
@@ -126,7 +121,7 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 		changeFamily: ChangeFamily<TEditor, TChange>,
 		options: ICodecOptions,
 		formatOptions: ExplicitCoreCodecVersions,
-		runtime: IFluidDataStoreRuntime,
+		private readonly idCompressor: IIdCompressor,
 		schema: TreeStoredSchemaRepository,
 		schemaPolicy: SchemaPolicy,
 		resubmitMachine?: ResubmitMachine<TChange>,
@@ -143,18 +138,13 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 			namespace: "Rebase",
 		});
 
-		assert(
-			runtime.idCompressor !== undefined,
-			0x886 /* IdCompressor must be enabled to use SharedTree */,
-		);
-		this.idCompressor = runtime.idCompressor;
 		this.mintRevisionTag = () => this.idCompressor.generateCompressedId();
 		/**
 		 * A random ID that uniquely identifies this client in the collab session.
 		 * This is sent alongside every op to identify which client the op originated from.
 		 * This is used rather than the Fluid client ID because the Fluid client ID is not stable across reconnections.
 		 */
-		const localSessionId = runtime.idCompressor.localSessionId;
+		const localSessionId = idCompressor.localSessionId;
 		this.editManager = new EditManager(
 			changeFamily,
 			localSessionId,
@@ -174,7 +164,7 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 			}
 		});
 
-		const revisionTagCodec = new RevisionTagCodec(runtime.idCompressor);
+		const revisionTagCodec = new RevisionTagCodec(idCompressor);
 		const editManagerCodec = makeEditManagerCodec(
 			this.editManager.changeFamily.codecs,
 			revisionTagCodec,
@@ -197,7 +187,7 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 
 		this.messageCodec = makeMessageCodec(
 			changeFamily.codecs,
-			new RevisionTagCodec(runtime.idCompressor),
+			new RevisionTagCodec(idCompressor),
 			options,
 			formatOptions.message,
 		);

packages/dds/tree/src/shared-tree/sharedTree.ts

@@ -235,14 +235,17 @@ export class SharedTree extends SharedObject implements ISharedTree, WithBreakab
 		telemetryContextPrefix: string = "fluid_sharedTree_",
 	) {
 		super(id, runtime, attributes, telemetryContextPrefix);
+		if (runtime.idCompressor === undefined) {
+			throw new UsageError("IdCompressor must be enabled to use SharedTree");
+		}
 		this.kernel = new SharedTreeKernel(
 			this.breaker,
 			this,
 			this.serializer,
 			(content, localOpMetadata) => this.submitLocalMessage(content, localOpMetadata),
 			() => this.deltaManager.lastSequenceNumber,
 			this.logger,
-			runtime,
+			runtime.idCompressor,
 			optionsParam,
 		);
 	}
@@ -341,25 +344,21 @@ class SharedTreeKernel extends SharedTreeCore<SharedTreeEditBuilder, SharedTreeC
 		submitLocalMessage: (content: unknown, localOpMetadata?: unknown) => void,
 		lastSequenceNumber: () => number | undefined,
 		logger: ITelemetryLoggerExt | undefined,
-		runtime: IFluidDataStoreRuntime,
+		idCompressor: IIdCompressor,
 		optionsParam: SharedTreeOptionsInternal,
 	) {
-		if (runtime.idCompressor === undefined) {
-			throw new UsageError("IdCompressor must be enabled to use SharedTree");
-		}
-
 		const options = { ...defaultSharedTreeOptions, ...optionsParam };
 		const codecVersions = getCodecVersions(options.formatVersion);
 		const schema = new TreeStoredSchemaRepository();
-		const forest = buildConfiguredForest(options.forest, schema, runtime.idCompressor);
-		const revisionTagCodec = new RevisionTagCodec(runtime.idCompressor);
+		const forest = buildConfiguredForest(options.forest, schema, idCompressor);
+		const revisionTagCodec = new RevisionTagCodec(idCompressor);
 		const removedRoots = makeDetachedFieldIndex(
 			"repair",
 			revisionTagCodec,
-			runtime.idCompressor,
+			idCompressor,
 			options,
 		);
-		const schemaSummarizer = new SchemaSummarizer(runtime, schema, options, {
+		const schemaSummarizer = new SchemaSummarizer(schema, options, {
 			getCurrentSeq: lastSequenceNumber,
 		});
 		const fieldBatchCodec = makeFieldBatchCodec(options, codecVersions.fieldBatch);
@@ -370,24 +369,24 @@ class SharedTreeKernel extends SharedTreeCore<SharedTreeEditBuilder, SharedTreeC
 				policy: defaultSchemaPolicy,
 			},
 			encodeType: options.treeEncodeType,
-			originatorId: runtime.idCompressor.localSessionId,
-			idCompressor: runtime.idCompressor,
+			originatorId: idCompressor.localSessionId,
+			idCompressor,
 		};
 		const forestSummarizer = new ForestSummarizer(
 			forest,
 			revisionTagCodec,
 			fieldBatchCodec,
 			encoderContext,
 			options,
-			runtime.idCompressor,
+			idCompressor,
 		);
 		const removedRootsSummarizer = new DetachedFieldIndexSummarizer(removedRoots);
 		const innerChangeFamily = new SharedTreeChangeFamily(
 			revisionTagCodec,
 			fieldBatchCodec,
 			options,
 			options.treeEncodeType,
-			runtime.idCompressor,
+			idCompressor,
 		);
 		const changeFamily = makeMitigatedChangeFamily(
 			innerChangeFamily,
@@ -422,7 +421,7 @@ class SharedTreeKernel extends SharedTreeCore<SharedTreeEditBuilder, SharedTreeC
 			changeFamily,
 			options,
 			codecVersions,
-			runtime,
+			idCompressor,
 			schema,
 			defaultSchemaPolicy,
 			new DefaultResubmitMachine(
@@ -433,23 +432,18 @@ class SharedTreeKernel extends SharedTreeCore<SharedTreeEditBuilder, SharedTreeC
 			changeEnricher,
 		);
 		const localBranch = this.getLocalBranch();
-		this.checkout = createTreeCheckout(
-			runtime.idCompressor,
-			this.mintRevisionTag,
-			revisionTagCodec,
-			{
-				branch: localBranch,
-				changeFamily,
-				schema,
-				forest,
-				fieldBatchCodec,
-				removedRoots,
-				chunkCompressionStrategy: options.treeEncodeType,
-				logger,
-				breaker: this.breaker,
-				disposeForksAfterTransaction: options.disposeForksAfterTransaction,
-			},
-		);
+		this.checkout = createTreeCheckout(idCompressor, this.mintRevisionTag, revisionTagCodec, {
+			branch: localBranch,
+			changeFamily,
+			schema,
+			forest,
+			fieldBatchCodec,
+			removedRoots,
+			chunkCompressionStrategy: options.treeEncodeType,
+			logger,
+			breaker: this.breaker,
+			disposeForksAfterTransaction: options.disposeForksAfterTransaction,
+		});
 
 		this.checkout.transaction.events.on("started", () => {
 			if (sharedObject.isAttached()) {

packages/dds/tree/src/test/shared-tree-core/utils.ts

@@ -51,7 +51,10 @@ import type {
 	IExperimentalIncrementalSummaryContext,
 	ITelemetryContext,
 } from "@fluidframework/runtime-definitions/internal";
-import { createIdCompressor } from "@fluidframework/id-compressor/internal";
+import {
+	createIdCompressor,
+	type IIdCompressor,
+} from "@fluidframework/id-compressor/internal";
 import type {
 	IFluidHandle,
 	IFluidLoadable,
@@ -93,7 +96,7 @@ export function createTree<TIndexes extends readonly Summarizable[]>(
 		logger,
 		indexes,
 		TreeCompressionStrategy.Uncompressed,
-		new MockFluidDataStoreRuntime({ idCompressor: createIdCompressor() }),
+		createIdCompressor(),
 		new TreeStoredSchemaRepository(),
 		resubmitMachine,
 		enricher,
@@ -128,17 +131,15 @@ function createTreeInner(
 	logger: ITelemetryBaseLogger | undefined,
 	summarizables: readonly Summarizable[],
 	chunkCompressionStrategy: TreeCompressionStrategy,
-	runtime: IFluidDataStoreRuntime,
+	idCompressor: IIdCompressor,
 	schema: TreeStoredSchemaRepository,
 	resubmitMachine?: ResubmitMachine<DefaultChangeset>,
 	enricher?: ChangeEnricherReadonlyCheckout<DefaultChangeset>,
 	editor?: () => DefaultEditBuilder,
 ): [SharedTreeCore<DefaultEditBuilder, DefaultChangeset>, DefaultChangeFamily] {
-	assert(runtime.idCompressor !== undefined, "The runtime must provide an ID compressor");
-
 	const codec = makeModularChangeCodecFamily(
 		fieldKindConfigurations,
-		new RevisionTagCodec(runtime.idCompressor),
+		new RevisionTagCodec(idCompressor),
 		makeFieldBatchCodec(codecOptions, formatVersions.fieldBatch),
 		codecOptions,
 		chunkCompressionStrategy,
@@ -156,7 +157,7 @@ function createTreeInner(
 			changeFamily,
 			codecOptions,
 			formatVersions,
-			runtime,
+			idCompressor,
 			schema,
 			defaultSchemaPolicy,
 			resubmitMachine,
@@ -208,14 +209,15 @@ export class TestSharedTreeCore extends SharedObject {
 		enricher?: ChangeEnricherReadonlyCheckout<DefaultChangeset>,
 	) {
 		super(id, runtime, TestSharedTreeCore.attributes, id);
+		assert(runtime.idCompressor !== undefined, "The runtime must provide an ID compressor");
 		[this.kernel, this.changeFamily] = createTreeInner(
 			this,
 			this.serializer,
 			(content, localOpMetadata) => this.submitLocalMessage(content, localOpMetadata),
 			this.logger,
 			summarizables,
 			chunkCompressionStrategy,
-			runtime,
+			runtime.idCompressor,
 			schema,
 			resubmitMachine,
 			enricher,