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

package/src/core/tree/deltaUtil.ts

@@ -3,11 +3,11 @@
  * Licensed under the MIT License.
  */
 
-import { Mutable } from "../../util/index.js";
-import { FieldKey } from "../schema-stored/index.js";
+import type { Mutable } from "../../util/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 
-import { ITreeCursorSynchronous } from "./cursor.js";
-import { DetachedNodeId, FieldChanges, Mark, Root } from "./delta.js";
+import type { ITreeCursorSynchronous } from "./cursor.js";
+import type { DetachedNodeId, FieldChanges, Mark, Root } from "./delta.js";
 import { rootFieldKey } from "./types.js";
 
 export const emptyDelta: Root<never> = {};

package/src/core/tree/detachedFieldIndex.ts

@@ -5,12 +5,12 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { ICodecOptions, IJsonCodec, noopValidator } from "../../codec/index.js";
+import { type ICodecOptions, type IJsonCodec, noopValidator } from "../../codec/index.js";
 import {
-	Brand,
-	IdAllocator,
-	JsonCompatibleReadOnly,
-	NestedMap,
+	type Brand,
+	type IdAllocator,
+	type JsonCompatibleReadOnly,
+	type NestedMap,
 	brand,
 	deleteFromNestedMap,
 	idAllocatorFromMaxId,
@@ -18,14 +18,14 @@ import {
 	setInNestedMap,
 	tryGetFromNestedMap,
 } from "../../util/index.js";
-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 * as Delta from "./delta.js";
+import type * as Delta from "./delta.js";
 import { makeDetachedNodeToFieldCodec } from "./detachedFieldIndexCodec.js";
-import { Format } from "./detachedFieldIndexFormat.js";
-import { DetachedFieldSummaryData, Major, Minor } from "./detachedFieldIndexTypes.js";
-import { IIdCompressor } from "@fluidframework/id-compressor";
+import type { Format } from "./detachedFieldIndexFormat.js";
+import type { DetachedFieldSummaryData, Major, Minor } from "./detachedFieldIndexTypes.js";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 /**
  * ID used to create a detached field key for a removed subtree.

package/src/core/tree/detachedFieldIndexCodec.ts

@@ -5,18 +5,22 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { ICodecOptions, IJsonCodec, makeVersionedValidatedCodec } from "../../codec/index.js";
-import { EncodedRevisionTag, RevisionTagCodec, type RevisionTag } from "../rebase/index.js";
+import {
+	type ICodecOptions,
+	type IJsonCodec,
+	makeVersionedValidatedCodec,
+} from "../../codec/index.js";
+import type { EncodedRevisionTag, RevisionTagCodec, RevisionTag } from "../rebase/index.js";
 
-import { ForestRootId } from "./detachedFieldIndex.js";
+import type { ForestRootId } from "./detachedFieldIndex.js";
 import {
-	EncodedRootsForRevision,
+	type EncodedRootsForRevision,
 	Format,
-	RootRanges,
+	type RootRanges,
 	version,
 } from "./detachedFieldIndexFormat.js";
-import { DetachedFieldSummaryData, Major } from "./detachedFieldIndexTypes.js";
-import { IIdCompressor } from "@fluidframework/id-compressor";
+import type { DetachedFieldSummaryData, Major } from "./detachedFieldIndexTypes.js";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 class MajorCodec implements IJsonCodec<Major> {
 	public constructor(

package/src/core/tree/detachedFieldIndexFormat.ts

@@ -3,12 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import { Static, Type } from "@sinclair/typebox";
+import { type Static, Type } from "@sinclair/typebox";
 
 import { brandedNumberType } from "../../util/index.js";
 import { RevisionTagSchema } from "../rebase/index.js";
 
-import { ForestRootId } from "./detachedFieldIndex.js";
+import type { ForestRootId } from "./detachedFieldIndex.js";
 
 export const version = 1.0;
 

package/src/core/tree/detachedFieldIndexTypes.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { NestedMap } from "../../util/index.js";
-import { RevisionTag } from "../rebase/index.js";
+import type { NestedMap } from "../../util/index.js";
+import type { RevisionTag } from "../rebase/index.js";
 
-import { ForestRootId } from "./detachedFieldIndex.js";
+import type { ForestRootId } from "./detachedFieldIndex.js";
 
 export type Major = RevisionTag | undefined;
 export type Minor = number;

package/src/core/tree/mapTree.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { FieldKey } from "../schema-stored/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 
-import { NodeData } from "./types.js";
+import type { NodeData } from "./types.js";
 
 /**
  * This modules provides a simple in memory tree format.

package/src/core/tree/pathTree.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { Brand } from "../../util/index.js";
-import { FieldKey } from "../schema-stored/index.js";
+import type { Brand } from "../../util/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 
-import { DetachedField, keyAsDetachedField } from "./types.js";
+import { type DetachedField, keyAsDetachedField } from "./types.js";
 
 /**
  * Identical to {@link UpPath}, but a duplicate declaration is needed to make

package/src/core/tree/persistedTreeTextFormat.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { Static, TSchema, Type } from "@sinclair/typebox";
+import { type Static, type TSchema, Type } from "@sinclair/typebox";
 
 import { schemaFormat } from "../schema-stored/index.js";
 

package/src/core/tree/sparseTree.ts

@@ -5,9 +5,9 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { FieldKey } from "../schema-stored/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 
-import { UpPath, topDownPath } from "./pathTree.js";
+import { type UpPath, topDownPath } from "./pathTree.js";
 
 /**
  * Sparse Tree of nodes.

package/src/core/tree/treeTextFormat.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { FieldKey } from "../schema-stored/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 
-import { NodeData } from "./types.js";
+import type { NodeData } from "./types.js";
 
 /**
  * This modules provides a simple human readable (and editable) tree format.

package/src/core/tree/types.ts

@@ -3,10 +3,16 @@
  * Licensed under the MIT License.
  */
 
-import { IFluidHandle } from "@fluidframework/core-interfaces";
-
-import { Brand, Opaque, InternalUtilTypes, brand, extractFromOpaque } from "../../util/index.js";
-import { FieldKey, TreeNodeSchemaIdentifier, ValueSchema } from "../schema-stored/index.js";
+import type { IFluidHandle } from "@fluidframework/core-interfaces";
+
+import {
+	type Brand,
+	type Opaque,
+	type InternalUtilTypes,
+	brand,
+	extractFromOpaque,
+} from "../../util/index.js";
+import type { FieldKey, TreeNodeSchemaIdentifier, ValueSchema } from "../schema-stored/index.js";
 
 /**
  * @internal

package/src/core/tree/visitDelta.ts

@@ -5,12 +5,12 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { NestedMap, setInNestedMap, tryGetFromNestedMap } from "../../util/index.js";
-import { FieldKey } from "../schema-stored/index.js";
+import { type NestedMap, setInNestedMap, tryGetFromNestedMap } from "../../util/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 
-import { ITreeCursorSynchronous } from "./cursor.js";
-import * as Delta from "./delta.js";
-import { ProtoNodes } from "./delta.js";
+import type { ITreeCursorSynchronous } from "./cursor.js";
+import type * as Delta from "./delta.js";
+import type { ProtoNodes } from "./delta.js";
 import {
 	areDetachedNodeIdsEqual,
 	isAttachMark,
@@ -18,9 +18,9 @@ import {
 	isReplaceMark,
 	offsetDetachId,
 } from "./deltaUtil.js";
-import { DetachedFieldIndex, ForestRootId } from "./detachedFieldIndex.js";
-import { Major, Minor } from "./detachedFieldIndexTypes.js";
-import { NodeIndex, PlaceIndex, Range } from "./pathTree.js";
+import type { DetachedFieldIndex, ForestRootId } from "./detachedFieldIndex.js";
+import type { Major, Minor } from "./detachedFieldIndexTypes.js";
+import type { NodeIndex, PlaceIndex, Range } from "./pathTree.js";
 
 /**
  * Implementation notes:

package/src/core/tree/visitPath.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { ProtoNodes } from "./delta.js";
-import {
+import type { ProtoNodes } from "./delta.js";
+import type {
 	DetachedPlaceUpPath,
 	DetachedRangeUpPath,
 	PlaceUpPath,

package/src/core/tree/visitorUtils.ts

@@ -5,16 +5,16 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { ICodecOptions } from "../../codec/index.js";
-import { IdAllocator, idAllocatorFromMaxId } from "../../util/index.js";
-import { RevisionTagCodec } from "../rebase/index.js";
-import { FieldKey } from "../schema-stored/index.js";
+import type { ICodecOptions } from "../../codec/index.js";
+import { type IdAllocator, idAllocatorFromMaxId } from "../../util/index.js";
+import type { RevisionTagCodec } from "../rebase/index.js";
+import type { FieldKey } from "../schema-stored/index.js";
 
-import { ProtoNodes, Root } from "./delta.js";
-import { DetachedFieldIndex, ForestRootId } from "./detachedFieldIndex.js";
-import { PlaceIndex, Range } from "./pathTree.js";
-import { DeltaVisitor, visitDelta } from "./visitDelta.js";
-import { IIdCompressor } from "@fluidframework/id-compressor";
+import type { ProtoNodes, Root } from "./delta.js";
+import { DetachedFieldIndex, type ForestRootId } from "./detachedFieldIndex.js";
+import type { PlaceIndex, Range } from "./pathTree.js";
+import { type DeltaVisitor, visitDelta } from "./visitDelta.js";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 export function makeDetachedFieldIndex(
 	prefix: string = "Temp",

package/src/domains/json/jsonCursor.ts

@@ -7,14 +7,14 @@ import { assert } from "@fluidframework/core-utils/internal";
 
 import {
 	EmptyKey,
-	FieldKey,
-	ITreeCursor,
-	ITreeCursorSynchronous,
+	type FieldKey,
+	type ITreeCursor,
+	type ITreeCursorSynchronous,
 	mapCursorField,
 	mapCursorFields,
 } from "../../core/index.js";
-import { CursorAdapter, stackTreeNodeCursor } from "../../feature-libraries/index.js";
-import { JsonCompatible } from "../../util/index.js";
+import { type CursorAdapter, stackTreeNodeCursor } from "../../feature-libraries/index.js";
+import type { JsonCompatible } from "../../util/index.js";
 import { leaf } from "../leafDomain.js";
 
 import { jsonArray, jsonObject } from "./jsonDomainSchema.js";

package/src/domains/json/jsonDomainSchema.ts

@@ -11,11 +11,11 @@
 import { ValueSchema } from "../../core/index.js";
 import {
 	FieldKinds,
-	FlexAllowedTypes,
+	type FlexAllowedTypes,
 	FlexFieldSchema,
 	SchemaBuilderInternal,
 } from "../../feature-libraries/index.js";
-import { requireAssignableTo } from "../../util/index.js";
+import type { requireAssignableTo } from "../../util/index.js";
 import { leaf } from "../leafDomain.js";
 
 const builder = new SchemaBuilderInternal({

package/src/domains/schemaBuilder.ts

@@ -5,18 +5,18 @@
 
 import {
 	FieldKinds,
-	FlexFieldKind,
+	type FlexFieldKind,
 	FlexFieldNodeSchema,
-	FlexFieldSchema,
-	FlexImplicitAllowedTypes,
-	FlexImplicitFieldSchema,
-	FlexObjectNodeSchema,
-	NormalizeAllowedTypes,
+	type FlexFieldSchema,
+	type FlexImplicitAllowedTypes,
+	type FlexImplicitFieldSchema,
+	type FlexObjectNodeSchema,
+	type NormalizeAllowedTypes,
 	SchemaBuilderBase,
-	SchemaBuilderOptions,
-	Unenforced,
+	type SchemaBuilderOptions,
+	type Unenforced,
 } from "../feature-libraries/index.js";
-import { RestrictiveReadonlyRecord } from "../util/index.js";
+import type { RestrictiveReadonlyRecord } from "../util/index.js";
 
 import { leaf } from "./leafDomain.js";
 

package/src/feature-libraries/changeAtomIdCodec.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { IJsonCodec } from "../codec/index.js";
-import {
+import type { IJsonCodec } from "../codec/index.js";
+import type {
 	ChangeAtomId,
 	ChangeEncodingContext,
 	EncodedChangeAtomId,

package/src/feature-libraries/chunked-forest/basicChunk.ts

@@ -7,19 +7,19 @@ import { assert } from "@fluidframework/core-utils/internal";
 
 import {
 	CursorLocationType,
-	FieldKey,
-	FieldUpPath,
-	PathRootPrefix,
-	TreeNodeSchemaIdentifier,
-	TreeType,
-	TreeValue,
-	UpPath,
-	Value,
+	type FieldKey,
+	type FieldUpPath,
+	type PathRootPrefix,
+	type TreeNodeSchemaIdentifier,
+	type TreeType,
+	type TreeValue,
+	type UpPath,
+	type Value,
 } from "../../core/index.js";
 import { ReferenceCountedBase, fail } from "../../util/index.js";
 import { SynchronousCursor, prefixPath } from "../treeCursorUtils.js";
 
-import { ChunkedCursor, TreeChunk, cursorChunk, dummyRoot } from "./chunk.js";
+import { type ChunkedCursor, type TreeChunk, cursorChunk, dummyRoot } from "./chunk.js";
 
 /**
  * General purpose one node chunk.

package/src/feature-libraries/chunked-forest/chunk.ts

@@ -7,12 +7,12 @@ import { assert } from "@fluidframework/core-utils/internal";
 
 import {
 	CursorLocationType,
-	FieldKey,
-	ITreeCursor,
-	ITreeCursorSynchronous,
+	type FieldKey,
+	type ITreeCursor,
+	type ITreeCursorSynchronous,
 	rootFieldKey,
 } from "../../core/index.js";
-import { ReferenceCounted } from "../../util/index.js";
+import type { ReferenceCounted } from "../../util/index.js";
 
 /**
  * Contiguous part of the tree which get stored together in some data format.

package/src/feature-libraries/chunked-forest/chunkTree.ts

@@ -7,27 +7,27 @@ import { assert } from "@fluidframework/core-utils/internal";
 
 import {
 	CursorLocationType,
-	FieldKey,
-	ITreeCursorSynchronous,
+	type FieldKey,
+	type ITreeCursorSynchronous,
 	LeafNodeStoredSchema,
 	ObjectNodeStoredSchema,
-	StoredSchemaCollection,
-	TreeFieldStoredSchema,
-	TreeNodeSchemaIdentifier,
-	TreeStoredSchema,
-	TreeStoredSchemaSubscription,
-	TreeValue,
-	Value,
+	type StoredSchemaCollection,
+	type TreeFieldStoredSchema,
+	type TreeNodeSchemaIdentifier,
+	type TreeStoredSchema,
+	type TreeStoredSchemaSubscription,
+	type TreeValue,
+	type Value,
 	mapCursorFields,
 	Multiplicity,
 } from "../../core/index.js";
 import { fail, getOrCreate } from "../../util/index.js";
-import { FullSchemaPolicy } from "../modular-schema/index.js";
+import type { FullSchemaPolicy } from "../modular-schema/index.js";
 
 import { BasicChunk } from "./basicChunk.js";
-import { TreeChunk, tryGetChunk } from "./chunk.js";
+import { type TreeChunk, tryGetChunk } from "./chunk.js";
 import { SequenceChunk } from "./sequenceChunk.js";
-import { FieldShape, TreeShape, UniformChunk } from "./uniformChunk.js";
+import { type FieldShape, TreeShape, UniformChunk } from "./uniformChunk.js";
 
 export interface Disposable {
 	/**

package/src/feature-libraries/chunked-forest/chunkedForest.ts

@@ -6,23 +6,23 @@
 import { assert } from "@fluidframework/core-utils/internal";
 
 import {
-	Anchor,
+	type Anchor,
 	AnchorSet,
-	DeltaVisitor,
-	DetachedField,
-	FieldAnchor,
-	FieldKey,
-	ForestEvents,
-	IEditableForest,
-	ITreeCursorSynchronous,
-	ITreeSubscriptionCursor,
+	type DeltaVisitor,
+	type DetachedField,
+	type FieldAnchor,
+	type FieldKey,
+	type ForestEvents,
+	type IEditableForest,
+	type ITreeCursorSynchronous,
+	type ITreeSubscriptionCursor,
 	ITreeSubscriptionCursorState,
-	PlaceIndex,
-	ProtoNodes,
-	Range,
+	type PlaceIndex,
+	type ProtoNodes,
+	type Range,
 	TreeNavigationResult,
-	TreeStoredSchemaSubscription,
-	UpPath,
+	type TreeStoredSchemaSubscription,
+	type UpPath,
 	aboveRootPlaceholder,
 	detachedFieldAsKey,
 	mapCursorField,
@@ -31,9 +31,9 @@ import {
 import { createEmitter } from "../../events/index.js";
 import { assertValidRange, brand, fail, getOrAddEmptyToMap } from "../../util/index.js";
 
-import { BasicChunk, BasicChunkCursor, SiblingsOrKey } from "./basicChunk.js";
-import { ChunkedCursor, TreeChunk } from "./chunk.js";
-import { IChunker, basicChunkTree, chunkTree } from "./chunkTree.js";
+import { BasicChunk, BasicChunkCursor, type SiblingsOrKey } from "./basicChunk.js";
+import type { ChunkedCursor, TreeChunk } from "./chunk.js";
+import { type IChunker, basicChunkTree, chunkTree } from "./chunkTree.js";
 
 function makeRoot(): BasicChunk {
 	return new BasicChunk(aboveRootPlaceholder, new Map());

package/src/feature-libraries/chunked-forest/codec/chunkCodecUtilities.ts

@@ -5,10 +5,10 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { TreeValue } from "../../../core/index.js";
+import type { TreeValue } from "../../../core/index.js";
 import { assertValidIndex } from "../../../util/index.js";
-import { FluidSerializableReadOnly, assertAllowedValue } from "../../valueUtilities.js";
-import { TreeChunk } from "../chunk.js";
+import { type FluidSerializableReadOnly, assertAllowedValue } from "../../valueUtilities.js";
+import type { TreeChunk } from "../chunk.js";
 
 /**
  * Utilities related to chunk encoding and decoding that do not depend on specific chunk types or formats.

package/src/feature-libraries/chunked-forest/codec/chunkDecoding.ts

@@ -6,16 +6,16 @@
 import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 
 import { DiscriminatedUnionDispatcher } from "../../../codec/index.js";
-import { FieldKey, TreeNodeSchemaIdentifier, Value } from "../../../core/index.js";
+import type { FieldKey, TreeNodeSchemaIdentifier, Value } from "../../../core/index.js";
 import { assertValidIndex } from "../../../util/index.js";
 import { BasicChunk } from "../basicChunk.js";
-import { TreeChunk } from "../chunk.js";
+import type { TreeChunk } from "../chunk.js";
 import { emptyChunk } from "../emptyChunk.js";
 import { SequenceChunk } from "../sequenceChunk.js";
 
 import {
-	ChunkDecoder,
-	StreamCursor,
+	type ChunkDecoder,
+	type StreamCursor,
 	getChecked,
 	readStream,
 	readStreamBoolean,
@@ -29,24 +29,34 @@ import {
 	readStreamIdentifier,
 } from "./chunkDecodingGeneric.js";
 import {
-	EncodedAnyShape,
-	EncodedChunkShape,
-	EncodedFieldBatch,
-	EncodedInlineArray,
-	EncodedNestedArray,
-	EncodedTreeShape,
-	EncodedValueShape,
+	type EncodedAnyShape,
+	type EncodedChunkShape,
+	type EncodedFieldBatch,
+	type EncodedInlineArray,
+	type EncodedNestedArray,
+	type EncodedTreeShape,
+	type EncodedValueShape,
 	SpecialField,
 } from "./format.js";
-import { IIdCompressor, SessionSpaceCompressedId } from "@fluidframework/id-compressor";
+import type { IIdCompressor, OpSpaceCompressedId, SessionId } from "@fluidframework/id-compressor";
 
+export interface IdDecodingContext {
+	idCompressor: IIdCompressor;
+	/**
+	 * The creator of any local Ids to be decoded.
+	 */
+	originatorId: SessionId;
+}
 /**
  * Decode `chunk` into a TreeChunk.
  */
