@fluid-experimental/tree 0.59.3003 → 0.59.4000-71128

package/src/id-compressor/SessionIdNormalizer.ts

@@ -8,6 +8,7 @@
 import { assert, compareFiniteNumbers, compareFiniteNumbersReversed, fail, Mutable } from '../Common';
 import { FinalCompressedId, LocalCompressedId, SessionSpaceCompressedId } from '../Identifiers';
 import { AppendOnlyDoublySortedMap } from './AppendOnlySortedMap';
+import { SerializedSessionIdNormalizer } from './persisted-types';
 
 /**
  * Maps IDs created by a session between their local and final forms (i.e. normalization). These IDs are in a contiguous range.
@@ -319,7 +320,7 @@ export class SessionIdNormalizer<TRangeObject> {
 	}
 
 	public serialize(): SerializedSessionIdNormalizer {
-		const serialized: Mutable<SerializedSessionIdNormalizer> = { localRanges: [] };
+		const serialized: Mutable<SerializedSessionIdNormalizer> = { localRanges: [], nextLocalId: this.nextLocalId };
 		const localRanges = serialized.localRanges as Mutable<typeof serialized.localRanges>;
 		for (const [firstLocal, finalRanges] of this.idRanges.entries()) {
 			const [lastLocal, finalRangesTable] = finalRanges;
@@ -358,6 +359,7 @@ export class SessionIdNormalizer<TRangeObject> {
 			}
 			idRanges.append(firstLocal, [lastLocal, finalRanges]);
 		}
+		normalizer.nextLocalId = serialized.nextLocalId;
 		return normalizer;
 	}
 
@@ -365,52 +367,38 @@ export class SessionIdNormalizer<TRangeObject> {
 		other: SessionIdNormalizer<TRangeObject>,
 		compareRangeObjects: (a: TRangeObject, b: TRangeObject) => boolean = (a, b) => a === b
 	): boolean {
-		return this.idRanges.equals(other.idRanges, (localRangeA, localRangeB) => {
-			const [lastLocalA, finalRangesA] = localRangeA;
-			const [lastLocalB, finalRangesB] = localRangeB;
-			if (finalRangesA === undefined || finalRangesB === undefined) {
-				return finalRangesA === finalRangesB;
-			}
+		return (
+			this.nextLocalId === other.nextLocalId &&
+			this.idRanges.equals(other.idRanges, (localRangeA, localRangeB) => {
+				const [lastLocalA, finalRangesA] = localRangeA;
+				const [lastLocalB, finalRangesB] = localRangeB;
+				if (finalRangesA === undefined || finalRangesB === undefined) {
+					return finalRangesA === finalRangesB;
+				}
 
-			const rangeEquals = (finalRangeA: FinalRange<TRangeObject>, finalRangeB: FinalRange<TRangeObject>) => {
-				const [firstFinalA, lastFinalA, rangeObjectA] = finalRangeA;
-				const [firstFinalB, lastFinalB, rangeObjectB] = finalRangeB;
-				return (
-					firstFinalA === firstFinalB &&
-					lastFinalA === lastFinalB &&
-					compareRangeObjects(rangeObjectA, rangeObjectB)
-				);
-			};
-
-			if (isSingleRange(finalRangesA) || isSingleRange(finalRangesB)) {
-				if (!isSingleRange(finalRangesA) || !isSingleRange(finalRangesB)) {
-					return false;
+				const rangeEquals = (finalRangeA: FinalRange<TRangeObject>, finalRangeB: FinalRange<TRangeObject>) => {
+					const [firstFinalA, lastFinalA, rangeObjectA] = finalRangeA;
+					const [firstFinalB, lastFinalB, rangeObjectB] = finalRangeB;
+					return (
+						firstFinalA === firstFinalB &&
+						lastFinalA === lastFinalB &&
+						compareRangeObjects(rangeObjectA, rangeObjectB)
+					);
+				};
+
+				if (isSingleRange(finalRangesA) || isSingleRange(finalRangesB)) {
+					if (!isSingleRange(finalRangesA) || !isSingleRange(finalRangesB)) {
+						return false;
+					}
+					return rangeEquals(finalRangesA, finalRangesB);
 				}
-				return rangeEquals(finalRangesA, finalRangesB);
-			}
 
-			return lastLocalA === lastLocalB && finalRangesA.equals(finalRangesB, rangeEquals);
-		});
+				return lastLocalA === lastLocalB && finalRangesA.equals(finalRangesB, rangeEquals);
+			})
+		);
 	}
 }
 
-/**
- * Serialized table for normalizing IDs made by the local session.
- *
- * TODO: Move this into ID compressor persisted types when integrated.
- */
-export interface SerializedSessionIdNormalizer {
-	readonly localRanges: readonly (readonly [
-		firstLocal: LocalCompressedId,
-		lastLocal: LocalCompressedId,
-		finalRanges?: readonly (readonly [
-			alignedLocal: LocalCompressedId,
-			firstFinal: FinalCompressedId,
-			lastFinal: FinalCompressedId
-		])[]
-	])[];
-}
-
 type FinalRange<TRangeObject> = [
 	firstFinal: FinalCompressedId,
 	lastFinal: FinalCompressedId,

package/src/id-compressor/persisted-types/0.0.1.ts

@@ -63,22 +63,43 @@ export type SerializedCluster = readonly [
 	overrides?: SerializedClusterOverrides
 ];
 
-export type SerializedLocalOverrides = readonly [LocalCompressedId, string][];
+export type SerializedLocalOverrides = readonly (readonly [LocalCompressedId, string])[];
 
 export interface SerializedLocalState {
 	/**
 	 * The total number of local IDs created by this session
 	 */
-	localIdCount: number;
+	readonly localIdCount: number;
 	/**
 	 * Overrides generated by this session. Omitted if no local overrides exist in the session.
 	 */
-	overrides?: SerializedLocalOverrides;
+	readonly overrides?: SerializedLocalOverrides;
 
 	/**
 	 * The most recent local ID in a range returned by `takeNextCreationRange`.
 	 */
-	lastTakenLocalId: LocalCompressedId | undefined;
+	readonly lastTakenLocalId: LocalCompressedId | undefined;
+
+	/**
+	 * Serialized table for normalizing IDs made by the local session.
+	 */
+	readonly sessionNormalizer: SerializedSessionIdNormalizer;
+}
+
+/**
+ * Serialized table for normalizing IDs made by the local session.
+ */
+export interface SerializedSessionIdNormalizer {
+	readonly nextLocalId: LocalCompressedId;
+	readonly localRanges: readonly (readonly [
+		firstLocal: LocalCompressedId,
+		lastLocal: LocalCompressedId,
+		finalRanges?: readonly (readonly [
+			alignedLocal: LocalCompressedId,
+			firstFinal: FinalCompressedId,
+			lastFinal: FinalCompressedId
+		])[]
+	])[];
 }
 
 /**

package/src/index.ts

@@ -91,6 +91,10 @@ export {
 	TraitLocationInternal,
 } from './persisted-types';
 export {
+	SharedTreeArgs,
+	SharedTreeOptions,
+	SharedTreeOptions_0_0_2,
+	SharedTreeOptions_0_1_1,
 	SharedTreeFactory,
 	SharedTree,
 	EditCommittedHandler,