Expose .is() typeguard on SharedObjectKind

.changeset/gold-badgers-float.md

@@ -0,0 +1,23 @@
+---
+"@fluidframework/shared-object-base": minor
+---
+
+Added typeguard for SharedObjectKinds
+
+In the 2.0 release of Fluid, the concrete class implementations for DDSes were hidden from Fluid's API surface.
+This made `instanceof` checks fail to work correctly.
+There were ways to work around this in application code, but they involved boilerplate which required more understanding of Fluid internals than should be necessary.
+This change adds a drop-in replacement to `instanceof`: the `.is()` method to `SharedObjectKind`.
+For example:
+
+```typescript
+// Works in FluidFramework 1.0 but not in the initial release of FluidFramework 2.0:
+if (myObject instanceof SharedString) {
+	// do something
+}
+
+// With this change, that code can now be written like so:
+if (SharedString.is(myObject)) {
+	// do something
+}
+```

packages/dds/cell/package.json

@@ -135,6 +135,10 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"VariableDeclaration_SharedCell": {
+				"forwardCompat": false
+			}
+		}
 	}
 }

packages/dds/cell/src/test/types/validateCellPrevious.generated.ts

@@ -103,6 +103,7 @@ declare type current_as_old_for_InterfaceDeclaration_ISharedCellEvents = require
  * typeValidation.broken:
  * "VariableDeclaration_SharedCell": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_VariableDeclaration_SharedCell = requireAssignableTo<TypeOnly<typeof old.SharedCell>, TypeOnly<typeof current.SharedCell>>
 
 /*

packages/dds/counter/package.json

@@ -152,6 +152,10 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"VariableDeclaration_SharedCounter": {
+				"forwardCompat": false
+			}
+		}
 	}
 }

packages/dds/counter/src/test/types/validateCounterPrevious.generated.ts

@@ -58,6 +58,7 @@ declare type current_as_old_for_InterfaceDeclaration_ISharedCounterEvents = requ
  * typeValidation.broken:
  * "VariableDeclaration_SharedCounter": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_VariableDeclaration_SharedCounter = requireAssignableTo<TypeOnly<typeof old.SharedCounter>, TypeOnly<typeof current.SharedCounter>>
 
 /*

packages/dds/map/package.json

@@ -166,6 +166,13 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"VariableDeclaration_SharedMap": {
+				"forwardCompat": false
+			},
+			"VariableDeclaration_SharedDirectory": {
+				"forwardCompat": false
+			}
+		}
 	}
 }

packages/dds/map/src/test/types/validateMapPrevious.generated.ts

@@ -229,6 +229,7 @@ declare type current_as_old_for_ClassDeclaration_MapFactory = requireAssignableT
  * typeValidation.broken:
  * "VariableDeclaration_SharedDirectory": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_VariableDeclaration_SharedDirectory = requireAssignableTo<TypeOnly<typeof old.SharedDirectory>, TypeOnly<typeof current.SharedDirectory>>
 
 /*
@@ -265,6 +266,7 @@ declare type current_as_old_for_TypeAliasDeclaration_SharedDirectory = requireAs
  * typeValidation.broken:
  * "VariableDeclaration_SharedMap": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_VariableDeclaration_SharedMap = requireAssignableTo<TypeOnly<typeof old.SharedMap>, TypeOnly<typeof current.SharedMap>>
 
 /*

packages/dds/matrix/package.json

@@ -169,6 +169,10 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"VariableDeclaration_SharedMatrix": {
+				"forwardCompat": false
+			}
+		}
 	}
 }

packages/dds/matrix/src/test/types/validateMatrixPrevious.generated.ts

@@ -112,6 +112,7 @@ declare type current_as_old_for_TypeAliasDeclaration_MatrixItem = requireAssigna
  * typeValidation.broken:
  * "VariableDeclaration_SharedMatrix": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_VariableDeclaration_SharedMatrix = requireAssignableTo<TypeOnly<typeof old.SharedMatrix>, TypeOnly<typeof current.SharedMatrix>>
 
 /*

packages/dds/ordered-collection/package.json

@@ -156,6 +156,10 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"VariableDeclaration_ConsensusQueue": {
+				"forwardCompat": false
+			}
+		}
 	}
 }

packages/dds/ordered-collection/src/test/types/validateOrderedCollectionPrevious.generated.ts

@@ -58,6 +58,7 @@ declare type current_as_old_for_ClassDeclaration_ConsensusOrderedCollection = re
  * typeValidation.broken:
  * "VariableDeclaration_ConsensusQueue": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_VariableDeclaration_ConsensusQueue = requireAssignableTo<TypeOnly<typeof old.ConsensusQueue>, TypeOnly<typeof current.ConsensusQueue>>
 
 /*

packages/dds/register-collection/package.json

@@ -153,6 +153,10 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"VariableDeclaration_ConsensusRegisterCollection": {
+				"forwardCompat": false
+			}
+		}
 	}
 }

packages/dds/register-collection/src/test/types/validateRegisterCollectionPrevious.generated.ts

@@ -22,6 +22,7 @@ declare type MakeUnusedImportErrorsGoAway<T> = TypeOnly<T> | MinimalType<T> | Fu
  * typeValidation.broken:
  * "VariableDeclaration_ConsensusRegisterCollection": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_VariableDeclaration_ConsensusRegisterCollection = requireAssignableTo<TypeOnly<typeof old.ConsensusRegisterCollection>, TypeOnly<typeof current.ConsensusRegisterCollection>>
 
 /*

packages/dds/sequence/package.json

@@ -194,6 +194,9 @@
 		"broken": {
 			"InterfaceDeclaration_SequenceOptions": {
 				"backCompat": false
+			},
+			"VariableDeclaration_SharedString": {
+				"forwardCompat": false
 			}
 		}
 	}

packages/dds/sequence/src/test/types/validateSequencePrevious.generated.ts

@@ -923,6 +923,7 @@ declare type current_as_old_for_ClassDeclaration_SharedSequence = requireAssigna
  * typeValidation.broken:
  * "VariableDeclaration_SharedString": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_VariableDeclaration_SharedString = requireAssignableTo<TypeOnly<typeof old.SharedString>, TypeOnly<typeof current.SharedString>>
 
 /*

packages/dds/shared-object-base/api-report/shared-object-base.beta.api.md

@@ -6,6 +6,7 @@
 
 // @public @sealed
 export interface SharedObjectKind<out TSharedObject = unknown> extends ErasedType<readonly ["SharedObjectKind", TSharedObject]> {
+    is(value: IFluidLoadable): value is IFluidLoadable & TSharedObject;
 }
 
 // (No @packageDocumentation comment for this package)

packages/dds/shared-object-base/api-report/shared-object-base.legacy.alpha.api.md

@@ -91,6 +91,7 @@ export abstract class SharedObjectCore<TEvent extends ISharedObjectEvents = ISha
 
 // @public @sealed
 export interface SharedObjectKind<out TSharedObject = unknown> extends ErasedType<readonly ["SharedObjectKind", TSharedObject]> {
+    is(value: IFluidLoadable): value is IFluidLoadable & TSharedObject;
 }
 
 // (No @packageDocumentation comment for this package)

packages/dds/shared-object-base/api-report/shared-object-base.legacy.public.api.md

@@ -6,6 +6,7 @@
 
 // @public @sealed
 export interface SharedObjectKind<out TSharedObject = unknown> extends ErasedType<readonly ["SharedObjectKind", TSharedObject]> {
+    is(value: IFluidLoadable): value is IFluidLoadable & TSharedObject;
 }
 
 // (No @packageDocumentation comment for this package)

packages/dds/shared-object-base/api-report/shared-object-base.public.api.md

@@ -6,6 +6,7 @@
 
 // @public @sealed
 export interface SharedObjectKind<out TSharedObject = unknown> extends ErasedType<readonly ["SharedObjectKind", TSharedObject]> {
+    is(value: IFluidLoadable): value is IFluidLoadable & TSharedObject;
 }
 
 // (No @packageDocumentation comment for this package)

packages/dds/shared-object-base/src/sharedObject.ts

@@ -7,13 +7,15 @@ import { EventEmitterEventType } from "@fluid-internal/client-utils";
 import { AttachState } from "@fluidframework/container-definitions";
 import type { IDeltaManager } from "@fluidframework/container-definitions/internal";
 import { ITelemetryBaseProperties, type ErasedType } from "@fluidframework/core-interfaces";
-import { type IFluidHandleInternal } from "@fluidframework/core-interfaces/internal";
+import {
+	type IFluidHandleInternal,
+	type IFluidLoadable,
+} from "@fluidframework/core-interfaces/internal";
 import { assert } from "@fluidframework/core-utils/internal";
 import {
 	IChannelServices,
 	IChannelStorageService,
-} from "@fluidframework/datastore-definitions/internal";
-import {
+	type IChannel,
 	IChannelAttributes,
 	type IChannelFactory,
 	IFluidDataStoreRuntime,
@@ -868,9 +870,14 @@ export interface ISharedObjectKind<TSharedObject> {
  * @sealed
  * @public
  */
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface SharedObjectKind<out TSharedObject = unknown>
-	extends ErasedType<readonly ["SharedObjectKind", TSharedObject]> {}
+	extends ErasedType<readonly ["SharedObjectKind", TSharedObject]> {
+	/**
+	 * Check whether an {@link @fluidframework/core-interfaces#IFluidLoadable} is an instance of this shared object kind.
+	 * @remarks This should be used in place of `instanceof` checks for shared objects, as their actual classes are not exported in Fluid's public API.
+	 */
+	is(value: IFluidLoadable): value is IFluidLoadable & TSharedObject;
+}
 
 /**
  * Utility for creating ISharedObjectKind instances.
@@ -884,15 +891,25 @@ export interface SharedObjectKind<out TSharedObject = unknown>
 export function createSharedObjectKind<TSharedObject>(
 	factory: (new () => IChannelFactory<TSharedObject>) & { readonly Type: string },
 ): ISharedObjectKind<TSharedObject> & SharedObjectKind<TSharedObject> {
-	const result: ISharedObjectKind<TSharedObject> = {
+	const result: ISharedObjectKind<TSharedObject> &
+		Omit<SharedObjectKind<TSharedObject>, "brand"> = {
 		getFactory(): IChannelFactory<TSharedObject> {
 			return new factory();
 		},
 
 		create(runtime: IFluidDataStoreRuntime, id?: string): TSharedObject {
 			return runtime.createChannel(id, factory.Type) as TSharedObject;
 		},
+
+		is(value: IFluidLoadable): value is IFluidLoadable & TSharedObject {
+			return isChannel(value) && value.attributes.type === factory.Type;
+		},
 	};
 
 	return result as typeof result & SharedObjectKind<TSharedObject>;
 }
+
+function isChannel(loadable: IFluidLoadable): loadable is IChannel {
+	// This assumes no other IFluidLoadable has an `attributes` field, and thus may not be fully robust.
+	return (loadable as IChannel).attributes !== undefined;
+}

packages/dds/shared-object-base/src/test/createSharedObjectKind.spec.ts

@@ -0,0 +1,84 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { strict as assert } from "assert";
+
+import type { IFluidLoadable } from "@fluidframework/core-interfaces";
+import type {
+	IChannel,
+	IChannelAttributes,
+	IChannelFactory,
+	IChannelServices,
+	IFluidDataStoreRuntime,
+} from "@fluidframework/datastore-definitions/internal";
+import { MockFluidDataStoreRuntime } from "@fluidframework/test-runtime-utils/internal";
+
+import { createSharedObjectKind } from "../sharedObject.js";
+
+interface IFoo {
+	foo: string;
+}
+class SharedFooFactory implements IChannelFactory<IFoo> {
+	public static readonly Type: string = "SharedFoo";
+	public readonly type: string = SharedFooFactory.Type;
+	public readonly attributes: IChannelAttributes = {
+		type: SharedFooFactory.Type,
+		snapshotFormatVersion: "0.1",
+	};
+	async load(
+		runtime: IFluidDataStoreRuntime,
+		id: string,
+		services: IChannelServices,
+		channelAttributes: Readonly<IChannelAttributes>,
+	): Promise<IFoo & IChannel> {
+		throw new Error("Method not implemented.");
+	}
+	create(runtime: IFluidDataStoreRuntime, id: string): IFoo & IChannel {
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		return {
+			foo: "bar",
+			attributes: this.attributes,
+			id,
+			// Note: other IChannel methods aren't relevant
+		} as IFoo & IChannel;
+	}
+}
+
+const SharedFoo = createSharedObjectKind<IFoo>(SharedFooFactory);
+
+describe("createSharedObjectKind's return type", () => {
+	it("delegates to runtime.createChannel on creation", () => {
+		const createChannelCalls: [id: string | undefined, type: string][] = [];
+		const runtime = new MockFluidDataStoreRuntime();
+		runtime.createChannel = (id: string | undefined, type: string) => {
+			createChannelCalls.push([id, type]);
+			return null as unknown as IChannel;
+		};
+		SharedFoo.create(runtime);
+		assert.deepEqual(createChannelCalls, [[undefined, SharedFooFactory.Type]]);
+		createChannelCalls.length = 0;
+		SharedFoo.create(runtime, "test-id");
+		assert.deepEqual(createChannelCalls, [["test-id", SharedFooFactory.Type]]);
+	});
+
+	describe(".is", () => {
+		it("returns true for objects created by the factory", () => {
+			const factory = SharedFoo.getFactory();
+			const foo = factory.create(new MockFluidDataStoreRuntime(), "test-id");
+			assert(SharedFoo.is(foo));
+		});
+		describe("returns false for", () => {
+			const cases: [name: string, obj: unknown][] = [
+				["object without attributres", {}],
+				["object with wrong type", { attributes: { type: "NotSharedFoo" } }],
+			];
+			for (const [name, obj] of cases) {
+				it(name, () => {
+					assert(!SharedFoo.is(obj as IFluidLoadable));
+				});
+			}
+		});
+	});
+});

packages/dds/shared-summary-block/package.json

@@ -154,6 +154,10 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"VariableDeclaration_SharedSummaryBlock": {
+				"forwardCompat": false
+			}
+		}
 	}
 }

packages/dds/shared-summary-block/src/test/types/validateSharedSummaryBlockPrevious.generated.ts

@@ -40,6 +40,7 @@ declare type current_as_old_for_InterfaceDeclaration_ISharedSummaryBlock = requi
  * typeValidation.broken:
  * "VariableDeclaration_SharedSummaryBlock": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_VariableDeclaration_SharedSummaryBlock = requireAssignableTo<TypeOnly<typeof old.SharedSummaryBlock>, TypeOnly<typeof current.SharedSummaryBlock>>
 
 /*

packages/dds/task-manager/package.json

@@ -157,6 +157,10 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"VariableDeclaration_TaskManager": {
+				"forwardCompat": false
+			}
+		}
 	}
 }

packages/dds/task-manager/src/test/types/validateTaskManagerPrevious.generated.ts

@@ -76,6 +76,7 @@ declare type current_as_old_for_TypeAliasDeclaration_TaskEventListener = require
  * typeValidation.broken:
  * "VariableDeclaration_TaskManager": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_VariableDeclaration_TaskManager = requireAssignableTo<TypeOnly<typeof old.TaskManager>, TypeOnly<typeof current.TaskManager>>
 
 /*