@fluid-experimental/tree 2.0.0-rc.3.0.2 → 2.0.0-rc.4.0.0

package/lib/migration-shim/shimHandle.d.ts

@@ -2,7 +2,8 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { type IFluidHandle } from '@fluidframework/core-interfaces';
+import { type IFluidHandleInternal } from '@fluidframework/core-interfaces/internal';
+import { FluidHandleBase } from '@fluidframework/runtime-utils/internal';
 import { type IShim } from './types.js';
 /**
  * ShimHandle is a special class to handle the fact that we are essentially creating a proxy for a DDS.
@@ -12,14 +13,13 @@ import { type IShim } from './types.js';
  * Local handles such as the FluidObjectHandle and the SharedObjectHandle don't work as they do not properly bind the
  * Shim's underlying DDS.
  */
-export declare class ShimHandle<TShim extends IShim> implements IFluidHandle<TShim> {
+export declare class ShimHandle<TShim extends IShim> extends FluidHandleBase<TShim> {
     private readonly shim;
     constructor(shim: TShim);
     get absolutePath(): string;
     get isAttached(): boolean;
     attachGraph(): void;
     get(): Promise<TShim>;
-    bind(handle: IFluidHandle): void;
-    get IFluidHandle(): IFluidHandle<TShim>;
+    bind(handle: IFluidHandleInternal): void;
 }
 //# sourceMappingURL=shimHandle.d.ts.map

package/lib/migration-shim/shimHandle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shimHandle.d.ts","sourceRoot":"","sources":["../../src/migration-shim/shimHandle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC;;;;;;;GAOG;AACH,qBAAa,UAAU,CAAC,KAAK,SAAS,KAAK,CAAE,YAAW,YAAY,CAAC,KAAK,CAAC;IACvD,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,KAAK;IAE/C,IAAW,YAAY,IAAI,MAAM,CAEhC;IACD,IAAW,UAAU,IAAI,OAAO,CAE/B;IACM,WAAW,IAAI,IAAI;IAGb,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC;IAG3B,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAGvC,IAAW,YAAY,IAAI,YAAY,CAAC,KAAK,CAAC,CAE7C;CACD"}
+{"version":3,"file":"shimHandle.d.ts","sourceRoot":"","sources":["../../src/migration-shim/shimHandle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,eAAe,EAAyB,MAAM,wCAAwC,CAAC;AAEhG,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC;;;;;;;GAOG;AACH,qBAAa,UAAU,CAAC,KAAK,SAAS,KAAK,CAAE,SAAQ,eAAe,CAAC,KAAK,CAAC;IACvD,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,KAAK;IAI/C,IAAW,YAAY,IAAI,MAAM,CAEhC;IACD,IAAW,UAAU,IAAI,OAAO,CAE/B;IACM,WAAW,IAAI,IAAI;IAGb,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC;IAG3B,IAAI,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;CAG/C"}

package/lib/migration-shim/shimHandle.js

@@ -2,6 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { FluidHandleBase, toFluidHandleInternal } from '@fluidframework/runtime-utils/internal';
 /**
  * ShimHandle is a special class to handle the fact that we are essentially creating a proxy for a DDS.
  *
@@ -10,27 +11,25 @@
  * Local handles such as the FluidObjectHandle and the SharedObjectHandle don't work as they do not properly bind the
  * Shim's underlying DDS.
  */
-export class ShimHandle {
+export class ShimHandle extends FluidHandleBase {
     constructor(shim) {
+        super();
         this.shim = shim;
     }
     get absolutePath() {
-        return this.shim.currentTree.handle.absolutePath;
+        return toFluidHandleInternal(this.shim.currentTree.handle).absolutePath;
     }
     get isAttached() {
         return this.shim.currentTree.handle.isAttached;
     }
     attachGraph() {
-        return this.shim.currentTree.handle.attachGraph();
+        return toFluidHandleInternal(this.shim.currentTree.handle).attachGraph();
     }
     async get() {
         return this.shim;
     }
     bind(handle) {
-        return this.shim.currentTree.handle.bind(handle);
-    }
-    get IFluidHandle() {
-        return this;
+        return toFluidHandleInternal(this.shim.currentTree.handle).bind(handle);
     }
 }
 //# sourceMappingURL=shimHandle.js.map

package/lib/migration-shim/shimHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"shimHandle.js","sourceRoot":"","sources":["../../src/migration-shim/shimHandle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH;;;;;;;GAOG;AACH,MAAM,OAAO,UAAU;IACtB,YAAoC,IAAW;QAAX,SAAI,GAAJ,IAAI,CAAO;IAAG,CAAC;IAEnD,IAAW,YAAY;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC;IAClD,CAAC;IACD,IAAW,UAAU;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC;IAChD,CAAC;IACM,WAAW;QACjB,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IACnD,CAAC;IACM,KAAK,CAAC,GAAG;QACf,OAAO,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;IACM,IAAI,CAAC,MAAoB;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IACD,IAAW,YAAY;QACtB,OAAO,IAAI,CAAC;IACb,CAAC;CACD","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { type IFluidHandle } from '@fluidframework/core-interfaces';\n\nimport { type IShim } from './types.js';\n\n/**\n * ShimHandle is a special class to handle the fact that we are essentially creating a proxy for a DDS.\n *\n * ShimHandle is designed for MigrationShim and SharedTreeShim.\n *\n * Local handles such as the FluidObjectHandle and the SharedObjectHandle don't work as they do not properly bind the\n * Shim's underlying DDS.\n */\nexport class ShimHandle<TShim extends IShim> implements IFluidHandle<TShim> {\n\tpublic constructor(private readonly shim: TShim) {}\n\n\tpublic get absolutePath(): string {\n\t\treturn this.shim.currentTree.handle.absolutePath;\n\t}\n\tpublic get isAttached(): boolean {\n\t\treturn this.shim.currentTree.handle.isAttached;\n\t}\n\tpublic attachGraph(): void {\n\t\treturn this.shim.currentTree.handle.attachGraph();\n\t}\n\tpublic async get(): Promise<TShim> {\n\t\treturn this.shim;\n\t}\n\tpublic bind(handle: IFluidHandle): void {\n\t\treturn this.shim.currentTree.handle.bind(handle);\n\t}\n\tpublic get IFluidHandle(): IFluidHandle<TShim> {\n\t\treturn this;\n\t}\n}\n"]}
+{"version":3,"file":"shimHandle.js","sourceRoot":"","sources":["../../src/migration-shim/shimHandle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAIhG;;;;;;;GAOG;AACH,MAAM,OAAO,UAAgC,SAAQ,eAAsB;IAC1E,YAAoC,IAAW;QAC9C,KAAK,EAAE,CAAC;QAD2B,SAAI,GAAJ,IAAI,CAAO;IAE/C,CAAC;IAED,IAAW,YAAY;QACtB,OAAO,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC;IACzE,CAAC;IACD,IAAW,UAAU;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC;IAChD,CAAC;IACM,WAAW;QACjB,OAAO,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1E,CAAC;IACM,KAAK,CAAC,GAAG;QACf,OAAO,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;IACM,IAAI,CAAC,MAA4B;QACvC,OAAO,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzE,CAAC;CACD","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { type IFluidHandleInternal } from '@fluidframework/core-interfaces/internal';\nimport { FluidHandleBase, toFluidHandleInternal } from '@fluidframework/runtime-utils/internal';\n\nimport { type IShim } from './types.js';\n\n/**\n * ShimHandle is a special class to handle the fact that we are essentially creating a proxy for a DDS.\n *\n * ShimHandle is designed for MigrationShim and SharedTreeShim.\n *\n * Local handles such as the FluidObjectHandle and the SharedObjectHandle don't work as they do not properly bind the\n * Shim's underlying DDS.\n */\nexport class ShimHandle<TShim extends IShim> extends FluidHandleBase<TShim> {\n\tpublic constructor(private readonly shim: TShim) {\n\t\tsuper();\n\t}\n\n\tpublic get absolutePath(): string {\n\t\treturn toFluidHandleInternal(this.shim.currentTree.handle).absolutePath;\n\t}\n\tpublic get isAttached(): boolean {\n\t\treturn this.shim.currentTree.handle.isAttached;\n\t}\n\tpublic attachGraph(): void {\n\t\treturn toFluidHandleInternal(this.shim.currentTree.handle).attachGraph();\n\t}\n\tpublic async get(): Promise<TShim> {\n\t\treturn this.shim;\n\t}\n\tpublic bind(handle: IFluidHandleInternal): void {\n\t\treturn toFluidHandleInternal(this.shim.currentTree.handle).bind(handle);\n\t}\n}\n"]}

package/lib/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.42.3"
+      "packageVersion": "7.43.1"
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-experimental/tree",
-  "version": "2.0.0-rc.3.0.2",
+  "version": "2.0.0-rc.4.0.0",
   "description": "Distributed tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -37,17 +37,18 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "dependencies": {
-    "@fluid-internal/client-utils": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/container-definitions": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/core-utils": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/id-compressor": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
+    "@fluid-internal/client-utils": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/container-definitions": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/core-utils": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/id-compressor": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
     "@fluidframework/protocol-definitions": "^3.2.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/shared-object-base": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/tree": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/shared-object-base": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/tree": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
     "@tylerbu/sorted-btree-es6": "^1.8.0",
     "buffer": "^6.0.3",
     "denque": "^1.5.1",
@@ -57,21 +58,21 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.2",
     "@biomejs/biome": "^1.6.2",
-    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluid-private/stochastic-test-utils": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluid-private/test-drivers": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
+    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluid-private/stochastic-test-utils": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluid-private/test-drivers": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
     "@fluid-tools/benchmark": "^0.48.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.37.0",
-    "@fluidframework/container-definitions": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/container-loader": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/container-runtime": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
+    "@fluidframework/build-tools": "^0.38.0",
+    "@fluidframework/container-definitions": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/container-loader": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/container-runtime": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
     "@fluidframework/eslint-config-fluid": "^5.1.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/test-utils": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@fluidframework/undo-redo": ">=2.0.0-rc.3.0.2 <2.0.0-rc.3.1.0",
-    "@microsoft/api-extractor": "^7.42.3",
+    "@fluidframework/runtime-utils": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/test-utils": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@fluidframework/undo-redo": ">=2.0.0-rc.4.0.0 <2.0.0-rc.4.1.0",
+    "@microsoft/api-extractor": "^7.43.1",
     "@types/chai": "^4.0.0",
     "@types/lru-cache": "^5.1.0",
     "@types/mocha": "^9.1.1",

package/src/Checkout.ts

@@ -5,8 +5,11 @@
 
 import { IDisposable, IErrorEvent, ITelemetryBaseProperties } from '@fluidframework/core-interfaces';
 import { assert } from '@fluidframework/core-utils/internal';
-import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils';
-import { EventEmitterWithErrorHandling, createChildLogger } from '@fluidframework/telemetry-utils/internal';
+import {
+	ITelemetryLoggerExt,
+	EventEmitterWithErrorHandling,
+	createChildLogger,
+} from '@fluidframework/telemetry-utils/internal';
 
 import { Change } from './ChangeTypes.js';
 import { RestOrArray, assertWithMessage, fail, unwrapRestOrArray } from './Common.js';

package/src/EditLog.ts

@@ -6,7 +6,7 @@
 import { TypedEventEmitter } from '@fluid-internal/client-utils';
 import type { IEvent } from '@fluidframework/core-interfaces';
 import { assert, compareArrays } from '@fluidframework/core-utils/internal';
-import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils';
+import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils/internal';
 import { BTree } from '@tylerbu/sorted-btree-es6';
 
 import type { ChangeCompressor } from './ChangeCompression.js';

package/src/HistoryEditFactory.ts

@@ -4,7 +4,7 @@
  */
 
 import { assert } from '@fluidframework/core-utils/internal';
-import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils';
+import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils/internal';
 
 import { StablePlace } from './ChangeTypes.js';
 import { fail } from './Common.js';

package/src/MergeHealth.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils';
+import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils/internal';
 
 import { assertNotUndefined, fail } from './Common.js';
 import { PlaceValidationResult, RangeValidationResultKind } from './EditUtilities.js';

package/src/PayloadUtilities.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { IFluidHandle } from '@fluidframework/core-interfaces';
+import { isFluidHandle, toFluidHandleInternal } from '@fluidframework/runtime-utils/internal';
 import { compareArrays } from '@fluidframework/core-utils/internal';
 
 import { Payload } from './persisted-types/index.js';
@@ -65,16 +65,14 @@ export function comparePayloads(a: Payload, b: Payload): boolean {
 	}
 
 	// Special case IFluidHandles, comparing them only by their absolutePath
-	// Detect them using JavaScript feature detection pattern: they have a `IFluidHandle` field that is set to the parent object.
-	{
-		const aHandle = a as IFluidHandle;
-		const bHandle = b as IFluidHandle;
-		if (aHandle.IFluidHandle === a) {
-			if (bHandle.IFluidHandle !== b) {
-				return false;
-			}
-			return a.absolutePath === b.absolutePath;
+	if (isFluidHandle(a)) {
+		if (isFluidHandle(b)) {
+			return toFluidHandleInternal(a).absolutePath === toFluidHandleInternal(b).absolutePath;
 		}
+		return false;
+	}
+	if (isFluidHandle(b)) {
+		return false;
 	}
 
 	// Fluid Serialization (like Json) only keeps enumerable properties, so we can ignore non-enumerable ones.
@@ -107,18 +105,9 @@ export function comparePayloads(a: Payload, b: Payload): boolean {
 		const aItem: Payload = a[aKeys[i]];
 		const bItem: Payload = b[bKeys[i]];
 
-		// The JavaScript feature detection pattern, used for IFluidHandle, uses a field that is set to the parent object.
-		// Detect this pattern and special case it to avoid infinite recursion.
-		const aSelf = Object.is(aItem, a);
-		const bSelf = Object.is(bItem, b);
-		if (aSelf !== bSelf) {
+		if (!comparePayloads(aItem, bItem)) {
 			return false;
 		}
-		if (!aSelf) {
-			if (!comparePayloads(aItem, bItem)) {
-				return false;
-			}
-		}
 	}
 
 	return true;

package/src/SharedTree.ts

@@ -18,10 +18,10 @@ import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'
 import { ISummaryTreeWithStats, ITelemetryContext } from '@fluidframework/runtime-definitions';
 import { IFluidSerializer, ISharedObjectEvents } from '@fluidframework/shared-object-base';
 import { SharedObject, createSingleBlobSummary } from '@fluidframework/shared-object-base/internal';
-import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils';
 import {
 	IEventSampler,
 	ITelemetryLoggerPropertyBags,
+	ITelemetryLoggerExt,
 	PerformanceEvent,
 	createChildLogger,
 	createSampledLogger,
@@ -541,7 +541,7 @@ export class SharedTree extends SharedObject<ISharedTreeEvents> implements NodeI
 		private writeFormat: WriteFormat,
 		options: SharedTreeOptions<typeof writeFormat> = {}
 	) {
-		super(id, runtime, SharedTreeFactory.Attributes, 'fluid_sharedTree_');
+		super(id, runtime, SharedTreeFactory.Attributes, 'fluid_legacySharedTree_');
 		const historyPolicy = this.getHistoryPolicy(options);
 		this.summarizeHistory = historyPolicy.summarizeHistory;
 

package/src/id-compressor/IdCompressor.ts

@@ -5,8 +5,7 @@
 
 import { ITelemetryBaseLogger } from '@fluidframework/core-interfaces';
 import { assert } from '@fluidframework/core-utils/internal';
-import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils';
-import { createChildLogger } from '@fluidframework/telemetry-utils/internal';
+import { ITelemetryLoggerExt, createChildLogger } from '@fluidframework/telemetry-utils/internal';
 import { BTree } from '@tylerbu/sorted-btree-es6';
 
 import {

package/src/migration-shim/shimHandle.ts

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { type IFluidHandle } from '@fluidframework/core-interfaces';
+import { type IFluidHandleInternal } from '@fluidframework/core-interfaces/internal';
+import { FluidHandleBase, toFluidHandleInternal } from '@fluidframework/runtime-utils/internal';
 
 import { type IShim } from './types.js';
 
@@ -15,25 +16,24 @@ import { type IShim } from './types.js';
  * Local handles such as the FluidObjectHandle and the SharedObjectHandle don't work as they do not properly bind the
  * Shim's underlying DDS.
  */
-export class ShimHandle<TShim extends IShim> implements IFluidHandle<TShim> {
-	public constructor(private readonly shim: TShim) {}
+export class ShimHandle<TShim extends IShim> extends FluidHandleBase<TShim> {
+	public constructor(private readonly shim: TShim) {
+		super();
+	}
 
 	public get absolutePath(): string {
-		return this.shim.currentTree.handle.absolutePath;
+		return toFluidHandleInternal(this.shim.currentTree.handle).absolutePath;
 	}
 	public get isAttached(): boolean {
 		return this.shim.currentTree.handle.isAttached;
 	}
 	public attachGraph(): void {
-		return this.shim.currentTree.handle.attachGraph();
+		return toFluidHandleInternal(this.shim.currentTree.handle).attachGraph();
 	}
 	public async get(): Promise<TShim> {
 		return this.shim;
 	}
-	public bind(handle: IFluidHandle): void {
-		return this.shim.currentTree.handle.bind(handle);
-	}
-	public get IFluidHandle(): IFluidHandle<TShim> {
-		return this;
+	public bind(handle: IFluidHandleInternal): void {
+		return toFluidHandleInternal(this.shim.currentTree.handle).bind(handle);
 	}
 }