@fluidframework/odsp-driver 2.0.0-dev-rc.1.0.0.232845 → 2.0.0-dev-rc.2.0.0.246488

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/odsp-driver",
-  "version": "2.0.0-dev-rc.1.0.0.232845",
+  "version": "2.0.0-dev-rc.2.0.0.246488",
   "description": "Socket storage implementation for SPO and ODC",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,8 +11,60 @@
   "license": "MIT",
   "author": "Microsoft and contributors",
   "sideEffects": false,
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "./public": {
+      "import": {
+        "types": "./lib/odsp-driver-public.d.ts",
+        "default": "./lib/index.js"
+      },
+      "require": {
+        "types": "./dist/odsp-driver-public.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "./beta": {
+      "import": {
+        "types": "./lib/odsp-driver-beta.d.ts",
+        "default": "./lib/index.js"
+      },
+      "require": {
+        "types": "./dist/odsp-driver-beta.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "./alpha": {
+      "import": {
+        "types": "./lib/odsp-driver-alpha.d.ts",
+        "default": "./lib/index.js"
+      },
+      "require": {
+        "types": "./dist/odsp-driver-alpha.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "./internal": {
+      "import": {
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
   "main": "dist/index.js",
-  "module": "lib/index.mjs",
   "types": "dist/index.d.ts",
   "c8": {
     "all": true,
@@ -35,46 +87,46 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/core-interfaces": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/core-utils": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/driver-base": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/driver-definitions": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/driver-utils": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/odsp-doclib-utils": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/odsp-driver-definitions": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/protocol-base": "^3.1.0-231702",
-    "@fluidframework/protocol-definitions": "^3.2.0-231454",
-    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.1.0.0.232845",
+    "@fluid-internal/client-utils": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluidframework/core-interfaces": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluidframework/core-utils": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluidframework/driver-base": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluidframework/driver-definitions": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluidframework/driver-utils": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluidframework/odsp-doclib-utils": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluidframework/odsp-driver-definitions": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluidframework/protocol-base": "^4.0.0",
+    "@fluidframework/protocol-definitions": "^3.2.0",
+    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.2.0.0.246488",
     "node-fetch": "^2.6.9",
-    "socket.io-client": "^4.6.1",
+    "socket.io-client": "^4.7.3",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-tools/build-cli": "^0.29.0",
+    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluid-tools/build-cli": "^0.34.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.29.0",
-    "@fluidframework/eslint-config-fluid": "^3.3.0",
-    "@fluidframework/mocha-test-setup": "2.0.0-dev-rc.1.0.0.232845",
+    "@fluidframework/build-tools": "^0.34.0",
+    "@fluidframework/eslint-config-fluid": "^5.1.0",
     "@fluidframework/odsp-driver-previous": "npm:@fluidframework/odsp-driver@2.0.0-internal.8.0.0",
-    "@microsoft/api-extractor": "^7.39.1",
+    "@microsoft/api-extractor": "^7.42.3",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.19.0",
-    "@types/node-fetch": "^2.5.10",
-    "@types/sinon": "^7.0.13",
+    "@types/node-fetch": "^2.6.11",
+    "@types/sinon": "^17.0.3",
+    "@types/uuid": "^9.0.2",
     "c8": "^8.0.1",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
-    "eslint": "~8.50.0",
+    "eslint": "~8.55.0",
     "mocha": "^10.2.0",
     "mocha-json-output-reporter": "^2.0.1",
     "mocha-multi-reporters": "^1.5.1",
     "moment": "^2.21.0",
     "prettier": "~3.0.3",
     "rimraf": "^4.4.0",
-    "sinon": "^7.4.2",
-    "tsc-multi": "^1.1.0",
+    "sinon": "^17.0.1",
     "typescript": "~5.1.6"
   },
   "fluidBuild": {
@@ -98,21 +150,26 @@
       "InterfaceDeclaration_IPrefetchSnapshotContents": {
         "backCompat": false,
         "forwardCompat": false
+      },
+      "ClassDeclaration_OdspDriverUrlResolverForShareLink": {
+        "forwardCompat": false
       }
     }
   },
   "scripts": {
     "api": "fluid-build . --task api",
-    "api-extractor:commonjs": "api-extractor run --local",
-    "api-extractor:esnext": "api-extractor run --config ./api-extractor-esm.json",
+    "api-extractor:commonjs": "api-extractor run --config ./api-extractor-cjs.json",
+    "api-extractor:esnext": "api-extractor run --local",
     "build": "fluid-build . --task build",
     "build:commonjs": "fluid-build . --task commonjs",
     "build:compile": "fluid-build . --task compile",
     "build:docs": "fluid-build . --task api",
-    "build:esnext": "tsc-multi --config ../../../common/build/build-common/tsc-multi.esm.json",
+    "build:esnext": "tsc --project ./tsconfig.json",
     "build:genver": "gen-version",
-    "build:test": "tsc --project ./src/test/tsconfig.json",
-    "check:are-the-types-wrong": "attw --pack",
+    "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 . --entrypoints .",
     "check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
     "ci:build:docs": "api-extractor run",
     "clean": "rimraf --glob dist lib \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
@@ -125,9 +182,11 @@
     "prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
     "test": "npm run test:mocha",
     "test:coverage": "c8 npm test",
-    "test:mocha": "mocha --ignore \"dist/test/types/*\" --recursive dist/test -r node_modules/@fluidframework/mocha-test-setup",
+    "test:mocha": "npm run test:mocha:cjs && echo \"ADO #7404 - ESM modules cannot be stubbed - npm run test:mocha:esm\"",
+    "test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\" --exit",
+    "test:mocha:esm": "mocha --recursive \"lib/test/**/*.spec.*js\" --exit",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
-    "tsc": "tsc",
+    "tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
     "typetests:gen": "fluid-type-test-generator",
     "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"
   }

package/src/ReadBufferUtils.ts

@@ -12,7 +12,7 @@ import { assert } from "@fluidframework/core-utils";
 export class ReadBuffer {
 	protected index = 0;
 
-	public get buffer() {
+	public get buffer(): Uint8Array {
 		return this.data;
 	}
 
@@ -23,21 +23,21 @@ export class ReadBuffer {
 		Object.freeze(data.buffer);
 	}
 
-	public get eof() {
+	public get eof(): boolean {
 		return this.index === this.data.length;
 	}
-	public get pos() {
+	public get pos(): number {
 		return this.index;
 	}
-	public get length() {
+	public get length(): number {
 		return this.data.length;
 	}
 
-	public slice(start: number, end: number) {
+	public slice(start: number, end: number): Uint8Array {
 		return this.data.slice(start, end);
 	}
 
-	public reset() {
+	public reset(): void {
 		this.index = 0;
 	}
 
@@ -55,7 +55,7 @@ export class ReadBuffer {
 		return res;
 	}
 
-	public skip(length: number) {
+	public skip(length: number): void {
 		assert(length >= 0, 0x224 /* "Skip length should be positive" */);
 		this.index += length;
 		assert(this.index <= this.data.length, 0x3dc /* skipping past size of buffer */);

package/src/WriteBufferUtils.ts

@@ -13,7 +13,7 @@ import {
 	MarkerCodesEnd,
 	MarkerCodesStart,
 	NodeCore,
-} from "./zipItDataRepresentationUtils";
+} from "./zipItDataRepresentationUtils.js";
 
 /**
  * Buffer class, used to sequentially writ data.
@@ -23,7 +23,7 @@ export class WriteBuffer {
 	protected data?: Uint8Array = new Uint8Array(4096);
 	protected index = 0;
 
-	protected push(code: number) {
+	protected push(code: number): void {
 		assert(this.data !== undefined, 0x225 /* "Data should be there" */);
 		const length = this.data.length;
 		if (this.index === length) {
@@ -40,7 +40,7 @@ export class WriteBuffer {
 		this.index++;
 	}
 
-	public write(codeArg: number, lengthArg = 1) {
+	public write(codeArg: number, lengthArg = 1): void {
 		let code = codeArg;
 		let length = lengthArg;
 		while (length > 0) {
@@ -121,7 +121,7 @@ const boolToCodeMap = [
  * return 0 as it is usually just represented by marker code and we don't store the actual data.
  * @param num - number to encode.
  */
-export function calcLength(numArg: number) {
+export function calcLength(numArg: number): number {
 	if (numArg === 0) {
 		return 0;
 	}
@@ -148,7 +148,7 @@ function serializeDictionaryString(
 	buffer: WriteBuffer,
 	content: string,
 	dictionary: Map<string, number>,
-) {
+): void {
 	let id = dictionary.get(content);
 	let idLength: number;
 	if (id === undefined) {
@@ -187,7 +187,11 @@ function serializeDictionaryString(
 	buffer.write(id, idLength);
 }
 
-function serializeString(buffer: WriteBuffer, content: string, codeMap = binaryBytesToCodeMap) {
+function serializeString(
+	buffer: WriteBuffer,
+	content: string,
+	codeMap = binaryBytesToCodeMap,
+): void {
 	serializeBlob(buffer, IsoBuffer.from(content, "utf8"), utf8StringBytesToCodeMap);
 }
 
@@ -201,7 +205,7 @@ function serializeBlob(
 	buffer: WriteBuffer,
 	data: Uint8Array,
 	codeMap: Record<number, number> = binaryBytesToCodeMap,
-) {
+): void {
 	const lengthOfDataLen = calcLength(data.length);
 	// Write Marker code.
 	buffer.write(getValueSafely(codeMap, lengthOfDataLen));
@@ -224,7 +228,7 @@ function serializeNodeCore(
 	buffer: WriteBuffer,
 	nodeCore: NodeCore,
 	dictionary: Map<string, number>,
-) {
+): void {
 	for (const child of nodeCore.nodes) {
 		if (child instanceof NodeCore) {
 			// For a tree node start and end with set/list start and end marker codes.
@@ -264,7 +268,7 @@ class NodeCoreSerializer extends NodeCore {
 		super();
 	}
 
-	public serialize(buffer: WriteBuffer) {
+	public serialize(buffer: WriteBuffer): void {
 		serializeNodeCore(buffer, this, new Map<string, number>());
 	}
 }

package/src/checkUrl.ts

@@ -4,7 +4,7 @@
  */
 
 import { DriverPreCheckInfo } from "@fluidframework/driver-definitions";
-import { getLocatorFromOdspUrl } from "./odspFluidFileLink";
+import { getLocatorFromOdspUrl } from "./odspFluidFileLink.js";
 
 /**
  * A check that returns DriverPreCheckInfo if the URL format is likely supported by this driver.
@@ -25,7 +25,9 @@ export function checkUrl(documentUrl: URL): DriverPreCheckInfo | undefined {
 		if (locator?.siteUrl) {
 			siteOrigin = new URL(locator?.siteUrl).origin;
 		}
-	} catch {}
+	} catch {
+		// Drop error
+	}
 
 	return {
 		codeDetailsHint: locator?.containerPackageName,

package/src/compactSnapshotParser.ts

@@ -7,7 +7,7 @@ import { assert } from "@fluidframework/core-utils";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import { ISnapshot } from "@fluidframework/driver-definitions";
-import { ReadBuffer } from "./ReadBufferUtils";
+import { ReadBuffer } from "./ReadBufferUtils.js";
 import {
 	assertBlobCoreInstance,
 	getStringInstance,
@@ -18,8 +18,8 @@ import {
 	NodeCore,
 	NodeTypes,
 	TreeBuilder,
-} from "./zipItDataRepresentationUtils";
-import { measure } from "./odspUtils";
+} from "./zipItDataRepresentationUtils.js";
+import { measure } from "./odspUtils.js";
 
 export const snapshotMinReadVersion = "1.0";
 export const currentReadVersion = "1.0";
@@ -37,7 +37,10 @@ export interface ISnapshotContentsWithProps extends ISnapshot {
  * Recreates blobs section of the tree.
  * @param node - tree node to read blob section from
  */
-function readBlobSection(node: NodeTypes) {
+function readBlobSection(node: NodeTypes): {
+	blobContents: Map<string, ArrayBuffer>;
+	slowBlobStructureCount: number;
+} {
 	assertNodeCoreInstance(node, "TreeBlobs should be of type NodeCore");
 	let slowBlobStructureCount = 0;
 	const blobContents: Map<string, ArrayBuffer> = new Map();
@@ -76,13 +79,14 @@ function readBlobSection(node: NodeTypes) {
  * Recreates ops section of the tree.
  * @param node - tree node to read ops section from
  */
-function readOpsSection(node: NodeTypes) {
+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");
 	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)));
 	}
 	// Due to a bug at service side, in an edge case service was serializing deltas even
@@ -99,7 +103,10 @@ function readOpsSection(node: NodeTypes) {
  * Recreates snapshot tree out of tree representation.
  * @param node - tree node to de-serialize from
  */
-function readTreeSection(node: NodeCore) {
+function readTreeSection(node: NodeCore): {
+	snapshotTree: ISnapshotTree;
+	slowTreeStructureCount: number;
+} {
 	let slowTreeStructureCount = 0;
 	const trees = {};
 	const snapshotTree: ISnapshotTree = {
@@ -116,50 +123,59 @@ function readTreeSection(node: NodeCore) {
 		 */
 		const length = treeNode.length;
 		if (length > 0 && treeNode.getMaybeString(0) === "name") {
-			if (length === 4) {
-				const content = treeNode.getMaybeString(2);
-				// "name": <node name>
-				// "children": <blob id>
-				if (content === "children") {
-					const result = readTreeSection(treeNode.getNode(3));
-					trees[treeNode.getString(1)] = result.snapshotTree;
-					slowTreeStructureCount += result.slowTreeStructureCount;
-					continue;
+			switch (length) {
+				case 4: {
+					const content = treeNode.getMaybeString(2);
+					// "name": <node name>
+					// "children": <blob id>
+					if (content === "children") {
+						const result = readTreeSection(treeNode.getNode(3));
+						trees[treeNode.getString(1)] = result.snapshotTree;
+						slowTreeStructureCount += result.slowTreeStructureCount;
+						continue;
+					}
+					// "name": <node name>
+					// "value": <blob id>
+					if (content === "value") {
+						snapshotTree.blobs[treeNode.getString(1)] = treeNode.getString(3);
+						continue;
+					}
+					break;
 				}
-				// "name": <node name>
-				// "value": <blob id>
-				if (content === "value") {
-					snapshotTree.blobs[treeNode.getString(1)] = treeNode.getString(3);
-					continue;
-				}
-			}
-
-			// "name": <node name>
-			// "nodeType": 3
-			// "value": <blob id>
-			if (
-				length === 6 &&
-				treeNode.getMaybeString(2) === "nodeType" &&
-				treeNode.getMaybeString(4) === "value"
-			) {
-				snapshotTree.blobs[treeNode.getString(1)] = treeNode.getString(5);
-				continue;
-			}
+				case 6: {
+					// "name": <node name>
+					// "nodeType": 3
+					// "value": <blob id>
+					if (
+						treeNode.getMaybeString(2) === "nodeType" &&
+						treeNode.getMaybeString(4) === "value"
+					) {
+						snapshotTree.blobs[treeNode.getString(1)] = treeNode.getString(5);
+						continue;
+					}
 
-			// "name": <node name>
-			// "unreferenced": true
-			// "children": <blob id>
-			if (
-				length === 6 &&
-				treeNode.getMaybeString(2) === "unreferenced" &&
-				treeNode.getMaybeString(4) === "children"
-			) {
-				const result = readTreeSection(treeNode.getNode(5));
-				trees[treeNode.getString(1)] = result.snapshotTree;
-				slowTreeStructureCount += result.slowTreeStructureCount;
-				assert(treeNode.getBool(3), 0x3db /* Unreferenced if present should be true */);
-				snapshotTree.unreferenced = true;
-				continue;
+					// "name": <node name>
+					// "unreferenced": true
+					// "children": <blob id>
+					if (
+						treeNode.getMaybeString(2) === "unreferenced" &&
+						treeNode.getMaybeString(4) === "children"
+					) {
+						const result = readTreeSection(treeNode.getNode(5));
+						trees[treeNode.getString(1)] = result.snapshotTree;
+						slowTreeStructureCount += result.slowTreeStructureCount;
+						assert(
+							treeNode.getBool(3),
+							0x3db /* Unreferenced if present should be true */,
+						);
+						snapshotTree.unreferenced = true;
+						continue;
+					}
+					break;
+				}
+				default: {
+					break;
+				}
 			}
 		}
 
@@ -175,12 +191,27 @@ function readTreeSection(node: NodeCore) {
 			snapshotTree.unreferenced = true;
 		}
 
+		if (records.groupId !== undefined) {
+			const groupId = getStringInstance(records.groupId, "groupId should be a string");
+			snapshotTree.groupId = groupId;
+		}
+
+		if (records.omitted !== undefined) {
+			assertBoolInstance(records.omitted, "omitted should be a boolean");
+			assert(
+				!records.omitted || snapshotTree.groupId !== undefined,
+				0x8df /* GroupId absent but omitted is true */,
+			);
+			snapshotTree.omitted = records.omitted;
+		}
+
 		const path = getStringInstance(records.name, "Path name should be string");
 		if (records.value !== undefined) {
 			snapshotTree.blobs[path] = getStringInstance(
 				records.value,
 				"Blob value should be string",
 			);
+			// eslint-disable-next-line unicorn/no-negated-condition
 		} else if (records.children !== undefined) {
 			assertNodeCoreInstance(records.children, "Trees should be of type NodeCore");
 			const result = readTreeSection(records.children);
@@ -197,7 +228,11 @@ function readTreeSection(node: NodeCore) {
  * Recreates snapshot tree out of tree representation.
  * @param node - tree node to de-serialize from
  */
-function readSnapshotSection(node: NodeTypes) {
+function readSnapshotSection(node: NodeTypes): {
+	sequenceNumber: number;
+	snapshotTree: ISnapshotTree;
+	slowTreeStructureCount: number;
+} {
 	assertNodeCoreInstance(node, "Snapshot should be of type NodeCore");
 	const records = getNodeProps(node);
 
@@ -236,11 +271,11 @@ export function parseCompactSnapshotResponse(
 	}
 
 	assert(
-		parseFloat(snapshotMinReadVersion) >= parseFloat(mrv),
+		Number.parseFloat(snapshotMinReadVersion) >= Number.parseFloat(mrv),
 		0x20f /* "Driver min read version should >= to server minReadVersion" */,
 	);
 	assert(
-		parseFloat(cv) >= parseFloat(snapshotMinReadVersion),
+		Number.parseFloat(cv) >= Number.parseFloat(snapshotMinReadVersion),
 		0x210 /* "Snapshot should be created with minReadVersion or above" */,
 	);
 	assert(
@@ -254,7 +289,7 @@ export function parseCompactSnapshotResponse(
 	return {
 		...snapshot,
 		...blobContents,
-		ops: records.deltas !== undefined ? readOpsSection(records.deltas) : [],
+		ops: records.deltas === undefined ? [] : readOpsSection(records.deltas),
 		latestSequenceNumber: records.lsn,
 		snapshotFormatV: 1,
 		telemetryProps: {

package/src/compactSnapshotWriter.ts

@@ -11,22 +11,22 @@ import {
 	ISnapshotTree,
 } from "@fluidframework/protocol-definitions";
 import { ISnapshot } from "@fluidframework/driver-definitions";
-import { snapshotMinReadVersion } from "./compactSnapshotParser";
-import { TreeBuilderSerializer } from "./WriteBufferUtils";
+import { snapshotMinReadVersion } from "./compactSnapshotParser.js";
+import { TreeBuilderSerializer } from "./WriteBufferUtils.js";
 import {
 	addBoolProperty,
 	addNumberProperty,
 	addStringProperty,
 	addDictionaryStringProperty,
 	NodeCore,
-} from "./zipItDataRepresentationUtils";
+} from "./zipItDataRepresentationUtils.js";
 
 /**
  * Writes header section of the snapshot.
  * @param node - snapshot node to serialize to
  * @param latestSequenceNumber - latest seq number of the container.
  */
-function writeSnapshotProps(node: NodeCore, latestSequenceNumber: number) {
+function writeSnapshotProps(node: NodeCore, latestSequenceNumber: number): void {
 	addStringProperty(node, "mrv", snapshotMinReadVersion);
 	addStringProperty(node, "cv", snapshotMinReadVersion);
 	addNumberProperty(node, "lsn", latestSequenceNumber);
@@ -37,7 +37,7 @@ function writeSnapshotProps(node: NodeCore, latestSequenceNumber: number) {
  * @param snapshotNode - node to serialize to.
  * @param blobs - blobs that is being serialized
  */
-function writeBlobsSection(snapshotNode: NodeCore, blobs: Map<string, IBlob | ArrayBuffer>) {
+function writeBlobsSection(snapshotNode: NodeCore, blobs: Map<string, IBlob | ArrayBuffer>): void {
 	snapshotNode.addDictionaryString("blobs");
 	const blobsNode = snapshotNode.addNode("list");
 	for (const [storageBlobId, blob] of blobs) {
@@ -48,7 +48,7 @@ function writeBlobsSection(snapshotNode: NodeCore, blobs: Map<string, IBlob | Ar
 			blobNode.addBlob(new Uint8Array(blob));
 		} else {
 			blobNode.addBlob(
-				new Uint8Array(stringToBuffer(blob.contents, blob.encoding ?? "utf-8")),
+				new Uint8Array(stringToBuffer(blob.contents, blob.encoding ?? "utf8")),
 			);
 		}
 	}
@@ -59,13 +59,13 @@ function writeBlobsSection(snapshotNode: NodeCore, blobs: Map<string, IBlob | Ar
  * @param snapshotNode - tree node to serialize to
  * @param snapshotTree - snapshot tree that is being serialized
  */
-function writeTreeSection(snapshotNode: NodeCore, snapshotTree: ISnapshotTree) {
+function writeTreeSection(snapshotNode: NodeCore, snapshotTree: ISnapshotTree): void {
 	snapshotNode.addDictionaryString("treeNodes");
 	const treesNode = snapshotNode.addNode("list");
 	writeTreeSectionCore(treesNode, snapshotTree);
 }
 
-function writeTreeSectionCore(treesNode: NodeCore, snapshotTree: ISnapshotTree) {
+function writeTreeSectionCore(treesNode: NodeCore, snapshotTree: ISnapshotTree): void {
 	for (const [path, value] of Object.entries(snapshotTree.trees)) {
 		const treeNode = treesNode.addNode();
 		// Many leaf nodes in the tree have same names like "content", "body", "header"
@@ -81,6 +81,13 @@ function writeTreeSectionCore(treesNode: NodeCore, snapshotTree: ISnapshotTree)
 			const childNode = treeNode.addNode("list");
 			writeTreeSectionCore(childNode, value);
 		}
+		if (snapshotTree.groupId !== undefined) {
+			addDictionaryStringProperty(treeNode, "groupId", snapshotTree.groupId);
+		}
+
+		if (snapshotTree.omitted !== undefined) {
+			addBoolProperty(treeNode, "omitted", snapshotTree.omitted);
+		}
 	}
 
 	if (snapshotTree.blobs) {
@@ -103,7 +110,7 @@ function writeSnapshotSection(
 	rootNode: NodeCore,
 	snapshotTree: ISnapshotTree,
 	snapshotSequenceNumber: number,
-) {
+): void {
 	rootNode.addDictionaryString("snapshot");
 	const snapshotNode = rootNode.addNode();
 
@@ -122,7 +129,7 @@ function writeSnapshotSection(
  * @param rootNode - node to serialize to.
  * @param ops - ops that is being serialized
  */
-function writeOpsSection(rootNode: NodeCore, ops: ISequencedDocumentMessage[]) {
+function writeOpsSection(rootNode: NodeCore, ops: ISequencedDocumentMessage[]): void {
 	let firstSequenceNumber: number | undefined;
 	if (ops.length > 0) {
 		firstSequenceNumber = ops[0].sequenceNumber;
@@ -133,9 +140,9 @@ function writeOpsSection(rootNode: NodeCore, ops: ISequencedDocumentMessage[]) {
 		addNumberProperty(opsNode, "firstSequenceNumber", firstSequenceNumber);
 		opsNode.addDictionaryString("deltas");
 		const deltaNode = opsNode.addNode("list");
-		ops.forEach((op) => {
+		for (const op of ops) {
 			deltaNode.addString(JSON.stringify(op));
-		});
+		}
 	}
 }