@fluidframework/map 2.0.0-rc.2.0.6 → 2.0.0-rc.2.0.7

package/src/localValues.ts

@@ -103,19 +103,16 @@ export class PlainLocalValue implements ILocalValue {
 export class LocalValueMaker {
 	/**
 	 * Create a new LocalValueMaker.
+	 * @param serializer - The serializer to serialize / parse handles.
 	 */
-	public constructor() {}
+	public constructor(private readonly serializer: IFluidSerializer) {}
 
 	/**
 	 * Create a new local value from an incoming serialized value.
 	 * @param serializable - The serializable value to make local
 	 */
-	public fromSerializable(
-		// eslint-disable-next-line import/no-deprecated
-		serializable: ISerializableValue,
-		serializer: IFluidSerializer,
-		bind: IFluidHandle,
-	): ILocalValue {
+	// eslint-disable-next-line import/no-deprecated
+	public fromSerializable(serializable: ISerializableValue): ILocalValue {
 		// Migrate from old shared value to handles
 		if (serializable.type === ValueType[ValueType.Shared]) {
 			serializable.type = ValueType[ValueType.Plain];
@@ -123,14 +120,12 @@ export class LocalValueMaker {
 				type: "__fluid_handle__",
 				url: serializable.value as string,
 			};
-			// NOTE: here we require the use of `parseHandles` because the roundtrip
-			// through a string is necessary to resolve the absolute path of
-			// legacy handles (`ValueType.Shared`)
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-			serializable.value = serializer.encode(parseHandles(handle, serializer), bind);
+			serializable.value = handle;
 		}
 
-		return new PlainLocalValue(serializable.value);
+		const translatedValue: unknown = parseHandles(serializable.value, this.serializer);
+
+		return new PlainLocalValue(translatedValue);
 	}
 
 	/**

package/src/mapKernel.ts

@@ -4,7 +4,7 @@
  */
 
 import { IFluidHandle } from "@fluidframework/core-interfaces";
-import { IFluidSerializer, ValueType, bindHandles } from "@fluidframework/shared-object-base";
+import { IFluidSerializer, ValueType } from "@fluidframework/shared-object-base";
 import { assert, unreachableCase } from "@fluidframework/core-utils";
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 // eslint-disable-next-line import/no-deprecated
@@ -182,7 +182,7 @@ export class MapKernel {
 		private readonly isAttached: () => boolean,
 		private readonly eventEmitter: TypedEventEmitter<ISharedMapEvents>,
 	) {
-		this.localValueMaker = new LocalValueMaker();
+		this.localValueMaker = new LocalValueMaker(serializer);
 		this.messageHandlers = this.getMessageHandlers();
 	}
 
@@ -293,23 +293,20 @@ export class MapKernel {
 
 		// Create a local value and serialize it.
 		const localValue = this.localValueMaker.fromInMemory(value);
+		const serializableValue = makeSerializable(localValue, this.serializer, this.handle);
 
 		// Set the value locally.
 		const previousValue = this.setCore(key, localValue, true);
 
 		// If we are not attached, don't submit the op.
 		if (!this.isAttached()) {
-			// this is necessary to bind the potential handles in the value
-			// to this DDS, as we do not walk the object normally unless we
-			// are attached
-			bindHandles(localValue.value, this.serializer, this.handle);
 			return;
 		}
 
 		const op: IMapSetOperation = {
 			key,
 			type: "set",
-			value: { type: localValue.type, value: localValue.value as unknown },
+			value: serializableValue,
 		};
 		this.submitMapKeyMessage(op, previousValue);
 	}
@@ -390,9 +387,7 @@ export class MapKernel {
 	 * @param data - A JSON string containing serialized map data
 	 */
 	public populateFromSerializable(json: IMapDataObjectSerializable): void {
-		for (const [key, serializable] of Object.entries(
-			this.serializer.decode(json) as IMapDataObjectSerializable,
-		)) {
+		for (const [key, serializable] of Object.entries(json)) {
 			const localValue = {
 				key,
 				value: this.makeLocal(key, serializable),
@@ -402,6 +397,10 @@ export class MapKernel {
 		}
 	}
 
+	public populate(json: string): void {
+		this.populateFromSerializable(JSON.parse(json) as IMapDataObjectSerializable);
+	}
+
 	/**
 	 * Submit the given op if a handler is registered.
 	 * @param op - The operation to attempt to submit
@@ -592,11 +591,7 @@ export class MapKernel {
 			serializable.type === ValueType[ValueType.Plain] ||
 			serializable.type === ValueType[ValueType.Shared]
 		) {
-			return this.localValueMaker.fromSerializable(
-				serializable,
-				this.serializer,
-				this.handle,
-			);
+			return this.localValueMaker.fromSerializable(serializable);
 		} else {
 			throw new Error("Unknown local value type");
 		}

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/map";
-export const pkgVersion = "2.0.0-rc.2.0.6";
+export const pkgVersion = "2.0.0-rc.2.0.7";