@fluidframework/container-loader 2.1.0-276985 → 2.1.0

package/src/containerStorageAdapter.ts

@@ -20,7 +20,7 @@ import {
 	ISnapshotTree,
 	IVersion,
 } from "@fluidframework/driver-definitions/internal";
-import { UsageError } from "@fluidframework/driver-utils/internal";
+import { isInstanceOfISnapshot, UsageError } from "@fluidframework/driver-utils/internal";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
 // eslint-disable-next-line import/no-deprecated
@@ -31,7 +31,7 @@ import type {
 	ISerializedStateManagerDocumentStorageService,
 	ISnapshotInfo,
 } from "./serializedStateManager.js";
-import { convertSnapshotInfoToSnapshot, getDocumentAttributes } from "./utils.js";
+import { convertSnapshotInfoToSnapshot } from "./utils.js";
 
 /**
  * Stringified blobs from a summary/snapshot tree.
@@ -174,13 +174,15 @@ export class ContainerStorageAdapter
 		let snapshot: ISnapshot;
 		if (
 			this.loadingGroupIdSnapshotsFromPendingState !== undefined &&
-			snapshotFetchOptions?.loadingGroupIds !== undefined
+			snapshotFetchOptions?.loadingGroupIds?.[0] !== undefined
 		) {
 			const localSnapshot =
 				this.loadingGroupIdSnapshotsFromPendingState[snapshotFetchOptions.loadingGroupIds[0]];
 			assert(localSnapshot !== undefined, 0x970 /* Local snapshot must be present */);
