fix lint

Author: Abram Sanderson

packages/dds/merge-tree/src/partialLengths.ts

@@ -239,30 +239,30 @@ export class PartialSequenceLengths {
 	 *
 	 * As per doc comment on {@link PartialSequenceLengths}, the overall adjustment performed for the perspective of
 	 * (clientId, refSeq) is given by the sum of length deltas in `perClientAdjustments[clientId]`
-	 * for all sequence numbers S such that S >= refSeq.
+	 * for all sequence numbers S such that S \>= refSeq.
 	 *
 	 * (since these are ordered by sequence number and we cache cumulative sums, this is implemented using two lookups and a subtraction).
 	 *
 	 * The specific adjustments that are made roughly categorize as follows:
 	 *
 	 * - Ops submitted by a given client generally receive a partial lengths entry corresponding to their sequence number.
-	 *   e.g. insert of "ABC" at seq 5 will have a per-client adjustment entry of { seq: 5, seglen: 3 }.
+	 * e.g. insert of "ABC" at seq 5 will have a per-client adjustment entry of \{ seq: 5, seglen: 3 \}.
 	 *
 	 * - When client A deletes a segment concurrently with client B and loses the race (B's delete is sequenced first),
-	 *   A's per-client adjustments will contain an entry with a negative `seglen` corresponding to the length of the segment
-	 *   and a sequence number corresponding to that of B's delete. It will *not* receive a per-client adjustment for its own delete.
-	 *   This ensures that for perspectives (A, refSeq), the deleted segment will show up as a negative delta for all values of refSeq, since:
-	 *   - For refSeq < B's delete, the per-client adjustment will apply and be added to the total length
-	 *   - For refSeq >= B's delete, B's partial length entry in the overall set will apply, and the per-client adjustment will not apply
+	 * A's per-client adjustments will contain an entry with a negative `seglen` corresponding to the length of the segment
+	 * and a sequence number corresponding to that of B's delete. It will *not* receive a per-client adjustment for its own delete.
+	 * This ensures that for perspectives (A, refSeq), the deleted segment will show up as a negative delta for all values of refSeq, since:
+	 * 1. For refSeq \< B's delete, the per-client adjustment will apply and be added to the total length
+	 * 2. For refSeq \>= B's delete, B's partial length entry in the overall set will apply, and the per-client adjustment will not apply
 	 *
 	 * - When client A attempts to insert a segment into a location that is concurrently obliterated by client B immediately upon insertion,
-	 *   A's per-client adjustments will again not include an entry for its own insert.
-	 *   Instead, the entry which would normally contain `seq` equal to that of A's insert would instead have `seq` equal to that of B's obliterate.
-	 *   This gives the overall correct behavior: for any perspective which isn't client A, there is no adjustment necessary anywhere (it's as if
-	 *   the segment never existed). For client A's perspective, the segment should be considered visible until A has acked B's obliterate.
-	 *   This is accomplished as for the perspective (A, refSeq):
-	 *   - For refSeq < B's obliterate, the segment length will be included as part of the per-client adjustment for A
-	 * 	 - For refSeq >= B's obliterate, the segment will be omitted from the per-client adjustment for A
+	 * A's per-client adjustments will again not include an entry for its own insert.
+	 * Instead, the entry which would normally contain `seq` equal to that of A's insert would instead have `seq` equal to that of B's obliterate.
+	 * This gives the overall correct behavior: for any perspective which isn't client A, there is no adjustment necessary anywhere (it's as if
+	 * the segment never existed). For client A's perspective, the segment should be considered visible until A has acked B's obliterate.
+	 * This is accomplished as for the perspective (A, refSeq):
+	 * 1. For refSeq \< B's obliterate, the segment length will be included as part of the per-client adjustment for A
+	 * 2. For refSeq \>= B's obliterate, the segment will be omitted from the per-client adjustment for A
 	 *
 	 * Note that the special-casing for inserting segments that are immediately obliterated is only necessary for segments that never were visible
 	 * in the tree. If an insert and obliterate are concurrent but the insert is sequenced first, the normal per-client adjustment is fine.
@@ -463,16 +463,7 @@ export class PartialSequenceLengths {
 			}
 		}
 
-		// TODO: Consider putting the overall length post-process bit back, but for now this should be handled
-		// by addOrUpdate
-		try {
-			PartialSequenceLengths.options.verifier?.(combinedPartialLengths);
-		} catch (err) {
-			if (retry) {
-				this.fromLeaves(block, collabWindow, computeLocalPartials, false);
-			}
-			throw err;
-		}
+		PartialSequenceLengths.options.verifier?.(combinedPartialLengths);
 		return combinedPartialLengths;
 	}
 
