@fluidframework/test-utils 2.5.0 → 2.10.0-305357

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/test-utils",
-  "version": "2.5.0",
+  "version": "2.10.0-305357",
   "description": "Utilities for Fluid tests",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -67,26 +67,26 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/test-driver-definitions": "~2.5.0",
-    "@fluidframework/aqueduct": "~2.5.0",
-    "@fluidframework/container-definitions": "~2.5.0",
-    "@fluidframework/container-loader": "~2.5.0",
-    "@fluidframework/container-runtime": "~2.5.0",
-    "@fluidframework/container-runtime-definitions": "~2.5.0",
-    "@fluidframework/core-interfaces": "~2.5.0",
-    "@fluidframework/core-utils": "~2.5.0",
-    "@fluidframework/datastore": "~2.5.0",
-    "@fluidframework/datastore-definitions": "~2.5.0",
-    "@fluidframework/driver-definitions": "~2.5.0",
-    "@fluidframework/driver-utils": "~2.5.0",
-    "@fluidframework/local-driver": "~2.5.0",
-    "@fluidframework/map": "~2.5.0",
-    "@fluidframework/odsp-driver": "~2.5.0",
-    "@fluidframework/request-handler": "~2.5.0",
-    "@fluidframework/routerlicious-driver": "~2.5.0",
-    "@fluidframework/runtime-definitions": "~2.5.0",
-    "@fluidframework/runtime-utils": "~2.5.0",
-    "@fluidframework/telemetry-utils": "~2.5.0",
+    "@fluid-internal/test-driver-definitions": "2.10.0-305357",
+    "@fluidframework/aqueduct": "2.10.0-305357",
+    "@fluidframework/container-definitions": "2.10.0-305357",
+    "@fluidframework/container-loader": "2.10.0-305357",
+    "@fluidframework/container-runtime": "2.10.0-305357",
+    "@fluidframework/container-runtime-definitions": "2.10.0-305357",
+    "@fluidframework/core-interfaces": "2.10.0-305357",
+    "@fluidframework/core-utils": "2.10.0-305357",
+    "@fluidframework/datastore": "2.10.0-305357",
+    "@fluidframework/datastore-definitions": "2.10.0-305357",
+    "@fluidframework/driver-definitions": "2.10.0-305357",
+    "@fluidframework/driver-utils": "2.10.0-305357",
+    "@fluidframework/local-driver": "2.10.0-305357",
+    "@fluidframework/map": "2.10.0-305357",
+    "@fluidframework/odsp-driver": "2.10.0-305357",
+    "@fluidframework/request-handler": "2.10.0-305357",
+    "@fluidframework/routerlicious-driver": "2.10.0-305357",
+    "@fluidframework/runtime-definitions": "2.10.0-305357",
+    "@fluidframework/runtime-utils": "2.10.0-305357",
+    "@fluidframework/telemetry-utils": "2.10.0-305357",
     "best-random": "^1.0.0",
     "debug": "^4.3.4",
     "mocha": "^10.2.0",
@@ -95,12 +95,12 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.16.4",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "~2.5.0",
-    "@fluid-tools/build-cli": "^0.49.0",
+    "@fluid-internal/mocha-test-setup": "2.10.0-305357",
+    "@fluid-tools/build-cli": "^0.50.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.49.0",
+    "@fluidframework/build-tools": "^0.50.0",
     "@fluidframework/eslint-config-fluid": "^5.4.0",
-    "@fluidframework/test-utils-previous": "npm:@fluidframework/test-utils@~2.4.0",
+    "@fluidframework/test-utils-previous": "npm:@fluidframework/test-utils@2.5.0",
     "@microsoft/api-extractor": "7.47.8",
     "@types/debug": "^4.1.5",
     "@types/diff": "^3.5.1",
@@ -120,7 +120,20 @@
     "typescript": "~5.4.5"
   },
   "typeValidation": {
-    "broken": {},
+    "broken": {
+      "Class_TestFluidObject": {
+        "backCompat": false
+      },
+      "ClassStatics_TestFluidObject": {
+        "backCompat": false
+      },
+      "Interface_ITestFluidObject": {
+        "backCompat": false
+      },
+      "Interface_IProvideTestFluidObject": {
+        "backCompat": false
+      }
+    },
     "entrypoint": "legacy"
   },
   "scripts": {

package/src/containerUtils.ts

@@ -3,10 +3,19 @@
  * Licensed under the MIT License.
  */
 
-import { IContainer } from "@fluidframework/container-definitions/internal";
+import {
+	IContainer,
+	IDeltaManager,
+	type IDeltaManagerFull,
+} from "@fluidframework/container-definitions/internal";
 import { ConnectionState } from "@fluidframework/container-loader";
 import { IResponse } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
+import type { IDeltaManagerErased } from "@fluidframework/datastore-definitions/internal";
+import type {
+	IDocumentMessage,
+	ISequencedDocumentMessage,
+} from "@fluidframework/driver-definitions/internal";
 import { IDataStore } from "@fluidframework/runtime-definitions/internal";
 
 import { PromiseExecutor, TimeoutWithError, timeoutPromise } from "./timeoutUtils.js";
@@ -89,3 +98,20 @@ export async function getDataStoreEntryPointBackCompat<T>(dataStore: IDataStore)
 	assert(response.status === 200, "empty request should return data object");
 	return response.value as T;
 }
