@fluidframework/container-loader 2.3.0-288113 → 2.3.1

package/src/deltaManager.ts

@@ -30,11 +30,7 @@ import {
 	type IClientDetails,
 	type IClientConfiguration,
 } from "@fluidframework/driver-definitions/internal";
-import {
-	MessageType2,
-	NonRetryableError,
-	isRuntimeMessage,
-} from "@fluidframework/driver-utils/internal";
+import { NonRetryableError, isRuntimeMessage } from "@fluidframework/driver-utils/internal";
 import {
 	type ITelemetryErrorEventExt,
 	type ITelemetryGenericEventExt,
@@ -116,7 +112,7 @@ function isClientMessage(message: ISequencedDocumentMessage | IDocumentMessage):
 		case MessageType.Propose:
 		case MessageType.Reject:
 		case MessageType.NoOp:
-		case MessageType2.Accept:
+		case MessageType.Accept:
 		case MessageType.Summarize: {
 			return true;
 		}
@@ -357,22 +353,16 @@ export class DeltaManager<TConnectionManager extends IConnectionManager>
 
 		if (batch.length === 1) {
 			assert(
-				// Non null asserting here because of the length check above
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				(batch[0]!.metadata as IBatchMetadata)?.batch === undefined,
+				(batch[0].metadata as IBatchMetadata)?.batch === undefined,
 				0x3c9 /* no batch markup on single message */,
 			);
 		} else {
 			assert(
-				// TODO why are we non null asserting here?
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				(batch[0]!.metadata as IBatchMetadata)?.batch === true,
+				(batch[0].metadata as IBatchMetadata)?.batch === true,
 				0x3ca /* no start batch markup */,
 			);
 			assert(
-				// TODO why are we non null asserting here?
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				(batch[batch.length - 1]!.metadata as IBatchMetadata)?.batch === false,
+				(batch[batch.length - 1].metadata as IBatchMetadata)?.batch === false,
 				0x3cb /* no end batch markup */,
 			);
 		}
@@ -490,8 +480,9 @@ export class DeltaManager<TConnectionManager extends IConnectionManager>
 			if (this.handler === undefined) {
 				throw new Error("Attempted to process an inbound signal without a handler attached");
 			}
+
 			this.handler.processSignal({
-				clientId: message.clientId,
+				...message,
 				content: JSON.parse(message.content as string),
 			});
 		});
@@ -898,12 +889,8 @@ export class DeltaManager<TConnectionManager extends IConnectionManager>
 			return;
 		}
 
-		// Non null asserting here because of the length check above
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		const from = messages[0]!.sequenceNumber;
-		// Non null asserting here because of the length check above
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		const last = messages[messages.length - 1]!.sequenceNumber;
+		const from = messages[0].sequenceNumber;
+		const last = messages[messages.length - 1].sequenceNumber;
 
 		// Report stats about missing and duplicate ops
 		// This helps better understand why we fetch ops from storage, and thus may delay
@@ -970,9 +957,7 @@ export class DeltaManager<TConnectionManager extends IConnectionManager>
 			}
 		}
 
-		// Non null asserting here because of the length check above
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		this.updateLatestKnownOpSeqNumber(messages[messages.length - 1]!.sequenceNumber);
+		this.updateLatestKnownOpSeqNumber(messages[messages.length - 1].sequenceNumber);
 
 		const n = this.previouslyProcessedMessage?.sequenceNumber;
 		assert(
@@ -1046,7 +1031,7 @@ export class DeltaManager<TConnectionManager extends IConnectionManager>
 			});
 		}
 