-			const attributes = await getDocumentAttributes(this, localSnapshot.baseSnapshot);
-			snapshot = convertSnapshotInfoToSnapshot(localSnapshot, attributes.sequenceNumber);
+			snapshot = convertSnapshotInfoToSnapshot(
+				localSnapshot,
+				localSnapshot.snapshotSequenceNumber,
+			);
 		} else {
 			if (this._storageService.getSnapshot === undefined) {
 				throw new UsageError(
@@ -315,11 +317,19 @@ const redirectTableBlobName = ".redirectTable";
  * Get blob contents of a snapshot tree from storage (or, ideally, cache)
  */
 export async function getBlobContentsFromTree(
-	snapshot: ISnapshotTree,
+	snapshot: ISnapshot | ISnapshotTree,
 	storage: Pick<IDocumentStorageService, "readBlob">,
 ): Promise<ISerializableBlobContents> {
 	const blobs = {};
-	await getBlobContentsFromTreeCore(snapshot, blobs, storage);
+	if (isInstanceOfISnapshot(snapshot)) {
+		const blobContents = snapshot.blobContents;
+		for (const [id, content] of blobContents.entries()) {
+			// ArrayBufferLike will not survive JSON.stringify()
+			blobs[id] = bufferToString(content, "utf8");
+		}
+	} else {
+		await getBlobContentsFromTreeCore(snapshot, blobs, storage);
+	}
 	return blobs;
 }
 
@@ -352,6 +362,7 @@ async function getBlobManagerTreeFromTree(
 	storage: Pick<IDocumentStorageService, "readBlob">,
 ): Promise<void> {
 	const id = tree.blobs[redirectTableBlobName];
+	assert(id !== undefined, 0x9ce /* id is undefined in getBlobManagerTreeFromTree */);
 	const blob = await storage.readBlob(id);
 	// ArrayBufferLike will not survive JSON.stringify()
 	blobs[id] = bufferToString(blob, "utf8");
@@ -394,6 +405,10 @@ function getBlobManagerTreeFromTreeWithBlobContents(
 	blobs: ISerializableBlobContents,
 ): void {
 	const id = tree.blobs[redirectTableBlobName];
+	assert(
+		id !== undefined,
+		0x9cf /* id is undefined in getBlobManagerTreeFromTreeWithBlobContents */,
+	);
 	const blob = tree.blobsContents?.[id];
 	assert(blob !== undefined, 0x70f /* Blob must be present in blobsContents */);
 	// ArrayBufferLike will not survive JSON.stringify()

package/src/contracts.ts

@@ -214,15 +214,9 @@ export const getPackageName = (
 	codeDetails: IFluidCodeDetails | undefined,
 ): IContainerPackageInfo => {
 	// TODO: use a real type
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	let containerPackageName: any;
-	if (codeDetails && "name" in codeDetails) {
-		containerPackageName = codeDetails;
-	} else if (isFluidPackage(codeDetails?.package)) {
-		containerPackageName = codeDetails?.package.name;
-	} else {
-		containerPackageName = codeDetails?.package;
-	}
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-	return { name: containerPackageName };
+	// This is the normal path that any modern customer would hit
+	const containerPackageName: string | undefined = isFluidPackage(codeDetails?.package)
+		? codeDetails?.package.name
+		: codeDetails?.package;
+	return { name: containerPackageName as string };
 };

package/src/deltaManager.ts

@@ -357,16 +357,22 @@ export class DeltaManager<TConnectionManager extends IConnectionManager>
 
 		if (batch.length === 1) {
 			assert(
-				(batch[0].metadata as IBatchMetadata)?.batch === undefined,
+				// 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,
 				0x3c9 /* no batch markup on single message */,
 			);
 		} else {
 			assert(
-				(batch[0].metadata as IBatchMetadata)?.batch === true,
+				// 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,
 				0x3ca /* no start batch markup */,
 			);
 			assert(
-				(batch[batch.length - 1].metadata as IBatchMetadata)?.batch === false,
+				// 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,
 				0x3cb /* no end batch markup */,
 			);
 		}
@@ -892,8 +898,12 @@ export class DeltaManager<TConnectionManager extends IConnectionManager>
 			return;
 		}
 
-		const from = messages[0].sequenceNumber;
-		const last = messages[messages.length - 1].sequenceNumber;
+		// 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;
 
 		// Report stats about missing and duplicate ops
 		// This helps better understand why we fetch ops from storage, and thus may delay
@@ -960,7 +970,9 @@ export class DeltaManager<TConnectionManager extends IConnectionManager>
 			}
 		}
 
-		this.updateLatestKnownOpSeqNumber(messages[messages.length - 1].sequenceNumber);
+		// 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);
 
 		const n = this.previouslyProcessedMessage?.sequenceNumber;
 		assert(

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-loader";
-export const pkgVersion = "2.1.0-276985";
+export const pkgVersion = "2.1.0";

package/src/serializedStateManager.ts

@@ -188,7 +188,9 @@ export class SerializedStateManager {
 		if (pendingLocalState && pendingLocalState.savedOps.length > 0) {
 			const savedOpsSize = pendingLocalState.savedOps.length;
 			this.lastSavedOpSequenceNumber =
-				pendingLocalState.savedOps[savedOpsSize - 1].sequenceNumber;
+				// 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;
 		}
 		containerEvent.on("saved", () => this.updateSnapshotAndProcessedOpsMaybe());
 	}
@@ -240,10 +242,7 @@ export class SerializedStateManager {
 			const baseSnapshotTree: ISnapshotTree | undefined = getSnapshotTree(baseSnapshot);
 			// non-interactive clients will not have any pending state we want to save
 			if (this.offlineLoadEnabled) {
-				const snapshotBlobs = await getBlobContentsFromTree(
-					baseSnapshotTree,
-					this.storageAdapter,
-				);
+				const snapshotBlobs = await getBlobContentsFromTree(baseSnapshot, this.storageAdapter);
 				const attributes = await getDocumentAttributes(this.storageAdapter, baseSnapshotTree);
 				this.snapshot = {
 					baseSnapshot: baseSnapshotTree,
@@ -344,7 +343,9 @@ export class SerializedStateManager {
 		if (
 			snapshotSequenceNumber === undefined ||
 			this.processedOps.length === 0 ||
-			this.processedOps[this.processedOps.length - 1].sequenceNumber <
+			// 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.lastSavedOpSequenceNumber ||
 			this.containerDirty()
 		) {
@@ -352,9 +353,13 @@ export class SerializedStateManager {
 			// Pending state would be behind the latest snapshot.
 			return -1;
 		}
-		const firstProcessedOpSequenceNumber = this.processedOps[0].sequenceNumber;
+		// 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 lastProcessedOpSequenceNumber =
-			this.processedOps[this.processedOps.length - 1].sequenceNumber;
+			// 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;
 
 		if (snapshotSequenceNumber < firstProcessedOpSequenceNumber) {
 			// Snapshot seq number is older than our first processed op, which could mean we're fetching
@@ -380,7 +385,9 @@ export class SerializedStateManager {
 				snapshotSequenceNumber,
 				firstProcessedOpSequenceNumber,
 				newFirstProcessedOpSequenceNumber:
-					this.processedOps.length === 0 ? undefined : this.processedOps[0].sequenceNumber,
+					// 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,
 			});
 		}
 		return snapshotSequenceNumber;
@@ -404,8 +411,9 @@ export class SerializedStateManager {
 				".protocol" in baseSnapshot.trees
 					? baseSnapshot.trees[".protocol"].blobs.attributes
 					: baseSnapshot.blobs[".attributes"];
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-			const attributes = JSON.parse(snapshotBlobs[attributesHash]);
+			// 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!]!);
 			assert(
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				attributes.sequenceNumber === 0,
@@ -513,7 +521,7 @@ export async function getLatestSnapshotInfo(
 
 			const baseSnapshotTree: ISnapshotTree | undefined = getSnapshotTree(baseSnapshot);
 			const snapshotFetchedTime = Date.now();
-			const snapshotBlobs = await getBlobContentsFromTree(baseSnapshotTree, storageAdapter);
+			const snapshotBlobs = await getBlobContentsFromTree(baseSnapshot, storageAdapter);
 			const attributes: IDocumentAttributes = await getDocumentAttributes(
 				storageAdapter,
 				baseSnapshotTree,

package/src/utils.ts

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

package/tsconfig.json

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