@fluidframework/matrix 2.1.0-276985 → 2.1.0

package/src/matrix.ts

@@ -46,6 +46,7 @@ import {
 } from "@tiny-calc/nano";
 import Deque from "double-ended-queue";
 
+import type { HandleCache } from "./handlecache.js";
 import { Handle, isHandleValid } from "./handletable.js";
 import {
 	ISetOp,
@@ -58,7 +59,7 @@ import {
 import { PermutationVector, reinsertSegmentIntoVector } from "./permutationvector.js";
 import { ensureRange } from "./range.js";
 import { deserializeBlob } from "./serialization.js";
-import { SparseArray2D } from "./sparsearray2d.js";
+import { SparseArray2D, type RecurArray } from "./sparsearray2d.js";
 import { IUndoConsumer } from "./types.js";
 import { MatrixUndoProvider } from "./undoprovider.js";
 
@@ -120,6 +121,9 @@ interface CellLastWriteTrackerItem {
  * @legacy
  * @alpha
  */
+// Changing this to `unknown` would be a breaking change.
+// TODO: if possible, transition ISharedMatrix to not use `any`.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export interface ISharedMatrix<T = any>
 	extends IEventProvider<ISharedMatrixEvents<T>>,
 		IMatrixProducer<MatrixItem<T>>,
@@ -215,6 +219,9 @@ export interface ISharedMatrix<T = any>
  * @legacy
  * @alpha
  */
+// Changing this to `unknown` would be a breaking change.
+// TODO: if possible, transition SharedMatrix to not use `any`.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export class SharedMatrix<T = any>
 	extends SharedObject<ISharedMatrixEvents<T> & ISharedObjectEvents>
 	implements ISharedMatrix<T>
@@ -231,6 +238,7 @@ export class SharedMatrix<T = any>
 	 * on the SharedMatrix op is 11.
 	 */
 	private readonly inFlightRefSeqs = new Deque<number>();
+	readonly getMinInFlightRefSeq = (): number | undefined => this.inFlightRefSeqs.get(0);
 
 	private readonly rows: PermutationVector; // Map logical row to storage handle (if any)
 	private readonly cols: PermutationVector; // Map logical col to storage handle (if any)
@@ -261,14 +269,13 @@ export class SharedMatrix<T = any>
 		super(id, runtime, attributes, "fluid_matrix_");
 
 		this.setCellLwwToFwwPolicySwitchOpSeqNumber = -1;
-		const getMinInFlightRefSeq = () => this.inFlightRefSeqs.get(0);
 		this.rows = new PermutationVector(
 			SnapshotPath.rows,
 			this.logger,
 			runtime,
 			this.onRowDelta,
 			this.onRowHandlesRecycled,
-			getMinInFlightRefSeq,
+			this.getMinInFlightRefSeq,
 		);
 
 		this.cols = new PermutationVector(
@@ -277,7 +284,7 @@ export class SharedMatrix<T = any>
 			runtime,
 			this.onColDelta,
 			this.onColHandlesRecycled,
-			getMinInFlightRefSeq,
+			this.getMinInFlightRefSeq,
 		);
 	}
 
@@ -286,7 +293,7 @@ export class SharedMatrix<T = any>
 	/**
 	 * Subscribes the given IUndoConsumer to the matrix.
 	 */
-	public openUndo(consumer: IUndoConsumer) {
+	public openUndo(consumer: IUndoConsumer): void {
 		assert(
 			this.undo === undefined,
 			0x019 /* "SharedMatrix.openUndo() supports at most a single IUndoConsumer." */,
@@ -297,10 +304,10 @@ export class SharedMatrix<T = any>
 
 	// TODO: closeUndo()?
 
-	private get rowHandles() {
+	private get rowHandles(): HandleCache {
 		return this.rows.handleCache;
 	}
-	private get colHandles() {
+	private get colHandles(): HandleCache {
 		return this.cols.handleCache;
 	}
 
@@ -319,14 +326,14 @@ export class SharedMatrix<T = any>
 
 	// #region IMatrixReader
 
-	public get rowCount() {
+	public get rowCount(): number {
 		return this.rows.getLength();
 	}
-	public get colCount() {
+	public get colCount(): number {
 		return this.cols.getLength();
 	}
 
-	public isSetCellConflictResolutionPolicyFWW() {
+	public isSetCellConflictResolutionPolicyFWW(): boolean {
 		return this.setCellLwwToFwwPolicySwitchOpSeqNumber > -1 || this.userSwitchedSetCellPolicy;
 	}
 
@@ -357,7 +364,7 @@ export class SharedMatrix<T = any>
 
 	// #endregion IMatrixReader
 
-	public setCell(row: number, col: number, value: MatrixItem<T>) {
+	public setCell(row: number, col: number, value: MatrixItem<T>): void {
 		if (row < 0 || row >= this.rowCount || col < 0 || col >= this.colCount) {
 			throw new UsageError("Trying to set out-of-bounds cell.");
 		}
@@ -370,7 +377,7 @@ export class SharedMatrix<T = any>
 		colStart: number,
 		colCount: number,
 		values: readonly MatrixItem<T>[],
-	) {
+	): void {
 		const rowCount = Math.ceil(values.length / colCount);
 
 		assert(
@@ -404,7 +411,7 @@ export class SharedMatrix<T = any>
 		value: MatrixItem<T>,
 		rowHandle = this.rows.getAllocatedHandle(row),
 		colHandle = this.cols.getAllocatedHandle(col),
-	) {
+	): void {
 		this.protectAgainstReentrancy(() => {
 			if (this.undo !== undefined) {
 				let oldValue = this.cells.getCell(rowHandle, colHandle);
@@ -428,7 +435,11 @@ export class SharedMatrix<T = any>
 		});
 	}
 
-	private createOpMetadataLocalRef(vector: PermutationVector, pos: number, localSeq: number) {
+	private createOpMetadataLocalRef(
+		vector: PermutationVector,
+		pos: number,
+		localSeq: number,
+	): LocalReferencePosition {
 		const segoff = vector.getContainingSegment(pos, undefined, localSeq);
 		assert(
 			segoff.segment !== undefined && segoff.offset !== undefined,
@@ -449,7 +460,7 @@ export class SharedMatrix<T = any>
 		rowHandle: Handle,
 		colHandle: Handle,
 		localSeq = this.nextLocalSeq(),
-	) {
+	): void {
 		assert(
 			this.isAttached(),
 			0x1e2 /* "Caller must ensure 'isAttached()' before calling 'sendSetCellOp'." */,
@@ -487,7 +498,7 @@ export class SharedMatrix<T = any>
 	 * a deleted row/col.
 	 * @param callback - code that needs to protected against reentrancy.
 	 */
-	private protectAgainstReentrancy(callback: () => void) {
+	private protectAgainstReentrancy(callback: () => void): void {
 		if (this.reentrantCount !== 0) {
 			// Validate that applications don't submit edits in response to matrix change notifications. This is unsupported.
 			throw new UsageError("Reentrancy detected in SharedMatrix.");
@@ -509,7 +520,7 @@ export class SharedMatrix<T = any>
 		oppositeVector: PermutationVector,
 		target: SnapshotPath.rows | SnapshotPath.cols,
 		message: IMergeTreeOp,
-	) {
+	): void {
 		// Ideally, we would have a single 'localSeq' counter that is shared between both PermutationVectors
 		// and the SharedMatrix's cell data.  Instead, we externally advance each MergeTree's 'localSeq' counter
 		// for each submitted op it not aware of to keep them synchronized.
@@ -540,11 +551,11 @@ export class SharedMatrix<T = any>
 		}
 	}
 
-	private submitColMessage(message: IMergeTreeOp) {
+	private submitColMessage(message: IMergeTreeOp): void {
 		this.submitVectorMessage(this.cols, this.rows, SnapshotPath.cols, message);
 	}
 
-	public insertCols(colStart: number, count: number) {
+	public insertCols(colStart: number, count: number): void {
 		if (count === 0) {
 			return;
 		}
@@ -558,7 +569,7 @@ export class SharedMatrix<T = any>
 		});
 	}
 
-	public removeCols(colStart: number, count: number) {
+	public removeCols(colStart: number, count: number): void {
 		if (count === 0) {
 			return;
 		}
@@ -570,11 +581,11 @@ export class SharedMatrix<T = any>
 		);
 	}
 
-	private submitRowMessage(message: IMergeTreeOp) {
+	private submitRowMessage(message: IMergeTreeOp): void {
 		this.submitVectorMessage(this.rows, this.cols, SnapshotPath.rows, message);
 	}
 
-	public insertRows(rowStart: number, count: number) {
+	public insertRows(rowStart: number, count: number): void {
 		if (count === 0) {
 			return;
 		}
@@ -588,7 +599,7 @@ export class SharedMatrix<T = any>
 		});
 	}
 
-	public removeRows(rowStart: number, count: number) {
+	public removeRows(rowStart: number, count: number): void {
 		if (count === 0) {
 			return;
 		}
@@ -600,7 +611,7 @@ export class SharedMatrix<T = any>
 		);
 	}
 
-	public _undoRemoveRows(rowStart: number, spec: IJSONSegment) {
+	public _undoRemoveRows(rowStart: number, spec: IJSONSegment): void {
 		const { op, inserted } = reinsertSegmentIntoVector(this.rows, rowStart, spec);
 		assert(op !== undefined, 0x8b6 /* must be defined */);
 		this.submitRowMessage(op);
@@ -610,7 +621,9 @@ export class SharedMatrix<T = any>
 		const rowCount = inserted.cachedLength;
 		for (let row = rowStart; row < rowStart + rowCount; row++, rowHandle++) {
 			for (let col = 0; col < this.colCount; col++) {
-				const colHandle = this.colHandles.getHandle(col);
+				// TODO Non null asserting, why is this not null?
+				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+				const colHandle = this.colHandles.getHandle(col)!;
 				const value = this.cells.getCell(rowHandle, colHandle);
 				if (this.isAttached() && value !== undefined && value !== null) {
 					this.sendSetCellOp(row, col, value, rowHandle, colHandle);
@@ -624,7 +637,7 @@ export class SharedMatrix<T = any>
 		}
 	}
 
-	/***/ public _undoRemoveCols(colStart: number, spec: IJSONSegment) {
+	/***/ public _undoRemoveCols(colStart: number, spec: IJSONSegment): void {
 		const { op, inserted } = reinsertSegmentIntoVector(this.cols, colStart, spec);
 		assert(op !== undefined, 0x8b7 /* must be defined */);
 		this.submitColMessage(op);
@@ -634,7 +647,9 @@ export class SharedMatrix<T = any>
 		const colCount = inserted.cachedLength;
 		for (let col = colStart; col < colStart + colCount; col++, colHandle++) {
 			for (let row = 0; row < this.rowCount; row++) {
-				const rowHandle = this.rowHandles.getHandle(row);
+				// TODO Non null asserting, why is this not null?
+				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+				const rowHandle = this.rowHandles.getHandle(row)!;
 				const value = this.cells.getCell(rowHandle, colHandle);
 				if (this.isAttached() && value !== undefined && value !== null) {
 					this.sendSetCellOp(row, col, value, rowHandle, colHandle);
@@ -679,7 +694,7 @@ export class SharedMatrix<T = any>
 	 * Runs serializer on the GC data for this SharedMatrix.
 	 * All the IFluidHandle's stored in the cells represent routes to other objects.
 	 */
-	protected processGCDataCore(serializer: IFluidSerializer) {
+	protected processGCDataCore(serializer: IFluidSerializer): void {
 		for (let row = 0; row < this.rowCount; row++) {
 			for (let col = 0; col < this.colCount; col++) {
 				serializer.stringify(this.getCell(row, col), this.handle);
@@ -693,7 +708,7 @@ export class SharedMatrix<T = any>
 	 * Do not use with 'submitColMessage()/submitRowMessage()' as these helpers + the MergeTree will
 	 * automatically advance 'localSeq'.
 	 */
-	private nextLocalSeq() {
+	private nextLocalSeq(): number {
 		// Ideally, we would have a single 'localSeq' counter that is shared between both PermutationVectors
 		// and the SharedMatrix's cell data.  Instead, we externally bump each MergeTree's 'localSeq' counter
 		// for SharedMatrix ops it's not aware of to keep them synchronized.  (For cell data operations, we
@@ -703,7 +718,7 @@ export class SharedMatrix<T = any>
 		return ++this.rows.getCollabWindow().localSeq;
 	}
 
-	protected submitLocalMessage(message: any, localOpMetadata?: any) {
+	protected submitLocalMessage(message: unknown, localOpMetadata?: unknown): void {
 		// TODO: Recommend moving this assertion into SharedObject
 		//       (See https://github.com/microsoft/FluidFramework/issues/2559)
 		assert(
@@ -721,7 +736,7 @@ export class SharedMatrix<T = any>
 		);
 	}
 
-	protected didAttach() {
+	protected didAttach(): void {
 		// We've attached we need to start generating and sending ops.
 		// so start collaboration and provide a default client id incase we are not connected
 		if (this.isAttached()) {
@@ -730,7 +745,7 @@ export class SharedMatrix<T = any>
 		}
 	}
 
-	protected onConnect() {
+	protected onConnect(): void {
 		assert(
 			this.rows.getCollabWindow().collaborating === this.cols.getCollabWindow().collaborating,
 			0x01f /* "Row and col collab window 'collaborating' status desynchronized!" */,
@@ -763,7 +778,7 @@ export class SharedMatrix<T = any>
 		return client.findReconnectionPosition(segment, localSeq) + offset;
 	}
 
-	protected reSubmitCore(incoming: unknown, localOpMetadata: unknown) {
+	protected reSubmitCore(incoming: unknown, localOpMetadata: unknown): void {
 		const originalRefSeq = this.inFlightRefSeqs.shift();
 		assert(
 			originalRefSeq !== undefined,
@@ -805,7 +820,7 @@ export class SharedMatrix<T = any>
 			}
 		} else {
 			switch (content.target) {
-				case SnapshotPath.cols:
+				case SnapshotPath.cols: {
 					this.submitColMessage(
 						this.cols.regeneratePendingOp(
 							content,
@@ -814,7 +829,8 @@ export class SharedMatrix<T = any>
 						),
 					);
 					break;
-				case SnapshotPath.rows:
+				}
+				case SnapshotPath.rows: {
 					this.submitRowMessage(
 						this.rows.regeneratePendingOp(
 							content,
@@ -823,6 +839,7 @@ export class SharedMatrix<T = any>
 						),
 					);
 					break;
+				}
 				default: {
 					unreachableCase(content);
 				}
@@ -830,12 +847,12 @@ export class SharedMatrix<T = any>
 		}
 	}
 
-	protected onDisconnect() {}
+	protected onDisconnect(): void {}
 
 	/**
 	 * {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
 	 */
-	protected async loadCore(storage: IChannelStorageService) {
+	protected async loadCore(storage: IChannelStorageService): Promise<void> {
 		try {
 			await this.rows.load(
 				this.runtime,
@@ -852,7 +869,13 @@ export class SharedMatrix<T = any>
 				_pendingCliSeqData,
 				setCellLwwToFwwPolicySwitchOpSeqNumber,
 				cellLastWriteTracker,
-			] = await deserializeBlob(storage, SnapshotPath.cells, this.serializer);
+				// Cast is needed since the (de)serializer returns content of type `any`.
+			] = (await deserializeBlob(storage, SnapshotPath.cells, this.serializer)) as [
+				RecurArray<MatrixItem<T>>,
+				unknown,
+				number,
+				RecurArray<CellLastWriteTrackerItem>,
+			];
 
 			this.cells = SparseArray2D.load(cellData);
 			this.setCellLwwToFwwPolicySwitchOpSeqNumber =
@@ -873,7 +896,7 @@ export class SharedMatrix<T = any>
 		rowHandle: Handle,
 		colHandle: Handle,
 		message: ISequencedDocumentMessage,
-	) {
+	): boolean {
 		assert(
 			this.setCellLwwToFwwPolicySwitchOpSeqNumber > -1,
 			0x85f /* should be in Fww mode when calling this method */,
@@ -896,7 +919,7 @@ export class SharedMatrix<T = any>
 		msg: ISequencedDocumentMessage,
 		local: boolean,
 		localOpMetadata: unknown,
-	) {
+	): void {
 		if (local) {
 			const recordedRefSeq = this.inFlightRefSeqs.shift();
 			assert(recordedRefSeq !== undefined, 0x8ba /* No pending recorded refSeq found */);
@@ -913,12 +936,14 @@ export class SharedMatrix<T = any>
 		const target = contents.target;
 
 		switch (target) {
-			case SnapshotPath.cols:
+			case SnapshotPath.cols: {
 				this.cols.applyMsg(msg, local);
 				break;
-			case SnapshotPath.rows:
+			}
+			case SnapshotPath.rows: {
 				this.rows.applyMsg(msg, local);
 				break;
+			}
 			case undefined: {
 				assert(
 					contents.type === MatrixOp.set,
@@ -1018,8 +1043,9 @@ export class SharedMatrix<T = any>
 				}
 				break;
 			}
-			default:
+			default: {
 				unreachableCase(target, "unknown target");
+			}
 		}
 	}
 
@@ -1028,7 +1054,7 @@ export class SharedMatrix<T = any>
 		position: number,
 		removedCount: number,
 		insertedCount: number,
-	) => {
+	): void => {
 		for (const consumer of this.consumers) {
 			consumer.rowsChanged(position, removedCount, insertedCount, this);
 		}
@@ -1039,13 +1065,13 @@ export class SharedMatrix<T = any>
 		position: number,
 		removedCount: number,
 		insertedCount: number,
-	) => {
+	): void => {
 		for (const consumer of this.consumers) {
 			consumer.colsChanged(position, removedCount, insertedCount, this);
 		}
 	};
 
-	private readonly onRowHandlesRecycled = (rowHandles: Handle[]) => {
+	private readonly onRowHandlesRecycled = (rowHandles: Handle[]): void => {
 		for (const rowHandle of rowHandles) {
 			this.cells.clearRows(/* rowStart: */ rowHandle, /* rowCount: */ 1);
 			this.pending.clearRows(/* rowStart: */ rowHandle, /* rowCount: */ 1);
@@ -1053,7 +1079,7 @@ export class SharedMatrix<T = any>
 		}
 	};
 
-	private readonly onColHandlesRecycled = (colHandles: Handle[]) => {
+	private readonly onColHandlesRecycled = (colHandles: Handle[]): void => {
 		for (const colHandle of colHandles) {
 			this.cells.clearCols(/* colStart: */ colHandle, /* colCount: */ 1);
 			this.pending.clearCols(/* colStart: */ colHandle, /* colCount: */ 1);
@@ -1061,7 +1087,7 @@ export class SharedMatrix<T = any>
 		}
 	};
 
-	public switchSetCellPolicy() {
+	public switchSetCellPolicy(): void {
 		if (this.setCellLwwToFwwPolicySwitchOpSeqNumber === -1) {
 			if (this.isAttached()) {
 				this.userSwitchedSetCellPolicy = true;
@@ -1079,7 +1105,11 @@ export class SharedMatrix<T = any>
 	 * clobber the write op at the given 'localSeq'.  This includes later ops that overwrite the cell
 	 * with a different value as well as row/col removals that might recycled the given row/col handles.
 	 */
-	private isLatestPendingWrite(rowHandle: Handle, colHandle: Handle, localSeq: number) {
+	private isLatestPendingWrite(
+		rowHandle: Handle,
+		colHandle: Handle,
+		localSeq: number,
+	): boolean {
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 		const pendingLocalSeq = this.pending.getCell(rowHandle, colHandle)!;
 
@@ -1096,7 +1126,7 @@ export class SharedMatrix<T = any>
 		return pendingLocalSeq === localSeq;
 	}
 
-	public toString() {
+	public toString(): string {
 		let s = `client:${
 			this.runtime.clientId
 		}\nrows: ${this.rows.toString()}\ncols: ${this.cols.toString()}\n\n`;

package/src/packageVersion.ts

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

package/src/permutationvector.ts

@@ -20,6 +20,8 @@ import {
 	ISegment,
 	MergeTreeDeltaType,
 	MergeTreeMaintenanceType,
+	type IMergeTreeInsertMsg,
+	type IMergeTreeRemoveMsg,
 } from "@fluidframework/merge-tree/internal";
 import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal";
 import {
@@ -45,7 +47,7 @@ export class PermutationSegment extends BaseSegment {
 	public static readonly typeString: string = "PermutationSegment";
 	private _start = Handle.unallocated;
 
-	public static fromJSONObject(spec: any) {
+	public static fromJSONObject(spec: IJSONSegment): PermutationSegment {
 		const [length, start] = spec as PermutationSegmentSpec;
 		return new PermutationSegment(length, start);
 	}
@@ -58,7 +60,7 @@ export class PermutationSegment extends BaseSegment {
 		this.cachedLength = length;
 	}
 
-	public get start() {
+	public get start(): Handle {
 		return this._start;
 	}
 	public set start(value: Handle) {
@@ -74,15 +76,15 @@ export class PermutationSegment extends BaseSegment {
 		this._start = value;
 	}
 
-	public reset() {
+	public reset(): void {
 		this._start = Handle.unallocated;
 	}
 
-	public toJSONObject() {
+	public toJSONObject(): number[] {
 		return [this.cachedLength, this.start];
 	}
 
-	public clone(start = 0, end = this.cachedLength) {
+	public clone(start = 0, end = this.cachedLength): PermutationSegment {
 		const b = new PermutationSegment(
 			/* length: */ end - start,
 			/* start: */ this.start + start,
@@ -91,7 +93,7 @@ export class PermutationSegment extends BaseSegment {
 		return b;
 	}
 
-	public canAppend(segment: ISegment) {
+	public canAppend(segment: ISegment): boolean {
 		const asPerm = segment as PermutationSegment;
 
 		return this.start === Handle.unallocated
@@ -99,7 +101,7 @@ export class PermutationSegment extends BaseSegment {
 			: asPerm.start === this.start + this.cachedLength;
 	}
 
-	protected createSplitSegmentAt(pos: number) {
+	protected createSplitSegmentAt(pos: number): PermutationSegment {
 		assert(
 			0 < pos && pos < this.cachedLength,
 			0x026 /* "Trying to split segment at out-of-bounds position!" */,
@@ -115,7 +117,7 @@ export class PermutationSegment extends BaseSegment {
 		return leafSegment;
 	}
 
-	public toString() {
+	public toString(): string {
 		return this.start === Handle.unallocated
 			? `<${this.cachedLength} empty>`
 			: `<${this.cachedLength}: ${this.start}..${this.start + this.cachedLength - 1}>`;
@@ -154,11 +156,11 @@ export class PermutationVector extends Client {
 		this.on("maintenance", this.onMaintenance);
 	}
 
-	public insert(start: number, length: number) {
+	public insert(start: number, length: number): IMergeTreeInsertMsg | undefined {
 		return this.insertSegmentLocal(start, new PermutationSegment(length));
 	}
 
-	public remove(start: number, length: number) {
+	public remove(start: number, length: number): IMergeTreeRemoveMsg {
 		return this.removeRangeLocal(start, start + length);
 	}
 
@@ -168,7 +170,9 @@ export class PermutationVector extends Client {
 			0x027 /* "Trying to get handle of out-of-bounds position!" */,
 		);
 
-		return this.handleCache.getHandle(pos);
+		// TODO Non null asserting, why is this not null?
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		return this.handleCache.getHandle(pos)!;
 	}
 
 	public getAllocatedHandle(pos: number): Handle {
@@ -197,7 +201,7 @@ export class PermutationVector extends Client {
 	public adjustPosition(
 		pos: number,
 		op: Pick<ISequencedDocumentMessage, "referenceSequenceNumber" | "clientId">,
-	) {
+	): number | undefined {
 		const { segment, offset } = this.getContainingSegment(pos, {
 			referenceSequenceNumber: op.referenceSequenceNumber,
 			clientId: op.clientId,
@@ -214,7 +218,7 @@ export class PermutationVector extends Client {
 		return this.getPosition(segment) + offset!;
 	}
 
-	public handleToPosition(handle: Handle, localSeq = this.getCollabWindow().localSeq) {
+	public handleToPosition(handle: Handle, localSeq = this.getCollabWindow().localSeq): number {
 		assert(
 			localSeq <= this.getCollabWindow().localSeq,
 			0x028 /* "'localSeq' for op being resubmitted must be <= the 'localSeq' of the last submitted op." */,
@@ -296,12 +300,15 @@ export class PermutationVector extends Client {
 		runtime: IFluidDataStoreRuntime,
 		storage: IChannelStorageService,
 		serializer: IFluidSerializer,
-	) {
-		const handleTableData = await deserializeBlob(
+	): Promise<{
+		catchupOpsP: Promise<ISequencedDocumentMessage[]>;
+	}> {
+		const handleTableData = (await deserializeBlob(
 			storage,
 			SnapshotPath.handleTable,
 			serializer,
-		);
+			// Cast is needed since the (de)serializer returns content of type `any`.
+		)) as Handle[];
 
 		this.handleTable = HandleTable.load<never>(handleTableData);
 
@@ -315,7 +322,7 @@ export class PermutationVector extends Client {
 	private readonly onDelta = (
 		opArgs: IMergeTreeDeltaOpArgs,
 		deltaArgs: IMergeTreeDeltaCallbackArgs,
-	) => {
+	): void => {
 		// Apply deltas in descending order to prevent positions from shifting.
 		const ranges = deltaArgs.deltaSegments
 			.map(({ segment }) => ({
@@ -332,7 +339,7 @@ export class PermutationVector extends Client {
 		}
 
 		switch (deltaArgs.operation) {
-			case MergeTreeDeltaType.INSERT:
+			case MergeTreeDeltaType.INSERT: {
 				// Pass 1: Perform any internal maintenance first to avoid reentrancy.
 				for (const { segment, position } of ranges) {
 					// HACK: We need to include the allocated handle in the segment's JSON representation
@@ -356,6 +363,7 @@ export class PermutationVector extends Client {
 					);
 				}
 				break;
+			}
 
 			case MergeTreeDeltaType.REMOVE: {
 				// Pass 1: Perform any internal maintenance first to avoid reentrancy.
@@ -378,12 +386,13 @@ export class PermutationVector extends Client {
 				break;
 			}
 
-			default:
+			default: {
 				throw new Error("Unhandled MergeTreeDeltaType");
+			}
 		}
 	};
 
-	private readonly onMaintenance = (args: IMergeTreeMaintenanceCallbackArgs) => {
+	private readonly onMaintenance = (args: IMergeTreeMaintenanceCallbackArgs): void => {
 		if (args.operation === MergeTreeMaintenanceType.UNLINK) {
 			let freed: number[] = [];
 
@@ -391,8 +400,11 @@ export class PermutationVector extends Client {
 				const asPerm = segment as PermutationSegment;
 				if (isHandleValid(asPerm.start)) {
 					// Note: Using the spread operator with `.splice()` can exhaust the stack.
+					// eslint-disable-next-line unicorn/prefer-spread
 					freed = freed.concat(
-						new Array(asPerm.cachedLength).fill(0).map((value, index) => index + asPerm.start),
+						Array.from({ length: asPerm.cachedLength })
+							.fill(0)
+							.map((value, index) => index + asPerm.start),
 					);
 				}
 			}
@@ -408,7 +420,7 @@ export class PermutationVector extends Client {
 		}
 	};
 
-	public toString() {
+	public toString(): string {
 		const s: string[] = [];
 
 		this.walkSegments((segment) => {
@@ -425,7 +437,10 @@ export function reinsertSegmentIntoVector(
 	vector: PermutationVector,
 	pos: number,
 	spec: IJSONSegment,
-) {
+): {
+	op: IMergeTreeInsertMsg | undefined;
+	inserted: PermutationSegment;
+} {
 	const original = PermutationSegment.fromJSONObject(spec);
 
 	// (Re)insert the removed number of rows at the original position.

package/src/range.ts

@@ -6,7 +6,7 @@
 /**
  * Ensures that 0 \<= 'value' \< 'limit'.  Throws a RangeError otherwise.
  */
-export function ensureRange(value: number, limit: number) {
+export function ensureRange(value: number, limit: number): void {
 	// Coerce 'value' to Uint32 so that we can range check with a single branch.
 	const _value = value >>> 0; // eslint-disable-line no-bitwise