-		// TODO Remove after SPO picks up the latest build.
+		// TODO: AB#12052: Stop parsing message.contents here, let the downstream handlers do it
 		if (
 			typeof message.contents === "string" &&
 			message.contents !== "" &&

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-loader";
-export const pkgVersion = "2.3.0-288113";
+export const pkgVersion = "2.3.1";

package/src/protocol/protocol.ts

@@ -125,8 +125,7 @@ export class ProtocolOpHandler implements IProtocolHandler {
 			}
 
 			case MessageType.Propose: {
-				// back-compat: ADO #1385: This should become unconditional eventually.
-				// Can be done only after Container.processRemoteMessage() stops parsing content!
+				// This should become unconditional once DeltaManager.processInboundMessage() stops parsing content (ADO #12052)
 				if (typeof message.contents === "string") {
 					message.contents = JSON.parse(message.contents);
 				}

package/src/serializedStateManager.ts

@@ -188,9 +188,7 @@ export class SerializedStateManager {
 		if (pendingLocalState && pendingLocalState.savedOps.length > 0) {
 			const savedOpsSize = pendingLocalState.savedOps.length;
 			this.lastSavedOpSequenceNumber =
-				// Non null asserting here because of the length check above
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				pendingLocalState.savedOps[savedOpsSize - 1]!.sequenceNumber;
+				pendingLocalState.savedOps[savedOpsSize - 1].sequenceNumber;
 		}
 		containerEvent.on("saved", () => this.updateSnapshotAndProcessedOpsMaybe());
 	}
@@ -343,9 +341,7 @@ export class SerializedStateManager {
 		if (
 			snapshotSequenceNumber === undefined ||
 			this.processedOps.length === 0 ||
-			// Non null asserting here because of the length check above
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			this.processedOps[this.processedOps.length - 1]!.sequenceNumber <
+			this.processedOps[this.processedOps.length - 1].sequenceNumber <
 				this.lastSavedOpSequenceNumber ||
 			this.containerDirty()
 		) {
@@ -353,13 +349,9 @@ export class SerializedStateManager {
 			// Pending state would be behind the latest snapshot.
 			return -1;
 		}
-		// Non null asserting here because of the length check above
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		const firstProcessedOpSequenceNumber = this.processedOps[0]!.sequenceNumber;
+		const firstProcessedOpSequenceNumber = this.processedOps[0].sequenceNumber;
 		const lastProcessedOpSequenceNumber =
-			// Non null asserting here because of the length check above
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			this.processedOps[this.processedOps.length - 1]!.sequenceNumber;
+			this.processedOps[this.processedOps.length - 1].sequenceNumber;
 
 		if (snapshotSequenceNumber < firstProcessedOpSequenceNumber) {
 			// Snapshot seq number is older than our first processed op, which could mean we're fetching
@@ -385,9 +377,7 @@ export class SerializedStateManager {
 				snapshotSequenceNumber,
 				firstProcessedOpSequenceNumber,
 				newFirstProcessedOpSequenceNumber:
-					// Non null asserting here because of the length check above
-					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-					this.processedOps.length === 0 ? undefined : this.processedOps[0]!.sequenceNumber,
+					this.processedOps.length === 0 ? undefined : this.processedOps[0].sequenceNumber,
 			});
 		}
 		return snapshotSequenceNumber;
@@ -411,9 +401,8 @@ export class SerializedStateManager {
 				".protocol" in baseSnapshot.trees
 					? baseSnapshot.trees[".protocol"].blobs.attributes
 					: baseSnapshot.blobs[".attributes"];
-			// TODO why are we non null asserting here?
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-non-null-assertion
-			const attributes = JSON.parse(snapshotBlobs[attributesHash!]!);
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+			const attributes = JSON.parse(snapshotBlobs[attributesHash]);
 			assert(
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				attributes.sequenceNumber === 0,

package/src/utils.ts

@@ -94,12 +94,8 @@ export function tryParseCompatibleResolvedUrl(url: string): IParsedUrl | undefin
 	const match = regex.exec(parsed.pathname);
 	return match?.length === 3
 		? {
-				// Non null asserting here because of the length check above
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				id: match[1]!,
-				// Non null asserting here because of the length check above
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				path: match[2]!,
+				id: match[1],
+				path: match[2],
 				query,
 				// URLSearchParams returns null if the param is not provided.
 				version: parsed.searchParams.get("version") ?? undefined,
@@ -151,9 +147,7 @@ function convertSummaryToSnapshotAndBlobs(summary: ISummaryTree): SnapshotWithBl
 	};
 	const keys = Object.keys(summary.tree);
 	for (const key of keys) {
-		// TODO change this to use object.entries
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		const summaryObject = summary.tree[key]!;
+		const summaryObject = summary.tree[key];
 
 		switch (summaryObject.type) {
 			case SummaryType.Tree: {
@@ -286,9 +280,8 @@ export const combineSnapshotTreeAndSnapshotBlobs = (
 
 	// Process blobs in the current level
 	for (const [, id] of Object.entries(baseSnapshot.blobs)) {
-		const snapshot = snapshotBlobs[id];
-		if (snapshot !== undefined) {
-			blobsContents[id] = stringToBuffer(snapshot, "utf8");
+		if (snapshotBlobs[id]) {
+			blobsContents[id] = stringToBuffer(snapshotBlobs[id], "utf8");
 		}
 	}
 
@@ -427,9 +420,7 @@ export async function getDocumentAttributes(
 			? tree.trees[".protocol"].blobs.attributes
 			: tree.blobs[".attributes"];
 
-	// Non null asserting here because of the length check above
-	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-	const attributes = await readAndParse<IDocumentAttributes>(storage, attributesHash!);
+	const attributes = await readAndParse<IDocumentAttributes>(storage, attributesHash);
 
 	return attributes;
 }

package/tsconfig.json

@@ -5,6 +5,7 @@
 	"compilerOptions": {
 		"rootDir": "./src",
 		"outDir": "./lib",
+		"noUncheckedIndexedAccess": false,
 		"exactOptionalPropertyTypes": false,
 	},
 }