@fluidframework/aqueduct 2.0.0-dev-rc.4.0.0.261659 → 2.0.0-dev-rc.5.0.0.265721

package/src/data-object-factories/dataObjectFactory.ts

@@ -4,7 +4,7 @@
  */
 
 import { FluidDataStoreRuntime } from "@fluidframework/datastore/internal";
-import { type IChannelFactory } from "@fluidframework/datastore-definitions";
+import { type IChannelFactory } from "@fluidframework/datastore-definitions/internal";
 import {
 	SharedMap,
 	DirectoryFactory,

package/src/data-object-factories/pureDataObjectFactory.ts

@@ -15,7 +15,7 @@ import {
 import {
 	type IChannelFactory,
 	type IFluidDataStoreRuntime,
-} from "@fluidframework/datastore-definitions";
+} from "@fluidframework/datastore-definitions/internal";
 import {
 	type IContainerRuntimeBase,
 	type IDataStore,

package/src/data-objects/dataObject.ts

@@ -5,6 +5,7 @@
 
 // eslint-disable-next-line import/no-deprecated
 import { type ISharedDirectory, MapFactory, SharedDirectory } from "@fluidframework/map/internal";
+import type { SharedObjectKind } from "@fluidframework/shared-object-base";
 
 import { PureDataObject } from "./pureDataObject.js";
 import { type DataObjectTypes } from "./types.js";
@@ -78,3 +79,13 @@ export abstract class DataObject<
 		return `${item} must be initialized before being accessed.`;
 	}
 }
+
+/**
+ * Utility for creating SharedObjectKind instances for data objects.
+ * @internal
+ */
+export function createDataObjectKind<T extends new (...any) => DataObject>(
+	factory: T,
+): T & SharedObjectKind<InstanceType<T>> {
+	return factory as T & SharedObjectKind<InstanceType<T>>;
+}

package/src/data-objects/index.ts

@@ -3,6 +3,6 @@
  * Licensed under the MIT License.
  */
 
-export { DataObject } from "./dataObject.js";
+export { DataObject, createDataObjectKind } from "./dataObject.js";
 export { PureDataObject } from "./pureDataObject.js";
 export type { DataObjectTypes, IDataObjectProps } from "./types.js";

package/src/data-objects/pureDataObject.ts

@@ -6,14 +6,16 @@
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import {
 	type IEvent,
-	type IFluidHandle,
 	type IFluidLoadable,
-	type IProvideFluidHandle,
 	type IRequest,
 	type IResponse,
 } from "@fluidframework/core-interfaces";
+import {
+	type IFluidHandleInternal,
+	type IProvideFluidHandle,
+} from "@fluidframework/core-interfaces/internal";
 import { assert } from "@fluidframework/core-utils/internal";
-import { type IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
+import { type IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions/internal";
 import { type IFluidDataStoreContext } from "@fluidframework/runtime-definitions/internal";
 import { create404Response } from "@fluidframework/runtime-utils/internal";
 import { type AsyncFluidObjectProvider } from "@fluidframework/synthesize/internal";
@@ -69,19 +71,19 @@ export abstract class PureDataObject<I extends DataObjectTypes = DataObjectTypes
 	/**
 	 * {@inheritDoc @fluidframework/core-interfaces#IProvideFluidHandle.IFluidHandle}
 	 */
-	public get IFluidHandle(): IFluidHandle<this> {
+	public get IFluidHandle(): IFluidHandleInternal<this> {
 		return this.handle;
 	}
 
 	/**
 	 * Handle to a data store
 	 */
-	public get handle(): IFluidHandle<this> {
+	public get handle(): IFluidHandleInternal<this> {
 		// PureDataObjectFactory already provides an entryPoint initialization function to the data store runtime,
 		// so this object should always have access to a non-null entryPoint. Need to cast because PureDataObject
 		// tried to be too smart with its typing for handles :).
 		assert(this.runtime.entryPoint !== undefined, 0x46b /* EntryPoint was undefined */);
-		return this.runtime.entryPoint as IFluidHandle<this>;
+		return this.runtime.entryPoint as IFluidHandleInternal<this>;
 	}
 
 	public static async getDataObject(runtime: IFluidDataStoreRuntime): Promise<PureDataObject> {

package/src/data-objects/types.ts

@@ -4,7 +4,7 @@
  */
 
 import { type FluidObject, type IEvent } from "@fluidframework/core-interfaces";
-import { type IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
+import { type IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions/internal";
 import { type IFluidDataStoreContext } from "@fluidframework/runtime-definitions/internal";
 import { type AsyncFluidObjectProvider } from "@fluidframework/synthesize/internal";
 

package/src/index.ts

@@ -24,6 +24,7 @@ export {
 	type DataObjectTypes,
 	type IDataObjectProps,
 	PureDataObject,
+	createDataObjectKind,
 } from "./data-objects/index.js";
 export {
 	BaseContainerRuntimeFactory,