@@ -506,16 +497,18 @@ export class PartialSequenceLengths {
 			// Implication -> this is a local segment which will be obliterated as soon as it is acked.
 			// For refSeqs preceding that movedSeq and localSeqs following the localSeq, it will be visible.
 			// For the rest, it will not be visible.
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			const localSeq = segment.localSeq!;
 			partials.addOrUpdate({
-				seq: segment.localSeq!,
+				seq: localSeq,
 				len: 0,
 				seglen: segment.cachedLength,
 				clientId,
 			});
 
 			combinedPartialLengths.addLocalAdjustment({
 				refSeq: moveInfo.movedSeq,
-				localSeq: segment.localSeq!,
+				localSeq,
 				seglen: -segment.cachedLength,
 			});
 		} else {
@@ -850,18 +843,15 @@ export class PartialSequenceLengths {
 				}
 				segCount += branchPartialLengths.segmentCount;
 
-				// I kinda like the sparse loop, but Number.parseInt it forces is pretty ugly.
-				for (const clientId in branchPartialLengths.perClientAdjustments) {
-					const clientAdjustments = branchPartialLengths.perClientAdjustments[clientId];
-					if (clientAdjustments === undefined) {
-						continue;
-					}
-
-					const leqPartial = clientAdjustments.latestLeq(seq);
-					if (leqPartial && leqPartial.seq === seq) {
-						this.addClientSeqNumber(Number.parseInt(clientId), seq, leqPartial.seglen);
+				// The suggested for..of alternative doesn't give easy access to the index while
+				// exploiting sparseness.
+				// eslint-disable-next-line unicorn/no-array-for-each
+				branchPartialLengths.perClientAdjustments.forEach((clientAdjustments, id) => {
+					const leqBranchPartial = clientAdjustments.latestLeq(seq);
+					if (leqBranchPartial && leqBranchPartial.seq === seq) {
+						this.addClientSeqNumber(id, seq, leqBranchPartial.seglen);
 					}
-				}
+				});
 			}
 		}
 
@@ -1041,7 +1031,7 @@ export class PartialSequenceLengths {
 	}
 
 	/**
-	 * @returns The partial lengths associated with the latest change associated with `clientId` at or before `refSeq`.
+	 * Returns the partial lengths associated with the latest change associated with `clientId` at or before `refSeq`.
 	 * Returns undefined if no such change exists.
 	 */
 	private latestClientEntryLEQ(
@@ -1052,7 +1042,7 @@ export class PartialSequenceLengths {
 	}
 
 	/**
-	 * @returns The partial lengths associated with the most recent change received by `clientId`, or undefined
+	 * Get the partial lengths associated with the most recent change received by `clientId`, or undefined
 	 * if this client has made no changes in this block within the collab window.
 	 */
 	private latestClientEntry(clientId: number): PartialSequenceLength | undefined {

packages/dds/merge-tree/src/test/mergeTreeOperationRunner.ts

@@ -367,22 +367,22 @@ export function generateOperationMessagesForClients(
 
 		const len = client.getLength();
 		const sg = client.peekPendingSegmentGroups();
-		let op: IMergeTreeOp[] | IMergeTreeOp | undefined;
+		let opOrOps: IMergeTreeOp[] | IMergeTreeOp | undefined;
 		if (len === 0 || len < minLength) {
-			op =
+			opOrOps =
 				insertText === undefined ? generateInsert(client, random) : insertText(client, random);
 		} else {
 			let opIndex = random.integer(0, operations.length - 1);
 			const start = random.integer(0, len - 1);
 			const end = random.integer(start + 1, len);
 
-			for (let y = 0; y < operations.length && op === undefined; y++) {
-				op = operations[opIndex](client, start, end, random);
+			for (let y = 0; y < operations.length && opOrOps === undefined; y++) {
+				opOrOps = operations[opIndex](client, start, end, random);
 				opIndex++;
 				opIndex %= operations.length;
 			}
 		}
-		if (op !== undefined) {
+		if (opOrOps !== undefined) {
 			// Pre-check to avoid logger.toString() in the string template
 			if (sg === client.peekPendingSegmentGroups()) {
 				assert.notEqual(
@@ -392,7 +392,7 @@ export function generateOperationMessagesForClients(
 				);
 			}
 
-			const ops = Array.isArray(op) ? op : [op];
+			const ops = Array.isArray(opOrOps) ? opOrOps : [opOrOps];
 			const totalIndividualOps = ops
 				.map((o) => (o.type === MergeTreeDeltaType.GROUP ? o.ops.length : 1))
 				.reduce((a, b) => a + b, 0);

packages/dds/merge-tree/src/test/obliterate.concurrent.spec.ts

@@ -8,11 +8,11 @@ import { strict as assert } from "node:assert";
 import { LoggingError } from "@fluidframework/telemetry-utils/internal";
 
 import { MergeTree } from "../mergeTree.js";
+import { Side } from "../sequencePlace.js";
 
 import { PartialSyncTestHelper } from "./partialSyncHelper.js";
 import { ReconnectTestHelper } from "./reconnectHelper.js";
 import { useStrictPartialLengthChecks } from "./testUtils.js";
-import { Side } from "../sequencePlace.js";
 
 /**
  * Some tests contain ASCII diagrams of the trees to make it easier to reason about

packages/dds/merge-tree/src/test/obliterateOperations.ts

@@ -20,7 +20,7 @@ const posInField = (
 	client: TestClient,
 	pos: number,
 ): { startPos: number; endPos: number } | undefined => {
-	const isFieldCharacter = (char: string) =>
+	const isFieldCharacter = (char: string): boolean =>
 		Number.isInteger(Number(char)) || char === "{" || char === "}";
 	if (pos >= client.getLength() || !isFieldCharacter(client.getText(pos, pos + 1))) {
 		// pos is not within a field.

packages/dds/merge-tree/src/test/partialSyncHelper.ts

@@ -99,13 +99,13 @@ export class PartialSyncTestHelper {
 			"Cannot attempt to advance clients to sequence numbers that don't yet exist",
 		);
 		let startIndex: number;
-		if (lastApplied !== undefined) {
+		if (lastApplied === undefined) {
+			startIndex = 0;
+		} else {
 			if (lastApplied >= seq) {
 				return;
 			}
 			startIndex = lastApplied;
-		} else {
-			startIndex = 0;
 		}
 		for (let i = startIndex; i < seq; i++) {
 			const nextMessage = this.ops[i];