-export function decode(chunk: EncodedFieldBatch, idCompressor: IIdCompressor): TreeChunk[] {
+export function decode(
+	chunk: EncodedFieldBatch,
+	idDecodingContext: { idCompressor: IIdCompressor; originatorId: SessionId },
+): TreeChunk[] {
 	return genericDecode(
 		decoderLibrary,
-		new DecoderContext(chunk.identifiers, chunk.shapes, idCompressor),
+		new DecoderContext(chunk.identifiers, chunk.shapes, idDecodingContext),
 		chunk,
 		anyDecoder,
 	);
@@ -77,7 +87,7 @@ const decoderLibrary = new DiscriminatedUnionDispatcher<
 export function readValue(
 	stream: StreamCursor,
 	shape: EncodedValueShape,
-	idCompressor: IIdCompressor,
+	idDecodingContext: IdDecodingContext,
 ): Value {
 	if (shape === undefined) {
 		return readStreamBoolean(stream) ? readStreamValue(stream) : undefined;
@@ -96,8 +106,14 @@ export function readValue(
 				typeof streamValue === "number" || typeof streamValue === "string",
 				"identifier must be string or number.",
 			);
+			const idCompressor = idDecodingContext.idCompressor;
 			return typeof streamValue === "number"
-				? idCompressor.decompress(streamValue as SessionSpaceCompressedId)
+				? idCompressor.decompress(
+						idCompressor.normalizeToSessionSpace(
+							streamValue as OpSpaceCompressedId,
+							idDecodingContext.originatorId,
+						),
+				  )
 				: streamValue;
 		} else {
 			// EncodedCounter case:
@@ -259,7 +275,7 @@ export class TreeDecoder implements ChunkDecoder {
 			this.type ?? readStreamIdentifier(stream, this.cache);
 		// TODO: Consider typechecking against stored schema in here somewhere.
 
-		const value = readValue(stream, this.shape.value, this.cache.idCompressor);
+		const value = readValue(stream, this.shape.value, this.cache.idDecodingContext);
 		const fields: Map<FieldKey, TreeChunk[]> = new Map();
 
 		// Helper to add fields, but with unneeded array chunks removed.

package/src/feature-libraries/chunked-forest/codec/chunkDecodingGeneric.ts

@@ -5,13 +5,18 @@
 
 import { assert } from "@fluidframework/core-utils/internal";
 
-import { DiscriminatedUnionDispatcher } from "../../../codec/index.js";
-import { BrandedType } from "../../../util/index.js";
-import { TreeChunk } from "../chunk.js";
+import type { DiscriminatedUnionDispatcher } from "../../../codec/index.js";
+import type { BrandedType } from "../../../util/index.js";
+import type { TreeChunk } from "../chunk.js";
 
-import { ChunkDecoder, StreamCursor, getChecked, readStream } from "./chunkCodecUtilities.js";
-import { EncodedFieldBatchGeneric, IdentifierOrIndex } from "./formatGeneric.js";
-import { IIdCompressor } from "@fluidframework/id-compressor";
+import {
+	type ChunkDecoder,
+	type StreamCursor,
+	getChecked,
+	readStream,
+} from "./chunkCodecUtilities.js";
+import type { EncodedFieldBatchGeneric, IdentifierOrIndex } from "./formatGeneric.js";
+import type { IdDecodingContext } from "./chunkDecoding.js";
 
 /**
  * General purpose shape based tree decoder which gets its support for specific shapes from the caller.
@@ -47,7 +52,7 @@ export class DecoderContext<TEncodedShape = unknown> {
 	public constructor(
 		public readonly identifiers: readonly string[],
 		public readonly shapes: readonly TEncodedShape[],
-		public readonly idCompressor: IIdCompressor,
+		public readonly idDecodingContext: IdDecodingContext,
 	) {}
 
 	public identifier<T extends string & BrandedType<string, string>>(