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

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

@@ -3,17 +3,17 @@
  * Licensed under the MIT License.
  */
 
-import { TreeValue } from "../../../core/index.js";
+import type { TreeValue } from "../../../core/index.js";
 import { fail } from "../../../util/index.js";
-import { FluidSerializableReadOnly } from "../../valueUtilities.js";
+import type { FluidSerializableReadOnly } from "../../valueUtilities.js";
 
 import {
 	Counter,
-	CounterFilter,
-	DeduplicationTable,
+	type CounterFilter,
+	type DeduplicationTable,
 	jsonMinimizingFilter,
 } from "./chunkCodecUtilities.js";
-import { EncodedFieldBatchGeneric } from "./formatGeneric.js";
+import type { EncodedFieldBatchGeneric } from "./formatGeneric.js";
 
 /**
  * An identifier which can be compressed using {@link Counter}.

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

@@ -5,21 +5,26 @@
 
 import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 
-import { ICodecOptions, IJsonCodec, makeVersionedValidatedCodec } from "../../../codec/index.js";
-import { CursorLocationType, SchemaAndPolicy } from "../../../core/index.js";
-import { JsonCompatibleReadOnly } from "../../../util/index.js";
+import {
+	type ICodecOptions,
+	type IJsonCodec,
+	makeVersionedValidatedCodec,
+} from "../../../codec/index.js";
+import { CursorLocationType, type SchemaAndPolicy } from "../../../core/index.js";
+import type { JsonCompatibleReadOnly } from "../../../util/index.js";
 import { TreeCompressionStrategy } from "../../treeCompressionUtils.js";
 
 import { decode } from "./chunkDecoding.js";
-import { FieldBatch } from "./fieldBatch.js";
+import type { FieldBatch } from "./fieldBatch.js";
 import { EncodedFieldBatch, validVersions } from "./format.js";
 import { schemaCompressedEncode } from "./schemaBasedEncoding.js";
 import { uncompressedEncode } from "./uncompressedEncode.js";
-import { IIdCompressor } from "@fluidframework/id-compressor";
+import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 
 export interface FieldBatchEncodingContext {
 	readonly encodeType: TreeCompressionStrategy;
 	readonly idCompressor: IIdCompressor;
+	readonly originatorId: SessionId;
 	readonly schema?: SchemaAndPolicy;
 }
 /**
@@ -77,7 +82,10 @@ export function makeFieldBatchCodec(options: ICodecOptions, writeVersion: number
 		},
 		decode: (data: EncodedFieldBatch, context: FieldBatchEncodingContext): FieldBatch => {
 			// TODO: consider checking data is in schema.
-			return decode(data, context.idCompressor).map((chunk) => chunk.cursor());
+			return decode(data, {
+				idCompressor: context.idCompressor,
+				originatorId: context.originatorId,
+			}).map((chunk) => chunk.cursor());
 		},
 	});
 }

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

@@ -7,34 +7,34 @@ import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 
 import {
 	CursorLocationType,
-	FieldKey,
-	FieldKindIdentifier,
-	ITreeCursorSynchronous,
-	TreeFieldStoredSchema,
-	TreeNodeSchemaIdentifier,
-	Value,
+	type FieldKey,
+	type FieldKindIdentifier,
+	type ITreeCursorSynchronous,
+	type TreeFieldStoredSchema,
+	type TreeNodeSchemaIdentifier,
+	type Value,
 	forEachNode,
 } from "../../../core/index.js";
 import { fail, getOrCreate } from "../../../util/index.js";
-import { type FlexFieldKind } from "../../modular-schema/index.js";
+import type { FlexFieldKind } from "../../modular-schema/index.js";
 
-import { Counter, DeduplicationTable } from "./chunkCodecUtilities.js";
+import type { Counter, DeduplicationTable } from "./chunkCodecUtilities.js";
 import {
-	BufferFormat as BufferFormatGeneric,
+	type BufferFormat as BufferFormatGeneric,
 	Shape as ShapeGeneric,
 	handleShapesAndIdentifiers,
 } from "./chunkEncodingGeneric.js";
-import { FieldBatch } from "./fieldBatch.js";
+import type { FieldBatch } from "./fieldBatch.js";
 import {
-	EncodedAnyShape,
-	EncodedChunkShape,
-	EncodedFieldBatch,
-	EncodedNestedArray,
-	EncodedValueShape,
+	type EncodedAnyShape,
+	type EncodedChunkShape,
+	type EncodedFieldBatch,
+	type EncodedNestedArray,
+	type EncodedValueShape,
 	SpecialField,
 	version,
 } from "./format.js";
-import { IIdCompressor } from "@fluidframework/id-compressor";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 /**
  * Encode data from `FieldBatch` in into an `EncodedChunk`.

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ITreeCursorSynchronous } from "../../../core/index.js";
+import type { ITreeCursorSynchronous } from "../../../core/index.js";
 
 /**
  * Collection of field cursors to compress as a batch.

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

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

package/src/feature-libraries/chunked-forest/codec/formatGeneric.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";
 
 /**
  * Identifier OR Index of an identifier in the identifier list.

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

@@ -6,24 +6,24 @@
 import { assert } from "@fluidframework/core-utils/internal";
 
 import {
-	FieldKey,
-	ITreeCursorSynchronous,
-	TreeNodeSchemaIdentifier,
+	type FieldKey,
+	type ITreeCursorSynchronous,
+	type TreeNodeSchemaIdentifier,
 	forEachField,
 } from "../../../core/index.js";
 import { brand, fail } from "../../../util/index.js";
 
-import { Counter, DeduplicationTable } from "./chunkCodecUtilities.js";
-import { BufferFormat, IdentifierToken, Shape } from "./chunkEncodingGeneric.js";
+import type { Counter, DeduplicationTable } from "./chunkCodecUtilities.js";
+import { type BufferFormat, IdentifierToken, Shape } from "./chunkEncodingGeneric.js";
 import {
-	EncoderCache,
-	FieldEncoder,
-	KeyedFieldEncoder,
-	NodeEncoder,
+	type EncoderCache,
+	type FieldEncoder,
+	type KeyedFieldEncoder,
+	type NodeEncoder,
 	encodeValue,
 } from "./compressedEncode.js";
-import { EncodedChunkShape, EncodedFieldShape, EncodedValueShape } from "./format.js";
-import { StableId } from "@fluidframework/id-compressor";
+import type { EncodedChunkShape, EncodedFieldShape, EncodedValueShape } from "./format.js";
+import type { StableId } from "@fluidframework/id-compressor";
 
 export class NodeShape extends Shape<EncodedChunkShape> implements NodeEncoder {
 	// TODO: Ensure uniform chunks, encoding and identifier generation sort fields the same.
@@ -51,9 +51,14 @@ export class NodeShape extends Shape<EncodedChunkShape> implements NodeEncoder {
 		}
 
 		if (this.value === 0) {
-			const compressedId =
-				cache.idCompressor.tryRecompress(cursor.value as StableId) ?? cursor.value;
-			encodeValue(compressedId, this.value, outputBuffer);
+			const sessionSpaceCompressedId = cache.idCompressor.tryRecompress(
+				cursor.value as StableId,
+			);
+			const opSpaceCompressedId =
+				sessionSpaceCompressedId !== undefined
+					? cache.idCompressor.normalizeToOpSpace(sessionSpaceCompressedId)
+					: cursor.value;
+			encodeValue(opSpaceCompressedId, this.value, outputBuffer);
 		} else {
 			encodeValue(cursor.value, this.value, outputBuffer);
 		}

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

@@ -9,30 +9,30 @@ import {
 	LeafNodeStoredSchema,
 	MapNodeStoredSchema,
 	ObjectNodeStoredSchema,
-	StoredSchemaCollection,
-	TreeFieldStoredSchema,
-	TreeNodeSchemaIdentifier,
+	type StoredSchemaCollection,
+	type TreeFieldStoredSchema,
+	type TreeNodeSchemaIdentifier,
 	ValueSchema,
 	Multiplicity,
 	identifierFieldKindIdentifier,
 } from "../../../core/index.js";
 import { fail } from "../../../util/index.js";
-import { FullSchemaPolicy } from "../../modular-schema/index.js";
+import type { FullSchemaPolicy } from "../../modular-schema/index.js";
 
 import {
 	EncoderCache,
-	FieldEncoder,
-	FieldShaper,
-	KeyedFieldEncoder,
-	TreeShaper,
+	type FieldEncoder,
+	type FieldShaper,
+	type KeyedFieldEncoder,
+	type TreeShaper,
 	anyNodeEncoder,
 	asFieldEncoder,
 	compressedEncode,
 } from "./compressedEncode.js";
-import { FieldBatch } from "./fieldBatch.js";
-import { EncodedFieldBatch, EncodedValueShape, SpecialField } from "./format.js";
+import type { FieldBatch } from "./fieldBatch.js";
+import { type EncodedFieldBatch, type EncodedValueShape, SpecialField } from "./format.js";
 import { NodeShape } from "./nodeShape.js";
-import { IIdCompressor } from "@fluidframework/id-compressor";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 /**
  * Encode data from `fieldBatch` in into an `EncodedChunk`.

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

@@ -3,12 +3,17 @@
  * Licensed under the MIT License.
  */
 