+
+/**
+ * @internal
+ */
+export function toIDeltaManagerFull(
+	deltaManager:
+		| IDeltaManager<ISequencedDocumentMessage, IDocumentMessage>
+		| IDeltaManagerErased,
+): IDeltaManagerFull {
+	assert(
+		"inbound" in deltaManager && "outbound" in deltaManager,
+		"Delta manager does not have inbound/outbound queues.",
+	);
+	return deltaManager as unknown as
+		| IDeltaManagerErased
+		| IDeltaManager<ISequencedDocumentMessage, IDocumentMessage> as IDeltaManagerFull;
+}

package/src/index.ts

@@ -56,6 +56,7 @@ export {
 	type TimeoutWithValue,
 } from "./timeoutUtils.js";
 export {
+	toIDeltaManagerFull,
 	waitForContainerConnection,
 	getContainerEntryPointBackCompat,
 	getDataStoreEntryPointBackCompat,

package/src/loaderContainerTracker.ts

@@ -22,7 +22,7 @@ import {
 } from "@fluidframework/driver-definitions/internal";
 import { canBeCoalescedByService } from "@fluidframework/driver-utils/internal";
 
-import { waitForContainerConnection } from "./containerUtils.js";
+import { toIDeltaManagerFull, waitForContainerConnection } from "./containerUtils.js";
 import { debug } from "./debug.js";
 import { IOpProcessingController } from "./testObjectProvider.js";
 import { timeoutAwait, timeoutPromise } from "./timeoutUtils.js";
@@ -145,7 +145,8 @@ export class LoaderContainerTracker implements IOpProcessingController {
 	 * @param record - the record to update the trailing op information
 	 */
 	private trackTrailingNoOps(container: IContainer, record: ContainerRecord) {
-		container.deltaManager.outbound.on("op", (messages) => {
+		const deltaManagerFull = toIDeltaManagerFull(container.deltaManager);
+		deltaManagerFull.outbound.on("op", (messages) => {
 			for (const msg of messages) {
 				if (canBeCoalescedByService(msg)) {
 					// Track the NoOp that was sent.
@@ -161,7 +162,7 @@ export class LoaderContainerTracker implements IOpProcessingController {
 			}
 		});
 
-		container.deltaManager.inbound.on("push", (message) => {
+		deltaManagerFull.inbound.on("push", (message) => {
 			// Received the no op back, update the record if we are tracking
 			if (
 				canBeCoalescedByService(message) &&
@@ -458,12 +459,12 @@ export class LoaderContainerTracker implements IOpProcessingController {
 		return new Promise<void>((resolve) => {
 			const handler = () => {
 				containersToApply.map((c) => {
-					c.deltaManager.inbound.off("push", handler);
+					toIDeltaManagerFull(c.deltaManager).inbound.off("push", handler);
 				});
 				resolve();
 			};
 			containersToApply.map((c) => {
-				c.deltaManager.inbound.on("push", handler);
+				toIDeltaManagerFull(c.deltaManager).inbound.on("push", handler);
 			});
 		});
 	}
@@ -482,8 +483,9 @@ export class LoaderContainerTracker implements IOpProcessingController {
 			);
 			if (record?.paused === true) {
 				debugWait(`${record.index}: container resumed`);
-				container.deltaManager.inbound.resume();
-				container.deltaManager.outbound.resume();
+				const deltaManagerFull = toIDeltaManagerFull(container.deltaManager);
+				deltaManagerFull.inbound.resume();
+				deltaManagerFull.outbound.resume();
 				resumed.push(container);
 				record.paused = false;
 			}
@@ -526,12 +528,13 @@ export class LoaderContainerTracker implements IOpProcessingController {
 	 */
 	private async pauseContainer(container: IContainer, record: ContainerRecord) {
 		debugWait(`${record.index}: pausing container`);
-		assert(!container.deltaManager.outbound.paused, "Container should not be paused yet");
-		assert(!container.deltaManager.inbound.paused, "Container should not be paused yet");
+		const deltaManagerFull = toIDeltaManagerFull(container.deltaManager);
+		assert(!deltaManagerFull.outbound.paused, "Container should not be paused yet");
+		assert(!deltaManagerFull.inbound.paused, "Container should not be paused yet");
 
 		// Pause outbound
 		debugWait(`${record.index}: pausing container outbound queues`);
-		await container.deltaManager.outbound.pause();
+		await deltaManagerFull.outbound.pause();
 
 		// Ensure the container is connected first.
 		if (container.connectionState !== ConnectionState.Connected) {
@@ -542,7 +545,7 @@ export class LoaderContainerTracker implements IOpProcessingController {
 		// Check if the container is in write mode
 		if (!container.deltaManager.active) {
 			let proposalP: Promise<boolean> | undefined;
-			if (container.deltaManager.outbound.idle) {
+			if (deltaManagerFull.outbound.idle) {
 				// Need to generate an op to force write mode
 				debugWait(`${record.index}: container force write connection`);
 				const maybeContainer = container as Partial<IContainer>;
@@ -556,11 +559,11 @@ export class LoaderContainerTracker implements IOpProcessingController {
 
 			// Wait for nack
 			debugWait(`${record.index}: Wait for container disconnect`);
-			container.deltaManager.outbound.resume();
+			deltaManagerFull.outbound.resume();
 			await new Promise<void>((resolve) => container.once("disconnected", resolve));
 			const accepted = proposalP ? await proposalP : false;
 			assert(!accepted, "A proposal in read mode should be rejected");
-			await container.deltaManager.outbound.pause();
+			await deltaManagerFull.outbound.pause();
 
 			// Ensure the container is reconnect.
 			if (container.connectionState !== ConnectionState.Connected) {
@@ -572,7 +575,7 @@ export class LoaderContainerTracker implements IOpProcessingController {
 		debugWait(`${record.index}: pausing container inbound queues`);
 
 		// Pause inbound
-		await container.deltaManager.inbound.pause();
+		await deltaManagerFull.inbound.pause();
 
 		debugWait(`${record.index}: container paused`);
 
@@ -588,7 +591,10 @@ export class LoaderContainerTracker implements IOpProcessingController {
 	 * Pausing will switch the container to write mode. See `pauseProcessing`
 	 */
 	public async processIncoming(...containers: IContainer[]) {
-		return this.processQueue(containers, (container) => container.deltaManager.inbound);
+		return this.processQueue(
+			containers,
+			(container) => toIDeltaManagerFull(container.deltaManager).inbound,
+		);
 	}
 
 	/**
@@ -599,7 +605,10 @@ export class LoaderContainerTracker implements IOpProcessingController {
 	 * Pausing will switch the container to write mode. See `pauseProcessing`
 	 */
 	public async processOutgoing(...containers: IContainer[]) {
-		return this.processQueue(containers, (container) => container.deltaManager.outbound);
+		return this.processQueue(
+			containers,
+			(container) => toIDeltaManagerFull(container.deltaManager).outbound,
+		);
 	}
 
 	/**
@@ -678,12 +687,13 @@ export class LoaderContainerTracker implements IOpProcessingController {
 			}
 		};
 
-		container.deltaManager.outbound.on("op", outHandler);
-		container.deltaManager.inbound.on("push", inHandler);
+		const deltaManagerFull = toIDeltaManagerFull(container.deltaManager);
+		deltaManagerFull.outbound.on("op", outHandler);
+		deltaManagerFull.inbound.on("push", inHandler);
 
 		return () => {
-			container.deltaManager.outbound.off("op", outHandler);
-			container.deltaManager.inbound.off("push", inHandler);
+			deltaManagerFull.outbound.off("op", outHandler);
+			deltaManagerFull.inbound.off("push", inHandler);
 		};
 	}
 
@@ -726,7 +736,8 @@ export class LoaderContainerTracker implements IOpProcessingController {
 				}
 			};
 			debugOp(`${index}: ADD: clientId: ${container.clientId}`);
-			container.deltaManager.outbound.on("op", (messages) => {
+			const deltaManagerFull = toIDeltaManagerFull(container.deltaManager);
+			deltaManagerFull.outbound.on("op", (messages) => {
 				for (const msg of messages) {
 					debugOp(
 						`${index}: OUT:          ` +
@@ -749,8 +760,8 @@ export class LoaderContainerTracker implements IOpProcessingController {
 					);
 				};
 			};
-			container.deltaManager.inbound.on("push", getInboundHandler("IN "));
-			container.deltaManager.inbound.on("op", getInboundHandler("OP "));
+			deltaManagerFull.inbound.on("push", getInboundHandler("IN "));
+			deltaManagerFull.inbound.on("op", getInboundHandler("OP "));
 			container.deltaManager.on("connect", (details) => {
 				debugOp(`${index}: CON: clientId: ${details.clientId}`);
 			});

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/test-utils";
-export const pkgVersion = "2.5.0";
+export const pkgVersion = "2.10.0-305357";