@fluidframework/odsp-driver 2.1.0-276985 → 2.1.0-281041

package/src/odspDocumentStorageServiceBase.ts

@@ -198,7 +198,8 @@ export abstract class OdspDocumentStorageServiceBase implements IDocumentStorage
 				// eslint-disable-next-line unicorn/no-null
 				return null;
 			}
-			id = versions[0].id;
+			// Non null asserting here because of the length check above
+			id = versions[0]!.id;
 		}
 
 		const snapshotTree = await this.readTree(id, scenarioName);
@@ -257,7 +258,8 @@ export abstract class OdspDocumentStorageServiceBase implements IDocumentStorage
 	protected combineProtocolAndAppSnapshotTree(snapshotTree: ISnapshotTree): ISnapshotTree {
 		// When we upload the container snapshot, we upload appTree in ".app" and protocol tree in ".protocol"
 		// So when we request the snapshot we get ".app" as tree and not as commit node as in the case just above.
-		const hierarchicalAppTree = snapshotTree.trees[".app"];
+		// TODO Why are we non null asserting here?
+		const hierarchicalAppTree = snapshotTree.trees[".app"]!;
 		const hierarchicalProtocolTree = snapshotTree.trees[".protocol"];
 		const summarySnapshotTree: ISnapshotTree = {
 			blobs: {

package/src/odspDriverUrlResolver.ts

@@ -262,7 +262,8 @@ export function decodeOdspUrl(url: string): {
 	}
 
 	return {
-		siteUrl,
+		// TODO Why are we non null asserting here?
+		siteUrl: siteUrl!,
 		driveId: decodeURIComponent(driveId),
 		itemId: decodeURIComponent(itemId),
 		path: decodeURIComponent(path),

package/src/odspSnapshotParser.ts

@@ -28,7 +28,8 @@ function buildHierarchy(flatTree: IOdspSnapshotCommit): ISnapshotTree {
 		const entryPathBase = entry.path.slice(lastIndex + 1);
 
 		// ODSP snapshots are created breadth-first so we can assume we see tree nodes prior to their contents
-		const node = lookup[entryPathDir];
+		// TODO Why are we non null asserting here?
+		const node = lookup[entryPathDir]!;
 
 		// Add in either the blob or tree
 		if (entry.type === "tree") {
@@ -69,16 +70,19 @@ export function convertOdspSnapshotToSnapshotTreeAndBlobs(
 		}
 	}
 
-	const sequenceNumber = odspSnapshot?.trees[0].sequenceNumber;
+	// TODO Why are we non null asserting here?
+	const sequenceNumber = odspSnapshot?.trees[0]!.sequenceNumber;
 
 	const val: ISnapshot = {
 		blobContents: blobsWithBufferContent,
 		ops: odspSnapshot.ops?.map((op) => op.op) ?? [],
 		sequenceNumber,
-		snapshotTree: buildHierarchy(odspSnapshot.trees[0]),
+		// TODO Why are we non null asserting here?
+		snapshotTree: buildHierarchy(odspSnapshot.trees[0]!),
 		latestSequenceNumber:
 			odspSnapshot.ops && odspSnapshot.ops.length > 0
-				? odspSnapshot.ops[odspSnapshot.ops.length - 1].sequenceNumber
+				? // Non null asserting here because of the length check above
+					odspSnapshot.ops[odspSnapshot.ops.length - 1]!.sequenceNumber
 				: sequenceNumber,
 		snapshotFormatV: 1,
 	};

package/src/odspSummaryUploadManager.ts

@@ -180,7 +180,8 @@ export class OdspSummaryUploadManager {
 		const keys = Object.keys(tree.tree);
 		for (const key of keys) {
 			assert(!key.includes("/"), "id should not include slashes");
-			const summaryObject = tree.tree[key];
+			// Non null asserting for now, this should be changed to Object.entries
+			const summaryObject = tree.tree[key]!;
 
 			let id: string | undefined;
 			let value: OdspSummaryTreeValue | undefined;

package/src/odspUrlHelper.ts

@@ -110,8 +110,10 @@ export async function getOdspUrlParts(url: URL): Promise<IOdspUrlParts | undefin
 			}
 		}
 
-		const driveId = joinSessionMatch[3] || joinSessionMatch[5];
-		const itemId = joinSessionMatch[4];
+		// TODO Why are we non null asserting here?
+		const driveId = joinSessionMatch[3] ?? joinSessionMatch[5]!;
+		// TODO Why are we non null asserting here?
+		const itemId = joinSessionMatch[4]!;
 
 		return { siteUrl: `${url.origin}${url.pathname}`, driveId, itemId };
 	} else {
@@ -120,8 +122,10 @@ export async function getOdspUrlParts(url: URL): Promise<IOdspUrlParts | undefin
 		if (joinSessionMatch === null) {
 			return undefined;
 		}
-		const driveId = joinSessionMatch[2];
-		const itemId = joinSessionMatch[3];
+		// TODO Why are we non null asserting here?
+		const driveId = joinSessionMatch[2]!;
+		// TODO Why are we non null asserting here?
+		const itemId = joinSessionMatch[3]!;
 
 		return { siteUrl: `${url.origin}${url.pathname}`, driveId, itemId };
 	}

package/src/odspUtils.ts

@@ -38,8 +38,10 @@ import {
 	isTokenFromCache,
 	snapshotKey,
 	tokenFromResponse,
+	snapshotWithLoadingGroupIdKey,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
+	type IConfigProvider,
 	type IFluidErrorBase,
 	ITelemetryLoggerExt,
 	PerformanceEvent,
@@ -453,9 +455,12 @@ export function toInstrumentedOdspTokenFetcher(
 	};
 }
 
-export function createCacheSnapshotKey(odspResolvedUrl: IOdspResolvedUrl): ICacheEntry {
+export function createCacheSnapshotKey(
+	odspResolvedUrl: IOdspResolvedUrl,
+	snapshotWithLoadingGroupId: boolean | undefined,
+): ICacheEntry {
 	const cacheEntry: ICacheEntry = {
-		type: snapshotKey,
+		type: snapshotWithLoadingGroupId ? snapshotWithLoadingGroupIdKey : snapshotKey,
 		key: odspResolvedUrl.fileVersion ?? "",
 		file: {
 			resolvedUrl: odspResolvedUrl,
@@ -465,6 +470,12 @@ export function createCacheSnapshotKey(odspResolvedUrl: IOdspResolvedUrl): ICach
 	return cacheEntry;
 }
 
+export function snapshotWithLoadingGroupIdSupported(
+	config: IConfigProvider,
+): boolean | undefined {
+	return config.getBoolean("Fluid.Container.UseLoadingGroupIdForSnapshotFetch2");
+}
+
 // 80KB is the max body size that we can put in ump post body for server to be able to accept it.
 // Keeping it 78KB to be a little cautious. As per the telemetry 99p is less than 78KB.
 export const maxUmpPostBodySize = 79872;

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/odsp-driver";
-export const pkgVersion = "2.1.0-276985";
+export const pkgVersion = "2.1.0-281041";

package/src/prefetchLatestSnapshot.ts

@@ -35,6 +35,7 @@ import {
 	createCacheSnapshotKey,
 	createOdspLogger,
 	getOdspResolvedUrl,
+	snapshotWithLoadingGroupIdSupported,
 	toInstrumentedOdspStorageTokenFetcher,
 	type TokenFetchOptionsEx,
 } from "./odspUtils.js";
@@ -76,9 +77,7 @@ export async function prefetchLatestSnapshot(
 ): Promise<boolean> {
 	const mc = createChildMonitoringContext({ logger, namespace: "PrefetchSnapshot" });
 	const odspLogger = createOdspLogger(mc.logger);
-	const useGroupIdsForSnapshotFetch = mc.config.getBoolean(
-		"Fluid.Container.UseLoadingGroupIdForSnapshotFetch2",
-	);
+	const useGroupIdsForSnapshotFetch = snapshotWithLoadingGroupIdSupported(mc.config);
 	// For prefetch, we just want to fetch the ungrouped data and want to use the new API if the
 	// feature gate is set, so provide an empty array.
 	const loadingGroupIds = useGroupIdsForSnapshotFetch ? [] : undefined;
@@ -113,7 +112,7 @@ export async function prefetchLatestSnapshot(
 			controller,
 		);
 	};
-	const snapshotKey = createCacheSnapshotKey(odspResolvedUrl);
+	const snapshotKey = createCacheSnapshotKey(odspResolvedUrl, useGroupIdsForSnapshotFetch);
 	let cacheP: Promise<void> | undefined;
 	let snapshotEpoch: string | undefined;
 	const putInCache = async (valueWithEpoch: IVersionedValueWithEpoch): Promise<void> => {

package/src/zipItDataRepresentationUtils.ts

@@ -301,39 +301,46 @@ export class NodeCore {
 	}
 
 	public get(index: number): NodeTypes {
-		return this.children[index];
+		// TODO Why are we non null asserting here?
+		return this.children[index]!;
 	}
 
 	public getString(index: number): string {
-		const node = this.children[index];
+		// TODO Why are we non null asserting here?
+		const node = this.children[index]!;
 		return getStringInstance(node, "getString should return string");
 	}
 
 	public getMaybeString(index: number): string | undefined {
-		const node = this.children[index];
+		// TODO Why are we non null asserting here?
+		const node = this.children[index]!;
 		return getMaybeStringInstance(node);
 	}
 
 	public getBlob(index: number): BlobCore {
-		const node = this.children[index];
+		// TODO Why are we non null asserting here?
+		const node = this.children[index]!;
 		assertBlobCoreInstance(node, "getBlob should return a blob");
 		return node;
 	}
 
 	public getNode(index: number): NodeCore {
-		const node = this.children[index];
+		// TODO Why are we non null asserting here?
+		const node = this.children[index]!;
 		assertNodeCoreInstance(node, "getNode should return a node");
 		return node;
 	}
 
 	public getNumber(index: number): number {
-		const node = this.children[index];
+		// TODO Why are we non null asserting here?
+		const node = this.children[index]!;
 		assertNumberInstance(node, "getNumber should return a number");
 		return node;
 	}
 
 	public getBool(index: number): boolean {
-		const node = this.children[index];
+		// TODO Why are we non null asserting here?
+		const node = this.children[index]!;
 		assertBoolInstance(node, "getBool should return a boolean");
 		return node;
 	}
@@ -549,7 +556,8 @@ export class NodeCore {
 
 		for (const el of stringsToResolve) {
 			for (let it = el.startPos; it < el.endPos; it++) {
-				stringBuffer[length] = input[it];
+				// Non null asserting here because we are iterating over startPos
+				stringBuffer[length] = input[it]!;
 				length++;
 			}
 			stringBuffer[length] = 0;
@@ -561,7 +569,8 @@ export class NodeCore {
 		if (result.length === stringsToResolve.length + 1) {
 			// All is good, we expect all the cases to get here
 			for (let i = 0; i < stringsToResolve.length; i++) {
-				stringsToResolve[i].content = result[i];
+				// Non null asserting here because we are iterating over stringsToResolve
+				stringsToResolve[i]!.content = result[i];
 			}
 		} else {
 			// String content has \0 chars!

package/tsconfig.json

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

package/api-extractor/api-extractor-lint-beta.esm.json

@@ -1,5 +0,0 @@
-{
-	"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-	"extends": "<projectFolder>/../../../common/build/build-common/api-extractor-lint.entrypoint.json",
-	"mainEntryPointFilePath": "<projectFolder>/lib/beta.d.ts"
-}

package/beta.d.ts

@@ -1,11 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-/*
- * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
- * Generated by "flub generate entrypoints" in @fluidframework/build-tools.
- */
-
-export * from "./lib/beta.js";

package/dist/beta.d.ts

@@ -1,12 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-/*
- * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
- * Generated by "flub generate entrypoints" in @fluidframework/build-tools.
- */
-
-export {}
-

package/lib/beta.d.ts

@@ -1,12 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-/*
- * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
- * Generated by "flub generate entrypoints" in @fluidframework/build-tools.
- */
-
-export {}
-