Test: Move test function to test package: createDataStoreFactory (#24395)

The function createDataStoreFactory is only used in test and doesn't
make sense out of a test context. So, moving this function to a better
location in a test package.

Author: anthony-murphy

packages/runtime/runtime-utils/src/dataStoreHelpers.ts

@@ -5,11 +5,6 @@
 
 import { IRequest, IResponse } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
-import {
-	IFluidDataStoreFactory,
-	IFluidDataStoreRegistry,
-	IProvideFluidDataStoreRegistry,
-} from "@fluidframework/runtime-definitions/internal";
 import { generateErrorWithStack } from "@fluidframework/telemetry-utils/internal";
 
 interface IResponseException extends Error {
@@ -104,29 +99,3 @@ export function createResponseError(
 		headers,
 	};
 }
-
-/**
- * @internal
- */
-export type Factory = IFluidDataStoreFactory & Partial<IProvideFluidDataStoreRegistry>;
-
-/**
- * @internal
- */
-export function createDataStoreFactory(
-	type: string,
-	factory: Factory | Promise<Factory>,
-): IFluidDataStoreFactory & IFluidDataStoreRegistry {
-	return {
-		type,
-		get IFluidDataStoreFactory() {
-			return this;
-		},
-		get IFluidDataStoreRegistry() {
-			return this;
-		},
-		instantiateDataStore: async (context, existing) =>
-			(await factory).instantiateDataStore(context, existing),
-		get: async (name: string) => (await factory).IFluidDataStoreRegistry?.get(name),
-	};
-}

packages/runtime/runtime-utils/src/index.ts

@@ -6,10 +6,8 @@
 export { generateHandleContextPath } from "./dataStoreHandleContextUtils.js";
 export {
 	create404Response,
-	createDataStoreFactory,
 	createResponseError,
 	exceptionToResponse,
-	Factory,
 	responseToException,
 } from "./dataStoreHelpers.js";
 export {

packages/test/local-server-tests/src/test/opsOnReconnect.spec.ts

@@ -25,12 +25,12 @@ import {
 } from "@fluidframework/local-driver/internal";
 import { SharedDirectory, type ISharedMap, SharedMap } from "@fluidframework/map/internal";
 import { FlushMode, IEnvelope } from "@fluidframework/runtime-definitions/internal";
-import { createDataStoreFactory } from "@fluidframework/runtime-utils/internal";
 import { SharedString } from "@fluidframework/sequence/internal";
 import {
 	ILocalDeltaConnectionServer,
 	LocalDeltaConnectionServer,
 } from "@fluidframework/server-local-server";
+import { createDataStoreFactory } from "@fluidframework/test-utils/internal";
 import {
 	createAndAttachContainerUsingProps,
 	ITestFluidObject,

packages/test/test-end-to-end-tests/src/test/deRehydrateContainerTests.spec.ts

@@ -22,8 +22,8 @@ import type { SharedMatrix } from "@fluidframework/matrix/internal";
 import type { ConsensusOrderedCollection } from "@fluidframework/ordered-collection/internal";
 import type { ConsensusRegisterCollection } from "@fluidframework/register-collection/internal";
 import { IContainerRuntimeBase } from "@fluidframework/runtime-definitions/internal";
-import { createDataStoreFactory } from "@fluidframework/runtime-utils/internal";
 import type { SequenceInterval, SharedString } from "@fluidframework/sequence/internal";
+import { createDataStoreFactory } from "@fluidframework/test-utils/internal";
 import {
 	ITestFluidObject,
 	ITestObjectProvider,

packages/test/test-utils/src/index.ts

@@ -9,6 +9,8 @@ export {
 	fluidEntryPoint,
 	LocalCodeLoader,
 	SupportedExportInterfaces,
+	Factory,
+	createDataStoreFactory,
 } from "./localCodeLoader.js";
 export {
 	createAndAttachContainer,

packages/test/test-utils/src/localCodeLoader.ts

@@ -17,8 +17,9 @@ import { IContainerRuntimeOptions } from "@fluidframework/container-runtime/inte
 import {
 	IProvideFluidDataStoreFactory,
 	IProvideFluidDataStoreRegistry,
+	type IFluidDataStoreFactory,
+	type IFluidDataStoreRegistry,
 } from "@fluidframework/runtime-definitions/internal";
-import { createDataStoreFactory } from "@fluidframework/runtime-utils/internal";
 
 // eslint-disable-next-line import/no-deprecated
 import { ContainerRuntimeFactoryWithDefaultDataStore } from "./containerRuntimeFactories.js";
@@ -39,6 +40,32 @@ export type SupportedExportInterfaces = Partial<
  */
 export type fluidEntryPoint = SupportedExportInterfaces | IFluidModule;
 
+/**
+ * @internal
+ */
+export type Factory = IFluidDataStoreFactory & Partial<IProvideFluidDataStoreRegistry>;
+
+/**
+ * @internal
+ */
+export function createDataStoreFactory(
+	type: string,
+	factory: Factory | Promise<Factory>,
+): IFluidDataStoreFactory & IFluidDataStoreRegistry {
+	return {
+		type,
+		get IFluidDataStoreFactory() {
+			return this;
+		},
+		get IFluidDataStoreRegistry() {
+			return this;
+		},
+		instantiateDataStore: async (context, existing) =>
+			(await factory).instantiateDataStore(context, existing),
+		get: async (name: string) => (await factory).IFluidDataStoreRegistry?.get(name),
+	};
+}
+
 /**
  * A simple code loader that caches a mapping of package name to a Fluid entry point.
  * On load, it retrieves the entry point matching the package name in the given code details.