-import { ITreeCursorSynchronous, forEachField, forEachNode } from "../../../core/index.js";
-import { FluidSerializableReadOnly } from "../../valueUtilities.js";
+import { type ITreeCursorSynchronous, forEachField, forEachNode } from "../../../core/index.js";
+import type { FluidSerializableReadOnly } from "../../valueUtilities.js";
 
-import { FieldBatch } from "./fieldBatch.js";
-import { EncodedFieldBatch, EncodedNestedArray, EncodedTreeShape, version } from "./format.js";
-import { ShapeIndex } from "./formatGeneric.js";
+import type { FieldBatch } from "./fieldBatch.js";
+import {
+	type EncodedFieldBatch,
+	type EncodedNestedArray,
+	type EncodedTreeShape,
+	version,
+} from "./format.js";
+import type { ShapeIndex } from "./formatGeneric.js";
 
 /**
  * Encode data from `cursor` in the simplest way supported by `EncodedChunk`.

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

@@ -6,15 +6,15 @@
 import {
 	CursorLocationType,
 	CursorMarker,
-	FieldKey,
-	FieldUpPath,
-	PathRootPrefix,
-	UpPath,
+	type FieldKey,
+	type FieldUpPath,
+	type PathRootPrefix,
+	type UpPath,
 } from "../../core/index.js";
 import { fail } from "../../util/index.js";
 import { prefixFieldPath } from "../treeCursorUtils.js";
 
-import { ChunkedCursor, TreeChunk, cursorChunk, dummyRoot } from "./chunk.js";
+import { type ChunkedCursor, type TreeChunk, cursorChunk, dummyRoot } from "./chunk.js";
 
 /**
  * Chunk that is empty.

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

@@ -6,7 +6,7 @@
 import { ReferenceCountedBase } from "../../util/index.js";
 
 import { BasicChunkCursor } from "./basicChunk.js";
-import { ChunkedCursor, TreeChunk, dummyRoot } from "./chunk.js";
+import { type ChunkedCursor, type TreeChunk, dummyRoot } from "./chunk.js";
 
 /**
  * General purpose multi-node sequence chunk.

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

@@ -7,18 +7,18 @@ import { assert, compareArrays } from "@fluidframework/core-utils/internal";
 
 import {
 	CursorLocationType,
-	FieldKey,
-	FieldUpPath,
-	PathRootPrefix,
-	TreeNodeSchemaIdentifier,
-	TreeValue,
-	UpPath,
-	Value,
+	type FieldKey,
+	type FieldUpPath,
+	type PathRootPrefix,
+	type TreeNodeSchemaIdentifier,
+	type TreeValue,
+	type UpPath,
+	type Value,
 } from "../../core/index.js";
 import { ReferenceCountedBase, fail } from "../../util/index.js";
 import { SynchronousCursor, prefixFieldPath, prefixPath } from "../treeCursorUtils.js";
 
-import { ChunkedCursor, TreeChunk, cursorChunk, dummyRoot } from "./chunk.js";
+import { type ChunkedCursor, type TreeChunk, cursorChunk, dummyRoot } from "./chunk.js";
 
 /**
  * Create a tree chunk with ref count 1.

package/src/feature-libraries/contextuallyTyped.ts

@@ -8,10 +8,10 @@ import { assert } from "@fluidframework/core-utils/internal";
 import {
 	CursorLocationType,
 	EmptyKey,
-	FieldKey,
-	ITreeCursorSynchronous,
-	MapTree,
-	Value,
+	type FieldKey,
+	type ITreeCursorSynchronous,
+	type MapTree,
+	type Value,
 	isCursor,
 	Multiplicity,
 } from "../core/index.js";
@@ -21,24 +21,24 @@ import { fail, isReadonlyArray } from "../util/index.js";
 // This module currently is assuming use of default-field-kinds.
 // The field kinds should instead come from a view schema registry thats provided somewhere.
 import { fieldKinds } from "./default-schema/index.js";
-import { TreeDataContext } from "./fieldGenerator.js";
+import type { TreeDataContext } from "./fieldGenerator.js";
 import { cursorForMapTreeField, cursorForMapTreeNode, mapTreeFromCursor } from "./mapTreeCursor.js";
-import { FlexFieldKind } from "./modular-schema/index.js";
-import {
+import type { FlexFieldKind } from "./modular-schema/index.js";
+import type {
 	AllowedTypesToFlexInsertableTree,
 	InsertableFlexField,
 	InsertableFlexNode,
 } from "./schema-aware/index.js";
 import {
-	AllowedTypeSet,
+	type AllowedTypeSet,
 	Any,
-	FlexAllowedTypes,
+	type FlexAllowedTypes,
 	FlexFieldNodeSchema,
-	FlexFieldSchema,
+	type FlexFieldSchema,
 	FlexMapNodeSchema,
 	FlexObjectNodeSchema,
-	FlexTreeNodeSchema,
-	FlexTreeSchema,
+	type FlexTreeNodeSchema,
+	type FlexTreeSchema,
 	LeafNodeSchema,
 	allowedTypesSchemaSet,
 } from "./typed-schema/index.js";

package/src/feature-libraries/default-schema/defaultEditBuilder.ts

@@ -5,35 +5,35 @@
 
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
-import { ICodecFamily } from "../../codec/index.js";
+import type { ICodecFamily } from "../../codec/index.js";
 import {
-	ChangeEncodingContext,
-	ChangeFamily,
-	ChangeFamilyEditor,
-	ChangeRebaser,
-	ChangesetLocalId,
+	type ChangeEncodingContext,
+	type ChangeFamily,
+	type ChangeFamilyEditor,
+	type ChangeRebaser,
+	type ChangesetLocalId,
 	CursorLocationType,
-	DeltaDetachedNodeId,
-	DeltaRoot,
-	FieldUpPath,
-	ITreeCursorSynchronous,
-	TaggedChange,
-	UpPath,
+	type DeltaDetachedNodeId,
+	type DeltaRoot,
+	type FieldUpPath,
+	type ITreeCursorSynchronous,
+	type TaggedChange,
+	type UpPath,
 	compareFieldUpPaths,
 	topDownPath,
 } from "../../core/index.js";
 import { brand } from "../../util/index.js";
 import {
-	EditDescription,
-	FieldChangeset,
-	FieldEditDescription,
+	type EditDescription,
+	type FieldChangeset,
+	type FieldEditDescription,
 	ModularChangeFamily,
-	ModularChangeset,
+	type ModularChangeset,
 	ModularEditBuilder,
 	intoDelta as intoModularDelta,
 	relevantRemovedRoots as relevantModularRemovedRoots,
 } from "../modular-schema/index.js";
-import { OptionalChangeset } from "../optional-field/index.js";
+import type { OptionalChangeset } from "../optional-field/index.js";
 
 import { fieldKinds, optional, sequence, required as valueFieldKind } from "./defaultFieldKinds.js";
 

package/src/feature-libraries/default-schema/defaultFieldKinds.ts

@@ -4,27 +4,27 @@
  */
 
 import {
-	ChangesetLocalId,
-	DeltaDetachedNodeId,
-	DeltaFieldChanges,
-	FieldKindIdentifier,
+	type ChangesetLocalId,
+	type DeltaDetachedNodeId,
+	type DeltaFieldChanges,
+	type FieldKindIdentifier,
 	forbiddenFieldKindIdentifier,
 	Multiplicity,
 } from "../../core/index.js";
 import { fail } from "../../util/index.js";
 import {
-	FieldChangeHandler,
-	FieldEditor,
-	FieldKindConfiguration,
-	FieldKindConfigurationEntry,
+	type FieldChangeHandler,
+	type FieldEditor,
+	type FieldKindConfiguration,
+	type FieldKindConfigurationEntry,
 	FieldKindWithEditor,
-	FlexFieldKind,
-	ToDelta,
+	type FlexFieldKind,
+	type ToDelta,
 	allowsTreeSchemaIdentifierSuperset,
 	referenceFreeFieldChangeRebaser,
 } from "../modular-schema/index.js";
 import {
-	OptionalChangeset,
+	type OptionalChangeset,
 	optionalChangeHandler,
 	optionalFieldEditor,
 } from "../optional-field/index.js";

