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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/odsp-driver",
-  "version": "2.1.0-276326",
+  "version": "2.1.0-281041",
   "description": "Socket storage implementation for SPO and ODC",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -23,16 +23,6 @@
         "default": "./dist/index.js"
       }
     },
-    "./beta": {
-      "import": {
-        "types": "./lib/beta.d.ts",
-        "default": "./lib/index.js"
-      },
-      "require": {
-        "types": "./dist/beta.d.ts",
-        "default": "./dist/index.js"
-      }
-    },
     "./legacy": {
       "import": {
         "types": "./lib/legacy.d.ts",
@@ -77,28 +67,28 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.1.0-276326",
-    "@fluidframework/core-interfaces": "2.1.0-276326",
-    "@fluidframework/core-utils": "2.1.0-276326",
-    "@fluidframework/driver-base": "2.1.0-276326",
-    "@fluidframework/driver-definitions": "2.1.0-276326",
-    "@fluidframework/driver-utils": "2.1.0-276326",
-    "@fluidframework/odsp-doclib-utils": "2.1.0-276326",
-    "@fluidframework/odsp-driver-definitions": "2.1.0-276326",
-    "@fluidframework/telemetry-utils": "2.1.0-276326",
+    "@fluid-internal/client-utils": "2.1.0-281041",
+    "@fluidframework/core-interfaces": "2.1.0-281041",
+    "@fluidframework/core-utils": "2.1.0-281041",
+    "@fluidframework/driver-base": "2.1.0-281041",
+    "@fluidframework/driver-definitions": "2.1.0-281041",
+    "@fluidframework/driver-utils": "2.1.0-281041",
+    "@fluidframework/odsp-doclib-utils": "2.1.0-281041",
+    "@fluidframework/odsp-driver-definitions": "2.1.0-281041",
+    "@fluidframework/telemetry-utils": "2.1.0-281041",
     "node-fetch": "^2.6.9",
     "socket.io-client": "^4.7.3",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.2",
-    "@biomejs/biome": "^1.7.3",
-    "@fluid-internal/mocha-test-setup": "2.1.0-276326",
-    "@fluid-tools/build-cli": "^0.39.0",
+    "@biomejs/biome": "~1.8.3",
+    "@fluid-internal/mocha-test-setup": "2.1.0-281041",
+    "@fluid-tools/build-cli": "^0.40.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.39.0",
+    "@fluidframework/build-tools": "^0.40.0",
     "@fluidframework/eslint-config-fluid": "^5.3.0",
-    "@fluidframework/odsp-driver-previous": "npm:@fluidframework/odsp-driver@2.0.0-rc.5.0.0",
+    "@fluidframework/odsp-driver-previous": "npm:@fluidframework/odsp-driver@2.0.0",
     "@microsoft/api-extractor": "^7.45.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.19.0",
@@ -127,36 +117,36 @@
     "api-extractor:commonjs": "flub generate entrypoints --outDir ./dist",
     "api-extractor:esnext": "flub generate entrypoints --outDir ./lib --node10TypeCompat",
     "build": "fluid-build . --task build",
+    "build:api-reports": "concurrently \"npm:build:api-reports:*\"",
+    "build:api-reports:current": "api-extractor run --local --config api-extractor/api-extractor.current.json",
+    "build:api-reports:legacy": "api-extractor run --local --config api-extractor/api-extractor.legacy.json",
     "build:commonjs": "fluid-build . --task commonjs",
     "build:compile": "fluid-build . --task compile",
-    "build:docs": "concurrently \"npm:build:docs:*\"",
-    "build:docs:current": "api-extractor run --local",
-    "build:docs:legacy": "api-extractor run --local --config api-extractor/api-extractor.legacy.json",
+    "build:docs": "api-extractor run --local",
     "build:esnext": "tsc --project ./tsconfig.json",
     "build:genver": "gen-version",
     "build:test": "npm run build:test:esm && npm run build:test:cjs",
     "build:test:cjs": "fluid-tsc commonjs --project ./src/test/tsconfig.cjs.json",
     "build:test:esm": "tsc --project ./src/test/tsconfig.json",
     "check:are-the-types-wrong": "attw --pack .",
-    "check:biome": "biome check . --formatter-enabled=true",
+    "check:biome": "biome check .",
     "check:exports": "concurrently \"npm:check:exports:*\"",
     "check:exports:bundle-release-tags": "api-extractor run --config api-extractor/api-extractor-lint-bundle.json",
-    "check:exports:cjs:beta": "api-extractor run --config api-extractor/api-extractor-lint-beta.cjs.json",
     "check:exports:cjs:legacy": "api-extractor run --config api-extractor/api-extractor-lint-legacy.cjs.json",
     "check:exports:cjs:public": "api-extractor run --config api-extractor/api-extractor-lint-public.cjs.json",
-    "check:exports:esm:beta": "api-extractor run --config api-extractor/api-extractor-lint-beta.esm.json",
     "check:exports:esm:legacy": "api-extractor run --config api-extractor/api-extractor-lint-legacy.esm.json",
     "check:exports:esm:public": "api-extractor run --config api-extractor/api-extractor-lint-public.esm.json",
     "check:format": "npm run check:biome",
     "check:prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
-    "ci:build:docs": "concurrently \"npm:ci:build:docs:*\"",
-    "ci:build:docs:current": "api-extractor run",
-    "ci:build:docs:legacy": "api-extractor run --config api-extractor/api-extractor.legacy.json",
+    "ci:build:api-reports": "concurrently \"npm:ci:build:api-reports:*\"",
+    "ci:build:api-reports:current": "api-extractor run --config api-extractor/api-extractor.current.json",
+    "ci:build:api-reports:legacy": "api-extractor run --config api-extractor/api-extractor.legacy.json",
+    "ci:build:docs": "api-extractor run",
     "clean": "rimraf --glob dist lib \"*.d.ts\" \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
     "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
     "format": "npm run format:biome",
-    "format:biome": "biome check . --formatter-enabled=true --apply",
+    "format:biome": "biome check . --write",
     "format:prettier": "prettier --write . --cache --ignore-path ../../../.prettierignore",
     "lint": "fluid-build . --task lint",
     "lint:fix": "fluid-build . --task eslint:fix --task format",

package/src/ReadBufferUtils.ts

@@ -47,7 +47,8 @@ export class ReadBuffer {
 		let length = lengthArg;
 		while (length > 0) {
 			assert(!this.eof, 0x223 /* "unexpected end of buffer" */);
-			res += this.data[this.index] * multiplier;
+			// TODO Why are we non null asserting here?
+			res += this.data[this.index]! * multiplier;
 			this.index++;
 			multiplier *= 256;
 			length--;

package/src/WriteBufferUtils.ts

@@ -32,7 +32,8 @@ export class WriteBuffer {
 			let index = 0;
 			const oldData = this.data;
 			while (index < length) {
-				newData[index] = oldData[index];
+				// TODO Why are we non null asserting here?
+				newData[index] = oldData[index]!;
 				index++;
 			}
 			this.data = newData;
@@ -252,7 +253,8 @@ function serializeNodeCore(
 				buffer.write(child, len);
 			}
 		} else if (typeof child === "boolean") {
-			buffer.write(boolToCodeMap[child ? 1 : 0]);
+			// TODO Why are we non null asserting here?
+			buffer.write(boolToCodeMap[child ? 1 : 0]!);
 		} else {
 			assert(child._stringElement, 0x3dd /* Unsupported node type */);
 			if (child.dictionary) {

package/src/compactSnapshotParser.ts

@@ -70,8 +70,10 @@ function readBlobSection(node: NodeTypes): {
 			 */
 			slowBlobStructureCount += 1;
 			const records = getNodeProps(blob);
-			assertBlobCoreInstance(records.data, "data should be of BlobCore type");
-			const id = getStringInstance(records.id, "blob id should be string");
+			// TODO why are we non null asserting here?
+			assertBlobCoreInstance(records.data!, "data should be of BlobCore type");
+			// TODO why are we non null asserting here?
+			const id = getStringInstance(records.id!, "blob id should be string");
 			blobContents.set(id, records.data.arrayBuffer);
 		}
 	}
@@ -86,8 +88,10 @@ function readOpsSection(node: NodeTypes): ISequencedDocumentMessage[] {
 	assertNodeCoreInstance(node, "Deltas should be of type NodeCore");
 	const ops: ISequencedDocumentMessage[] = [];
 	const records = getNodeProps(node);
-	assertNumberInstance(records.firstSequenceNumber, "Seq number should be a number");
-	assertNodeCoreInstance(records.deltas, "Deltas should be a Node");
+	// TODO Why are we non null asserting here?
+	assertNumberInstance(records.firstSequenceNumber!, "Seq number should be a number");
+	// TODO Why are we non null asserting here?
+	assertNodeCoreInstance(records.deltas!, "Deltas should be a Node");
 	for (let i = 0; i < records.deltas.length; ++i) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		ops.push(JSON.parse(records.deltas.getString(i)));
@@ -96,7 +100,8 @@ function readOpsSection(node: NodeTypes): ISequencedDocumentMessage[] {
 	// when there are no ops. So just make the code resilient to that bug. Service has also
 	// fixed that bug.
 	assert(
-		ops.length === 0 || records.firstSequenceNumber.valueOf() === ops[0].sequenceNumber,
+		// Non null asserting here because of the length check
+		ops.length === 0 || records.firstSequenceNumber.valueOf() === ops[0]!.sequenceNumber,
 		0x280 /* "Validate first op seq number" */,
 	);
 	return ops;
@@ -109,8 +114,10 @@ function readOpsSection(node: NodeTypes): ISequencedDocumentMessage[] {
 function readTreeSection(node: NodeCore): {
 	snapshotTree: ISnapshotTree;
 	slowTreeStructureCount: number;
+	treeStructureCountWithGroupId: number;
 } {
 	let slowTreeStructureCount = 0;
+	let treeStructureCountWithGroupId = 0;
 	const trees: Record<string, ISnapshotTree> = {};
 	const snapshotTree: ISnapshotTree = {
 		blobs: {},
@@ -141,6 +148,7 @@ function readTreeSection(node: NodeCore): {
 						const result = readTreeSection(treeNode.getNode(3));
 						trees[treeNode.getString(1)] = result.snapshotTree;
 						slowTreeStructureCount += result.slowTreeStructureCount;
+						treeStructureCountWithGroupId += result.treeStructureCountWithGroupId;
 						continue;
 					}
 					// "name": <node name>
@@ -173,6 +181,7 @@ function readTreeSection(node: NodeCore): {
 						const result = readTreeSection(treeNode.getNode(5));
 						trees[treeNode.getString(1)] = result.snapshotTree;
 						slowTreeStructureCount += result.slowTreeStructureCount;
+						treeStructureCountWithGroupId += result.treeStructureCountWithGroupId;
 						assert(treeNode.getBool(3), 0x3db /* Unreferenced if present should be true */);
 						snapshotTree.unreferenced = true;
 						continue;
@@ -188,7 +197,7 @@ function readTreeSection(node: NodeCore): {
 		/**
 		 * More generalized workflow
 		 */
-		slowTreeStructureCount += 1;
+		slowTreeStructureCount++;
 		const records = getNodeProps(treeNode);
 
 		if (records.unreferenced !== undefined) {
@@ -197,7 +206,8 @@ function readTreeSection(node: NodeCore): {
 			snapshotTree.unreferenced = true;
 		}
 
-		const path = getStringInstance(records.name, "Path name should be string");
+		// TODO Why are we non null asserting here?
+		const path = getStringInstance(records.name!, "Path name should be string");
 		if (records.value !== undefined) {
 			snapshotTree.blobs[path] = getStringInstance(
 				records.value,
@@ -210,14 +220,17 @@ function readTreeSection(node: NodeCore): {
 			trees[path] = result.snapshotTree;
 			if (records.groupId !== undefined) {
 				const groupId = getStringInstance(records.groupId, "groupId should be a string");
-				trees[path].groupId = groupId;
+				// Non null asserting since trees[path] is already created
+				trees[path]!.groupId = groupId;
+				treeStructureCountWithGroupId++;
 			}
 			slowTreeStructureCount += result.slowTreeStructureCount;
+			treeStructureCountWithGroupId += result.treeStructureCountWithGroupId;
 		} else {
 			trees[path] = { blobs: {}, trees: {} };
 		}
 	}
-	return { snapshotTree, slowTreeStructureCount };
+	return { snapshotTree, slowTreeStructureCount, treeStructureCountWithGroupId };
 }
 
 /**
@@ -228,19 +241,25 @@ function readSnapshotSection(node: NodeTypes): {
 	sequenceNumber: number;
 	snapshotTree: ISnapshotTree;
 	slowTreeStructureCount: number;
+	treeStructureCountWithGroupId: number;
 } {
 	assertNodeCoreInstance(node, "Snapshot should be of type NodeCore");
 	const records = getNodeProps(node);
 
-	assertNodeCoreInstance(records.treeNodes, "TreeNodes should be of type NodeCore");
-	assertNumberInstance(records.sequenceNumber, "sequenceNumber should be of type number");
-	const { snapshotTree, slowTreeStructureCount } = readTreeSection(records.treeNodes);
-	snapshotTree.id = getStringInstance(records.id, "snapshotId should be string");
+	// TODO Why are we non null asserting here?
+	assertNodeCoreInstance(records.treeNodes!, "TreeNodes should be of type NodeCore");
+	// TODO Why are we non null asserting here?
+	assertNumberInstance(records.sequenceNumber!, "sequenceNumber should be of type number");
+	const { snapshotTree, slowTreeStructureCount, treeStructureCountWithGroupId } =
+		readTreeSection(records.treeNodes);
+	// TODO Why are we non null asserting here?
+	snapshotTree.id = getStringInstance(records.id!, "snapshotId should be string");
 	const sequenceNumber = records.sequenceNumber.valueOf();
 	return {
 		sequenceNumber,
 		snapshotTree,
 		slowTreeStructureCount,
+		treeStructureCountWithGroupId,
 	};
 }
 
@@ -260,8 +279,10 @@ export function parseCompactSnapshotResponse(
 
 	const records = getNodeProps(root);
 
-	const mrv = getStringInstance(records.mrv, "minReadVersion should be string");
-	const cv = getStringInstance(records.cv, "createVersion should be string");
+	// TODO Why are we non null asserting here?
+	const mrv = getStringInstance(records.mrv!, "minReadVersion should be string");
+	// TODO Why are we non null asserting here?
+	const cv = getStringInstance(records.cv!, "createVersion should be string");
 	if (records.lsn !== undefined) {
 		assertNumberInstance(records.lsn, "lsn should be a number");
 	}
@@ -280,9 +301,11 @@ export function parseCompactSnapshotResponse(
 	);
 
 	const [snapshot, durationSnapshotTree] = measure(() =>
-		readSnapshotSection(records.snapshot),
+		// TODO Why are we non null asserting here?
+		readSnapshotSection(records.snapshot!),
 	);
-	const [blobContents, durationBlobs] = measure(() => readBlobSection(records.blobs));
+	// TODO Why are we non null asserting here?
+	const [blobContents, durationBlobs] = measure(() => readBlobSection(records.blobs!));
 
 	return {
 		...snapshot,
@@ -296,6 +319,7 @@ export function parseCompactSnapshotResponse(
 			durationBlobs,
 			slowTreeStructureCount: snapshot.slowTreeStructureCount,
 			slowBlobStructureCount: blobContents.slowBlobStructureCount,
+			treeStructureCountWithGroupId: snapshot.treeStructureCountWithGroupId,
 		},
 	};
 }

package/src/compactSnapshotWriter.ts

@@ -130,7 +130,8 @@ function writeSnapshotSection(
 function writeOpsSection(rootNode: NodeCore, ops: ISequencedDocumentMessage[]): void {
 	let firstSequenceNumber: number | undefined;
 	if (ops.length > 0) {
-		firstSequenceNumber = ops[0].sequenceNumber;
+		// Non null asserting here because of the length check above
+		firstSequenceNumber = ops[0]!.sequenceNumber;
 	}
 	if (firstSequenceNumber !== undefined) {
 		rootNode.addDictionaryString("deltas");
@@ -162,7 +163,8 @@ export function convertToCompactSnapshot(snapshotContents: ISnapshot): Uint8Arra
 	if (latestSequenceNumber === undefined) {
 		latestSequenceNumber =
 			snapshotContents.ops.length > 0
-				? snapshotContents.ops[snapshotContents.ops.length - 1].sequenceNumber
+				? // Non null asserting here because of the length check above
+					snapshotContents.ops[snapshotContents.ops.length - 1]!.sequenceNumber
 				: snapshotContents.sequenceNumber;
 	}
 

package/src/createFile.ts

@@ -16,6 +16,7 @@ import {
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
 	ITelemetryLoggerExt,
+	loggerToMonitoringContext,
 	PerformanceEvent,
 } from "@fluidframework/telemetry-utils/internal";
 
@@ -36,6 +37,7 @@ import {
 	buildOdspShareLinkReqParams,
 	createCacheSnapshotKey,
 	getWithRetryForTokenRefresh,
+	snapshotWithLoadingGroupIdSupported,
 } from "./odspUtils.js";
 import { pkgVersion as driverVersion } from "./packageVersion.js";
 import { runWithRetry } from "./retryUtils.js";
@@ -110,7 +112,13 @@ export async function createNewFluidFile(
 			summaryHandle,
 		);
 		// caching the converted summary
-		await epochTracker.put(createCacheSnapshotKey(odspResolvedUrl), snapshot);
+		await epochTracker.put(
+			createCacheSnapshotKey(
+				odspResolvedUrl,
+				snapshotWithLoadingGroupIdSupported(loggerToMonitoringContext(logger).config),
+			),
+			snapshot,
+		);
 	}
 	return odspResolvedUrl;
 }

package/src/createNewContainerOnExistingFile.ts

@@ -11,7 +11,10 @@ import {
 	IOdspResolvedUrl,
 	InstrumentedStorageTokenFetcher,
 } from "@fluidframework/odsp-driver-definitions/internal";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import {
+	ITelemetryLoggerExt,
+	loggerToMonitoringContext,
+} from "@fluidframework/telemetry-utils/internal";
 
 import { IWriteSummaryResponse } from "./contracts.js";
 import { ClpCompliantAppHeader } from "./contractsPublic.js";
@@ -24,7 +27,11 @@ import { createOdspUrl } from "./createOdspUrl.js";
 import { EpochTracker } from "./epochTracker.js";
 import { OdspDriverUrlResolver } from "./odspDriverUrlResolver.js";
 import { getApiRoot } from "./odspUrlHelper.js";
-import { IExistingFileInfo, createCacheSnapshotKey } from "./odspUtils.js";
+import {
+	IExistingFileInfo,
+	createCacheSnapshotKey,
+	snapshotWithLoadingGroupIdSupported,
+} from "./odspUtils.js";
 
 /**
  * Creates a new Fluid container on an existing file.
@@ -87,7 +94,13 @@ export async function createNewContainerOnExistingFile(
 			summaryHandle,
 		);
 		// caching the converted summary
-		await epochTracker.put(createCacheSnapshotKey(odspResolvedUrl), snapshot);
+		await epochTracker.put(
+			createCacheSnapshotKey(
+				odspResolvedUrl,
+				snapshotWithLoadingGroupIdSupported(loggerToMonitoringContext(logger).config),
+			),
+			snapshot,
+		);
 	}
 
 	return odspResolvedUrl;

package/src/createNewUtils.ts

@@ -4,7 +4,7 @@
  */
 
 import { Uint8ArrayToString, stringToBuffer } from "@fluid-internal/client-utils";
-import { unreachableCase } from "@fluidframework/core-utils/internal";
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 import {
 	ISummaryBlob,
 	ISummaryTree,
@@ -72,7 +72,8 @@ function convertCreateNewSummaryTreeToTreeAndBlobsCore(
 	};
 	const keys = Object.keys(summary.tree);
 	for (const key of keys) {
-		const summaryObject = summary.tree[key];
+		// Non null asserting for now this should change to Object.entries
+		const summaryObject = summary.tree[key]!;
 
 		switch (summaryObject.type) {
 			case SummaryType.Tree: {
@@ -149,7 +150,9 @@ function convertSummaryToSnapshotTreeForCreateNew(summary: ISummaryTree): IOdspS
 
 	const keys = Object.keys(summary.tree);
 	for (const key of keys) {
-		const summaryObject = summary.tree[key];
+		assert(!key.includes("/"), "id should not include slashes");
+		// Non null asserting for now this should change to Object.entries
+		const summaryObject = summary.tree[key]!;
 
 		let value: OdspSummaryTreeValue;
 		// Tracks if an entry is unreferenced. Currently, only tree entries can be marked as unreferenced. If the
@@ -188,7 +191,7 @@ function convertSummaryToSnapshotTreeForCreateNew(summary: ISummaryTree): IOdspS
 		}
 
 		const entry: OdspSummaryTreeEntry = {
-			path: encodeURIComponent(key),
+			path: key,
 			type: getGitType(summaryObject),
 			value,
 			unreferenced,

package/src/epochTracker.ts

@@ -21,6 +21,7 @@ import {
 	OdspErrorTypes,
 	maximumCacheDurationMs,
 	snapshotKey,
+	snapshotWithLoadingGroupIdKey,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
 	ITelemetryLoggerExt,
@@ -149,7 +150,7 @@ export class EpochTracker implements IPersistedFileCache {
 			}
 			// Expire the cached snapshot if it's older than snapshotCacheExpiryTimeoutMs and immediately
 			// expire all old caches that do not have cacheEntryTime
-			if (entry.type === snapshotKey) {
+			if (entry.type === snapshotKey || entry.type === snapshotWithLoadingGroupIdKey) {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 				const cacheTime = value.value?.cacheEntryTime;
 				const currentTime = Date.now();
@@ -180,7 +181,7 @@ export class EpochTracker implements IPersistedFileCache {
 		assert(this._fluidEpoch !== undefined, 0x1dd /* "no epoch" */);
 		// For snapshots, the value should have the cacheEntryTime.
 		// This will be used to expire snapshots older than snapshotCacheExpiryTimeoutMs.
-		if (entry.type === snapshotKey) {
+		if (entry.type === snapshotKey || entry.type === snapshotWithLoadingGroupIdKey) {
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 			value.cacheEntryTime = value.cacheEntryTime ?? Date.now();
 		}
@@ -522,7 +523,7 @@ export class EpochTrackerWithRedemption extends EpochTracker {
 		let result = super.get(entry);
 
 		// equivalence of what happens in fetchAndParseAsJSON()
-		if (entry.type === snapshotKey) {
+		if (entry.type === snapshotKey || entry.type === snapshotWithLoadingGroupIdKey) {
 			result = result
 				.then((value) => {
 					// If there is nothing in cache, we need to wait for network call to complete (and do redemption)

package/src/fetchSnapshot.ts

@@ -77,7 +77,7 @@ export enum SnapshotFormatSupportType {
  * @param snapshotUrl - snapshot url from where the odsp snapshot will be fetched
  * @param versionId - id of specific snapshot to be fetched
  * @param fetchFullSnapshot - whether we want to fetch full snapshot(with blobs)
- * @param forceAccessTokenViaAuthorizationHeader - @deprecated Not used, true value always used instead. Whether to force passing given token via authorization header
+ * @param forceAccessTokenViaAuthorizationHeader - Deprecated and not used, true value always used instead. Whether to force passing given token via authorization header
  * @param snapshotDownloader - Implementation of the get/post methods used to fetch the snapshot. snapshotDownloader is responsible for generating the appropriate headers (including Authorization header) as well as handling any token refreshes before retrying.
  * @returns A promise of the snapshot and the status code of the response
  */
@@ -453,11 +453,17 @@ async function fetchLatestSnapshotCore(
 						const props = snapshotContents.telemetryProps;
 						const slowTreeParseCodePaths = props.slowTreeStructureCount ?? 0;
 						const slowBlobParseCodePaths = props.slowBlobStructureCount ?? 0;
-						if (slowTreeParseCodePaths > 10 || slowBlobParseCodePaths > 10) {
+						const treeStructureCountWithGroupId = props.treeStructureCountWithGroupId ?? 0;
+						// As trees with groupId go through normal parsing, so exclude them.
+						if (
+							slowTreeParseCodePaths - treeStructureCountWithGroupId > 10 ||
+							slowBlobParseCodePaths > 10
+						) {
 							logger.sendErrorEvent({
 								eventName: "SlowSnapshotParseCodePaths",
 								slowTreeStructureCount: slowTreeParseCodePaths,
 								slowBlobStructureCount: slowBlobParseCodePaths,
+								treeStructureCountWithGroupId,
 							});
 						}
 						parsedSnapshotContents = { ...odspResponse, content: snapshotContents };
@@ -499,7 +505,8 @@ async function fetchLatestSnapshotCore(
 			const sequenceNumber: number = snapshot.sequenceNumber ?? 0;
 			const seqNumberFromOps =
 				snapshot.ops && snapshot.ops.length > 0
-					? snapshot.ops[0].sequenceNumber - 1
+					? // Non null asserting here because of the length check above
+						snapshot.ops[0]!.sequenceNumber - 1
 					: undefined;
 
 			if (

package/src/localOdspDriver/localOdspDeltaStorageService.ts

@@ -38,7 +38,8 @@ export class LocalOdspDeltaStorageService implements IDocumentDeltaStorageServic
 		);
 		validateMessages("cached", messages, from, this.logger);
 
-		if (messages.length === 0 || messages[0].sequenceNumber !== from) {
+		// Non null asserting here because of the length check
+		if (messages.length === 0 || messages[0]!.sequenceNumber !== from) {
 			this.snapshotOps = [];
 		}
 		this.snapshotOps = this.snapshotOps.filter(

package/src/odspDelayLoadedDeltaStream.ts

@@ -472,7 +472,8 @@ export class OdspDelayLoadedDeltaStream {
 	}
 
 	private emitMetaDataUpdateEvent(metadata: Record<string, string>): void {
-		const label = JSON.parse(metadata.sensitivityLabelsInfo) as {
+		// TODO Why are we non null asserting here?
+		const label = JSON.parse(metadata.sensitivityLabelsInfo!) as {
 			labels: unknown;
 			timestamp: number;
 		};
@@ -481,7 +482,8 @@ export class OdspDelayLoadedDeltaStream {
 		if (time > this.labelUpdateTimestamp) {
 			this.labelUpdateTimestamp = time;
 			this.metadataUpdateHandler({
-				sensitivityLabelsInfo: metadata.sensitivityLabelsInfo,
+				// TODO Why are we non null asserting here?
+				sensitivityLabelsInfo: metadata.sensitivityLabelsInfo!,
 			});
 		}
 	}

package/src/odspDeltaStorageService.ts

@@ -106,7 +106,8 @@ export class OdspDeltaStorageService {
 					clearTimeout(timer);
 					const deltaStorageResponse = response.content;
 					const messages =
-						deltaStorageResponse.value.length > 0 && "op" in deltaStorageResponse.value[0]
+						// Non null asserting here because of the length check
+						deltaStorageResponse.value.length > 0 && "op" in deltaStorageResponse.value[0]!
 							? (deltaStorageResponse.value as ISequencedDeltaOpMessage[]).map(
 									(operation) => operation.op,
 								)
@@ -187,7 +188,8 @@ export class OdspDeltaStorageWithCache implements IDocumentDeltaStorageService {
 					(op) => op.sequenceNumber >= from && op.sequenceNumber < to,
 				);
 				validateMessages("cached", messages, from, this.logger);
-				if (messages.length > 0 && messages[0].sequenceNumber === from) {
+				// Non null asserting here because of the length check
+				if (messages.length > 0 && messages[0]!.sequenceNumber === from) {
 					this.snapshotOps = this.snapshotOps.filter((op) => op.sequenceNumber >= to);
 					opsFromSnapshot += messages.length;
 					return { messages, partialResult: true };

package/src/odspDocumentDeltaConnection.ts

@@ -591,8 +591,10 @@ export class OdspDocumentDeltaConnection extends DocumentDeltaConnection {
 				if (messages !== undefined && messages.length > 0) {
 					this.logger.sendPerformanceEvent({
 						...common,
-						first: messages[0].sequenceNumber,
-						last: messages[messages.length - 1].sequenceNumber,
+						// Non null asserting here because of the length check above
+						first: messages[0]!.sequenceNumber,
+						// Non null asserting here because of the length check above
+						last: messages[messages.length - 1]!.sequenceNumber,
 						length: messages.length,
 					});
 					this.emit("op", this.documentId, messages);

package/src/odspDocumentStorageManager.ts

@@ -32,6 +32,7 @@ import {
 	loggerToMonitoringContext,
 	normalizeError,
 	overwriteStack,
+	type IConfigProvider,
 } from "@fluidframework/telemetry-utils/internal";
 
 import {
@@ -62,6 +63,7 @@ import {
 	getWithRetryForTokenRefresh,
 	isInstanceOfISnapshot,
 	isSnapshotFetchForLoadingGroup,
+	snapshotWithLoadingGroupIdSupported,
 	useLegacyFlowWithoutGroupsForSnapshotFetch,
 	type TokenFetchOptionsEx,
 } from "./odspUtils.js";
@@ -85,6 +87,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 	private readonly snapshotUrl: string | undefined;
 	private readonly attachmentPOSTUrl: string | undefined;
 	private readonly attachmentGETUrl: string | undefined;
+	private readonly config: IConfigProvider;
 	// Driver specified limits for snapshot size and time.
 	/**
 	 * NOTE: While commit cfff6e3 added restrictions to prevent large payloads, snapshot failures will continue to
@@ -115,6 +118,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 		this.snapshotUrl = this.odspResolvedUrl.endpoints.snapshotStorageUrl;
 		this.attachmentPOSTUrl = this.odspResolvedUrl.endpoints.attachmentPOSTStorageUrl;
 		this.attachmentGETUrl = this.odspResolvedUrl.endpoints.attachmentGETStorageUrl;
+		this.config = loggerToMonitoringContext(logger).config;
 	}
 
 	public get isFirstSnapshotFromNetwork(): boolean | undefined {
@@ -278,7 +282,12 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 					// Here's the logic to grab the persistent cache snapshot implemented by the host
 					// Epoch tracker is responsible for communicating with the persistent cache, handling epochs and cache versions
 					const cachedSnapshotP: Promise<ISnapshot | undefined> = this.epochTracker
-						.get(createCacheSnapshotKey(this.odspResolvedUrl))
+						.get(
+							createCacheSnapshotKey(
+								this.odspResolvedUrl,
+								snapshotWithLoadingGroupIdSupported(this.config),
+							),
+						)
 						.then(
 							async (
 								// eslint-disable-next-line import/no-deprecated
@@ -564,7 +573,10 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 		// for initial snapshot, don't consult the prefetch cache.
 		if (!this.hostPolicy.avoidPrefetchSnapshotCache && this.firstSnapshotFetchCall) {
 			const prefetchCacheKey = getKeyForCacheEntry(
-				createCacheSnapshotKey(this.odspResolvedUrl),
+				createCacheSnapshotKey(
+					this.odspResolvedUrl,
+					snapshotWithLoadingGroupIdSupported(this.config),
+				),
 			);
 			const result = await this.cache.snapshotPrefetchResultCache
 				?.get(prefetchCacheKey)
@@ -627,7 +639,10 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 		};
 		const putInCache = async (valueWithEpoch: IVersionedValueWithEpoch): Promise<void> => {
 			return this.cache.persistedCache.put(
-				createCacheSnapshotKey(this.odspResolvedUrl),
+				createCacheSnapshotKey(
+					this.odspResolvedUrl,
+					snapshotWithLoadingGroupIdSupported(this.config),
+				),
 				// Epoch tracker will add the epoch and version to the value here. So just send value to cache.
 				valueWithEpoch.value,
 			);