@fluid-experimental/tree 2.0.0-rc.2.0.6 → 2.0.0-rc.2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-experimental/tree",
-  "version": "2.0.0-rc.2.0.6",
+  "version": "2.0.0-rc.2.0.7",
   "description": "Distributed tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -37,17 +37,17 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@fluid-internal/client-utils": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/container-definitions": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/core-utils": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/id-compressor": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
+    "@fluid-internal/client-utils": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/container-definitions": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/core-utils": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/id-compressor": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
     "@fluidframework/protocol-definitions": "^3.2.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/shared-object-base": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/tree": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/shared-object-base": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/tree": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
     "@tylerbu/sorted-btree-es6": "^1.8.0",
     "buffer": "^6.0.3",
     "denque": "^1.5.1",
@@ -56,20 +56,20 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluid-private/stochastic-test-utils": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluid-private/test-drivers": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
+    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluid-private/stochastic-test-utils": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluid-private/test-drivers": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
     "@fluid-tools/benchmark": "^0.48.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.34.0",
-    "@fluidframework/container-definitions": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/container-loader": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/container-runtime": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
+    "@fluidframework/container-definitions": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/container-loader": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/container-runtime": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
     "@fluidframework/eslint-config-fluid": "^4.0.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/test-utils": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
-    "@fluidframework/undo-redo": ">=2.0.0-rc.2.0.6 <2.0.0-rc.2.1.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/test-utils": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
+    "@fluidframework/undo-redo": ">=2.0.0-rc.2.0.7 <2.0.0-rc.2.1.0",
     "@microsoft/api-extractor": "^7.42.3",
     "@types/chai": "^4.0.0",
     "@types/lru-cache": "^5.1.0",

package/src/SharedTree.ts

@@ -12,6 +12,7 @@ import {
 	IChannelFactory,
 	IChannelAttributes,
 	IChannelServices,
+	IChannel,
 } from '@fluidframework/datastore-definitions';
 import { AttachState } from '@fluidframework/container-definitions';
 import {
@@ -245,7 +246,7 @@ export class SharedTreeFactory implements IChannelFactory {
 		id: string,
 		services: IChannelServices,
 		_channelAttributes: Readonly<IChannelAttributes>
-	): Promise<SharedTree> {
+	): Promise<IChannel> {
 		const sharedTree = this.createSharedTree(runtime, id);
 		await sharedTree.load(services);
 		return sharedTree;
@@ -1066,14 +1067,28 @@ export class SharedTree extends SharedObject<ISharedTreeEvents> implements NodeI
 		// TODO:Type Safety: Improve type safety around op sending/parsing (e.g. discriminated union over version field somehow)
 		switch (op.version) {
 			case WriteFormat.v0_0_2:
-				return this.encoder_0_0_2.decodeEditOp(op, (x) => x, this);
+				return this.encoder_0_0_2.decodeEditOp(op, this.encodeSemiSerializedEdit.bind(this), this);
 			case WriteFormat.v0_1_1:
-				return this.encoder_0_1_1.decodeEditOp(op, (x) => x, this.idNormalizer, this.interner);
+				return this.encoder_0_1_1.decodeEditOp(
+					op,
+					this.encodeSemiSerializedEdit.bind(this),
+					this.idNormalizer,
+					this.interner
+				);
 			default:
 				fail('Unknown op version');
 		}
 	}
 
+	private encodeSemiSerializedEdit<T>(semiSerializedEdit: Edit<T>): Edit<T> {
+		// semiSerializedEdit may have handles which have been replaced by `serializer.encode`.
+		// Since there is no API to un-replace them except via parse, re-stringify the edit, then parse it.
+		// Stringify using JSON, not IFluidSerializer since OPs use JSON directly.
+		// TODO:Performance:#48025: Avoid this serialization round trip.
+		const encodedEdit: Edit<T> = this.serializer.parse(JSON.stringify(semiSerializedEdit));
+		return encodedEdit;
+	}
+
 	private processSequencedEdit(edit: Edit<ChangeInternal>, message: ISequencedDocumentMessage): void {
 		const { id: editId } = edit;
 		const wasLocalEdit = this.editLog.isLocalEdit(editId);
@@ -1366,13 +1381,13 @@ export class SharedTree extends SharedObject<ISharedTreeEvents> implements NodeI
 		if (this.isAttached()) {
 			switch (this.writeFormat) {
 				case WriteFormat.v0_0_2:
-					this.submitOp(this.encoder_0_0_2.encodeEditOp(edit, (x) => x, this));
+					this.submitOp(this.encoder_0_0_2.encodeEditOp(edit, this.serializeEdit.bind(this), this));
 					break;
 				case WriteFormat.v0_1_1:
 					this.submitOp(
 						this.encoder_0_1_1.encodeEditOp(
 							edit,
-							(x) => x,
+							this.serializeEdit.bind(this),
 							this.idCompressor.takeNextCreationRange(),
 							this.idNormalizer,
 							this.interner
@@ -1385,6 +1400,10 @@ export class SharedTree extends SharedObject<ISharedTreeEvents> implements NodeI
 		}
 	}
 
+	private serializeEdit<TChange>(preparedEdit: Edit<TChange>): Edit<TChange> {
+		return this.serializer.encode(preparedEdit, this.handle) as Edit<TChange>;
+	}
+
 	/** A type-safe `submitLocalMessage` wrapper to enforce op format */
 	private submitOp(content: SharedTreeOp | SharedTreeOp_0_0_2, localOpMetadata: unknown = undefined): void {
 		assert(
@@ -1472,7 +1491,7 @@ export class SharedTree extends SharedObject<ISharedTreeEvents> implements NodeI
 
 								stashedEdit = this.encoder_0_1_1.decodeEditOp(
 									sharedTreeOp,
-									(x) => x,
+									this.encodeSemiSerializedEdit.bind(this),
 									normalizer,
 									this.interner
 								);

package/src/migration-shim/migrationShim.ts

@@ -199,12 +199,12 @@ export class MigrationShim extends EventEmitterWithErrorHandling<IMigrationEvent
 			this.runtime.attachState === AttachState.Detached
 				? new NoDeltasChannelServices(services)
 				: this.generateShimServicesOnce(services);
-		this._legacyTree = await this.legacyTreeFactory.load(
+		this._legacyTree = (await this.legacyTreeFactory.load(
 			this.runtime,
 			this.id,
 			shimServices,
 			this.legacyTreeFactory.attributes
-		);
+		)) as LegacySharedTree;
 	}
 	public create(): void {
 		this._legacyTree = this.legacyTreeFactory.create(this.runtime, this.id);