package/src/feature-libraries/default-schema/defaultSchema.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { FullSchemaPolicy } from "../modular-schema/index.js";
+import type { FullSchemaPolicy } from "../modular-schema/index.js";
 
 import { fieldKinds } from "./defaultFieldKinds.js";
 

package/src/feature-libraries/default-schema/noChangeCodecs.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { ICodecFamily, makeCodecFamily, unitCodec } from "../../codec/index.js";
-import { FieldChangeEncodingContext } from "../index.js";
+import { type ICodecFamily, makeCodecFamily, unitCodec } from "../../codec/index.js";
+import type { FieldChangeEncodingContext } from "../index.js";
 
 export const noChangeCodecFamily: ICodecFamily<0, FieldChangeEncodingContext> = makeCodecFamily<
 	0,

package/src/feature-libraries/deltaUtils.ts

@@ -3,8 +3,13 @@
  * Licensed under the MIT License.
  */
 
-import { ChangeAtomId, DeltaDetachedNodeId, DeltaRoot, makeDetachedNodeId } from "../core/index.js";
-import { Mutable } from "../util/index.js";
+import {
+	type ChangeAtomId,
+	type DeltaDetachedNodeId,
+	type DeltaRoot,
+	makeDetachedNodeId,
+} from "../core/index.js";
+import type { Mutable } from "../util/index.js";
 
 export function nodeIdFromChangeAtom(changeAtom: ChangeAtomId): DeltaDetachedNodeId {
 	return makeDetachedNodeId(changeAtom.revision, changeAtom.localId);

package/src/feature-libraries/detachedFieldIndexSummarizer.ts

@@ -4,21 +4,21 @@
  */
 
 import { bufferToString } from "@fluid-internal/client-utils";
-import { IChannelStorageService } from "@fluidframework/datastore-definitions/internal";
-import {
+import type { IChannelStorageService } from "@fluidframework/datastore-definitions/internal";
+import type {
 	IGarbageCollectionData,
 	ISummaryTreeWithStats,
 	ITelemetryContext,
 } from "@fluidframework/runtime-definitions/internal";
 import { createSingleBlobSummary } from "@fluidframework/shared-object-base/internal";
 
-import { DetachedFieldIndex } from "../core/index.js";
-import {
+import type { DetachedFieldIndex } from "../core/index.js";
+import type {
 	Summarizable,
 	SummaryElementParser,
 	SummaryElementStringifier,
 } from "../shared-tree-core/index.js";
-import { JsonCompatibleReadOnly } from "../util/index.js";
+import type { JsonCompatibleReadOnly } from "../util/index.js";
 
 /**
  * The storage key for the blob in the summary containing schema data

package/src/feature-libraries/editableTreeBinder.ts

@@ -6,20 +6,20 @@
 import { assert } from "@fluidframework/core-utils/internal";
 
 import {
-	DetachedPlaceUpPath,
-	DetachedRangeUpPath,
-	FieldKey,
-	PathVisitor,
-	PlaceUpPath,
-	ProtoNodes,
-	RangeUpPath,
-	UpPath,
+	type DetachedPlaceUpPath,
+	type DetachedRangeUpPath,
+	type FieldKey,
+	type PathVisitor,
+	type PlaceUpPath,
+	type ProtoNodes,
+	type RangeUpPath,
+	type UpPath,
 	topDownPath,
 } from "../core/index.js";
-import { Listeners, Listenable } from "../events/index.js";
+import type { Listeners, Listenable } from "../events/index.js";
 import { brand, getOrCreate } from "../util/index.js";
 
-import { FlexTreeNode } from "./flex-tree/index.js";
+import type { FlexTreeNode } from "./flex-tree/index.js";
 
 // TODO:
 // Tests for this file were removed along with the old editable-tree implementation in the commit that includes this note.

package/src/feature-libraries/fieldGenerator.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { FieldKey, MapTree, TreeFieldStoredSchema } from "../core/index.js";
+import type { FieldKey, MapTree, TreeFieldStoredSchema } from "../core/index.js";
 
-import { FlexTreeSchema } from "./typed-schema/index.js";
+import type { FlexTreeSchema } from "./typed-schema/index.js";
 
 /**
  * Information needed to interpret a subtree described by {@link ContextuallyTypedNodeData} and {@link ContextuallyTypedFieldData}.