@fluidframework/matrix 2.0.0-internal.7.3.0 → 2.0.0-internal.8.0.0

package/src/matrix.ts

@@ -3,9 +3,8 @@
  * Licensed under the MIT License.
  */
 
-/* eslint-disable import/no-deprecated */
-
 import { assert } from "@fluidframework/core-utils";
+import { IEventThisPlaceHolder } from "@fluidframework/core-interfaces";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import {
 	IFluidDataStoreRuntime,
@@ -15,6 +14,7 @@ import {
 } from "@fluidframework/datastore-definitions";
 import {
 	IFluidSerializer,
+	ISharedObjectEvents,
 	makeHandlesSerializable,
 	parseHandles,
 	SharedObject,
@@ -27,6 +27,7 @@ import {
 	MergeTreeDeltaType,
 	IMergeTreeOp,
 	SegmentGroup,
+	// eslint-disable-next-line import/no-deprecated
 	Client,
 	IJSONSegment,
 } from "@fluidframework/merge-tree";
@@ -51,6 +52,7 @@ interface ISetOp<T> {
 	row: number;
 	col: number;
 	value: MatrixItem<T>;
+	fwwMode?: boolean;
 }
 
 interface ISetOpMetadata {
@@ -59,12 +61,57 @@ interface ISetOpMetadata {
 	localSeq: number;
 	rowsRefSeq: number;
 	colsRefSeq: number;
+	referenceSeqNumber: number;
+}
+
+/**
+ * Events emitted by Shared Matrix.
+ * @alpha
+ */
+export interface ISharedMatrixEvents<T> extends ISharedObjectEvents {
+	/**
+	 * This event is only emitted when the SetCell Resolution Policy is First Write Win(FWW).
+	 * This is emitted when two clients race and send changes without observing each other changes,
+	 * the changes that gets sequenced last would be rejected, and only client who's changes rejected
+	 * would be notified via this event, with expectation that it will merge its changes back by
+	 * accounting new information (state from winner of the race).
+	 *
+	 * @remarks Listener parameters:
+	 *
+	 * - `row` - Row number at which conflict happened.
+	 *
+	 * - `col` - Col number at which conflict happened.
+	 *
+	 * - `currentValue` - The current value of the cell.
+	 *
+	 * - `conflictingValue` - The value that this client tried to set in the cell and got ignored due to conflict.
+	 *
+	 * - `target` - The {@link SharedMatrix} itself.
+	 */
+	(
+		event: "conflict",
+		listener: (
+			row: number,
+			col: number,
+			currentValue: MatrixItem<T>,
+			conflictingValue: MatrixItem<T>,
+			target: IEventThisPlaceHolder,
+		) => void,
+	): void;
+}
+
+/**
+ * This represents the item which is used to track the client which modified the cell last.
+ */
+interface CellLastWriteTrackerItem {
+	seqNum: number; // Seq number of op which last modified this cell
+	clientId: string; // clientId of the client which last modified this cell
 }
 
 /**
  * A matrix cell value may be undefined (indicating an empty cell) or any serializable type,
  * excluding null.  (However, nulls may be embedded inside objects and arrays.)
- * @public
+ * @alpha
  */
 // eslint-disable-next-line @rushstack/no-new-null -- Using 'null' to disallow 'null'.
 export type MatrixItem<T> = Serializable<Exclude<T, null>> | undefined;
@@ -80,11 +127,10 @@ export type MatrixItem<T> = Serializable<Exclude<T, null>> | undefined;
  * matrix data and physically stores data in Z-order to leverage CPU caches and
  * prefetching when reading in either row or column major order.  (See README.md
  * for more details.)
- *
- * @public
+ * @alpha
  */
 export class SharedMatrix<T = any>
-	extends SharedObject
+	extends SharedObject<ISharedMatrixEvents<T>>
 	implements
 		IMatrixProducer<MatrixItem<T>>,
 		IMatrixReader<MatrixItem<T>>,
@@ -100,15 +146,33 @@ export class SharedMatrix<T = any>
 	private readonly cols: PermutationVector; // Map logical col to storage handle (if any)
 
 	private cells = new SparseArray2D<MatrixItem<T>>(); // Stores cell values.
-	private pending = new SparseArray2D<number>(); // Tracks pending writes.
+	private readonly pending = new SparseArray2D<number>(); // Tracks pending writes.
+	private cellLastWriteTracker = new SparseArray2D<CellLastWriteTrackerItem>(); // Tracks last writes sequence number and clientId in a cell.
+	// Tracks the seq number of Op at which policy switch happens from Last Write Win to First Write Win.
+	private setCellLwwToFwwPolicySwitchOpSeqNumber: number;
+	private userSwitchedSetCellPolicy = false; // Set to true when the user calls switchPolicy.
 
+	// Used to track if there is any reentrancy in setCell code.
+	private reentrantCount: number = 0;
+
+	/**
+	 * Constructor for the Shared Matrix
+	 * @param runtime - DataStore runtime.
+	 * @param id - id of the dds
+	 * @param attributes - channel attributes
+	 * @param _isSetCellConflictResolutionPolicyFWW - Conflict resolution for Matrix set op is First Writer Win in case of
+	 * race condition. Client can still overwrite values in case of no race.
+	 */
 	constructor(
 		runtime: IFluidDataStoreRuntime,
 		public id: string,
 		attributes: IChannelAttributes,
+		_isSetCellConflictResolutionPolicyFWW?: boolean,
 	) {
 		super(id, runtime, attributes, "fluid_matrix_");
 
+		this.setCellLwwToFwwPolicySwitchOpSeqNumber =
+			_isSetCellConflictResolutionPolicyFWW === true ? 0 : -1;
 		this.rows = new PermutationVector(
 			SnapshotPath.rows,
 			this.logger,
@@ -178,6 +242,10 @@ export class SharedMatrix<T = any>
 		return this.cols.getLength();
 	}
 
+	public isSetCellConflictResolutionPolicyFWW() {
+		return this.setCellLwwToFwwPolicySwitchOpSeqNumber > -1 || this.userSwitchedSetCellPolicy;
+	}
+
 	public getCell(row: number, col: number): MatrixItem<T> {
 		// Perf: When possible, bounds checking is performed inside the implementation for
 		//       'getHandle()' so that it can be elided in the case of a cache hit.  This
@@ -212,11 +280,6 @@ export class SharedMatrix<T = any>
 		);
 
 		this.setCellCore(row, col, value);
-
-		// Avoid reentrancy by raising change notifications after the op is queued.
-		for (const consumer of this.consumers.values()) {
-			consumer.cellsChanged(row, col, 1, 1, this);
-		}
 	}
 
 	public setCells(
@@ -250,11 +313,6 @@ export class SharedMatrix<T = any>
 				r++;
 			}
 		}
-
-		// Avoid reentrancy by raising change notifications after the op is queued.
-		for (const consumer of this.consumers.values()) {
-			consumer.cellsChanged(rowStart, colStart, rowCount, colCount, this);
-		}
 	}
 
 	private setCellCore(
@@ -264,20 +322,27 @@ export class SharedMatrix<T = any>
 		rowHandle = this.rows.getAllocatedHandle(row),
 		colHandle = this.cols.getAllocatedHandle(col),
 	) {
-		if (this.undo !== undefined) {
-			let oldValue = this.cells.getCell(rowHandle, colHandle);
-			if (oldValue === null) {
-				oldValue = undefined;
+		this.protectAgainstReentrancy(() => {
+			if (this.undo !== undefined) {
+				let oldValue = this.cells.getCell(rowHandle, colHandle);
+				if (oldValue === null) {
+					oldValue = undefined;
+				}
+
+				this.undo.cellSet(rowHandle, colHandle, oldValue);
 			}
 
-			this.undo.cellSet(rowHandle, colHandle, oldValue);
-		}
+			this.cells.setCell(rowHandle, colHandle, value);
 
-		this.cells.setCell(rowHandle, colHandle, value);
+			if (this.isAttached()) {
+				this.sendSetCellOp(row, col, value, rowHandle, colHandle);
+			}
 
-		if (this.isAttached()) {
-			this.sendSetCellOp(row, col, value, rowHandle, colHandle);
-		}
+			// Avoid reentrancy by raising change notifications after the op is queued.
+			for (const consumer of this.consumers.values()) {
+				consumer.cellsChanged(row, col, 1, 1, this);
+			}
+		});
 	}
 
 	private sendSetCellOp(
@@ -300,6 +365,8 @@ export class SharedMatrix<T = any>
 			row,
 			col,
 			value,
+			fwwMode:
+				this.userSwitchedSetCellPolicy || this.setCellLwwToFwwPolicySwitchOpSeqNumber > -1,
 		};
 
 		const metadata: ISetOpMetadata = {
@@ -308,12 +375,29 @@ export class SharedMatrix<T = any>
 			localSeq,
 			rowsRefSeq,
 			colsRefSeq,
+			referenceSeqNumber: this.runtime.deltaManager.lastSequenceNumber,
 		};
 
 		this.submitLocalMessage(op, metadata);
 		this.pending.setCell(rowHandle, colHandle, localSeq);
 	}
 
+	/**
+	 * This makes sure that the code inside the callback is not reentrant. We need to do that because we raise notifications
+	 * to the consumers telling about these changes and they can try to change the matrix while listening to those notifications
+	 * which can make the shared matrix to be in bad state. For example, we are raising notification for a setCell changes and
+	 * a consumer tries to delete that row/col on receiving that notification which can lead to this matrix trying to setCell in
+	 * a deleted row/col.
+	 * @param callback - code that needs to protected against reentrancy.
+	 */
+	private protectAgainstReentrancy(callback: () => void) {
+		assert(this.reentrantCount === 0, 0x85d /* reentrant code */);
+		this.reentrantCount++;
+		callback();
+		this.reentrantCount--;
+		assert(this.reentrantCount === 0, 0x85e /* reentrant code on exit */);
+	}
+
 	private submitVectorMessage(
 		currentVector: PermutationVector,
 		oppositeVector: PermutationVector,
@@ -355,11 +439,15 @@ export class SharedMatrix<T = any>
 	}
 
 	public insertCols(colStart: number, count: number) {
-		this.submitColMessage(this.cols.insert(colStart, count));
+		this.protectAgainstReentrancy(() =>
+			this.submitColMessage(this.cols.insert(colStart, count)),
+		);
 	}
 
 	public removeCols(colStart: number, count: number) {
-		this.submitColMessage(this.cols.remove(colStart, count));
+		this.protectAgainstReentrancy(() =>
+			this.submitColMessage(this.cols.remove(colStart, count)),
+		);
 	}
 
 	private submitRowMessage(message: any) {
@@ -367,14 +455,18 @@ export class SharedMatrix<T = any>
 	}
 
 	public insertRows(rowStart: number, count: number) {
-		this.submitRowMessage(this.rows.insert(rowStart, count));
+		this.protectAgainstReentrancy(() =>
+			this.submitRowMessage(this.rows.insert(rowStart, count)),
+		);
 	}
 
 	public removeRows(rowStart: number, count: number) {
-		this.submitRowMessage(this.rows.remove(rowStart, count));
+		this.protectAgainstReentrancy(() =>
+			this.submitRowMessage(this.rows.remove(rowStart, count)),
+		);
 	}
 
-	/** @internal */ public _undoRemoveRows(rowStart: number, spec: IJSONSegment) {
+	/***/ public _undoRemoveRows(rowStart: number, spec: IJSONSegment) {
 		const { op, inserted } = reinsertSegmentIntoVector(this.rows, rowStart, spec);
 		this.submitRowMessage(op);
 
@@ -397,7 +489,7 @@ export class SharedMatrix<T = any>
 		}
 	}
 
-	/** @internal */ public _undoRemoveCols(colStart: number, spec: IJSONSegment) {
+	/***/ public _undoRemoveCols(colStart: number, spec: IJSONSegment) {
 		const { op, inserted } = reinsertSegmentIntoVector(this.cols, colStart, spec);
 		this.submitColMessage(op);
 
@@ -430,9 +522,19 @@ export class SharedMatrix<T = any>
 			SnapshotPath.cols,
 			this.cols.summarize(this.runtime, this.handle, serializer),
 		);
+		const artifactsToSummarize = [
+			this.cells.snapshot(),
+			this.pending.snapshot(),
+			this.setCellLwwToFwwPolicySwitchOpSeqNumber,
+		];
+
+		// Only need to store it in the snapshot if we have switched the policy already.
+		if (this.setCellLwwToFwwPolicySwitchOpSeqNumber > -1) {
+			artifactsToSummarize.push(this.cellLastWriteTracker.snapshot());
+		}
 		builder.addBlob(
 			SnapshotPath.cells,
-			serializer.stringify([this.cells.snapshot(), this.pending.snapshot()], this.handle),
+			serializer.stringify(artifactsToSummarize, this.handle),
 		);
 		return builder.getSummaryTree();
 	}
@@ -506,6 +608,7 @@ export class SharedMatrix<T = any>
 	}
 
 	private rebasePosition(
+		// eslint-disable-next-line import/no-deprecated
 		client: Client,
 		pos: number,
 		referenceSequenceNumber: number,
@@ -549,17 +652,34 @@ export class SharedMatrix<T = any>
 				);
 
 				const setOp = content as ISetOp<T>;
-				const { rowHandle, colHandle, localSeq, rowsRefSeq, colsRefSeq } =
-					localOpMetadata as ISetOpMetadata;
-
-				// If there are more pending local writes to the same row/col handle, it is important
-				// to skip resubmitting this op since it is possible the row/col handle has been recycled
-				// and now refers to a different position than when this op was originally submitted.
-				if (this.isLatestPendingWrite(rowHandle, colHandle, localSeq)) {
-					const row = this.rebasePosition(this.rows, setOp.row, rowsRefSeq, localSeq);
-					const col = this.rebasePosition(this.cols, setOp.col, colsRefSeq, localSeq);
-
-					if (row !== undefined && col !== undefined && row >= 0 && col >= 0) {
+				const {
+					rowHandle,
+					colHandle,
+					localSeq,
+					rowsRefSeq,
+					colsRefSeq,
+					referenceSeqNumber,
+				} = localOpMetadata as ISetOpMetadata;
+
+				// If after rebasing the op, we get a valid row/col number, that means the row/col
+				// handles have not been recycled and we can safely use them.
+				const row = this.rebasePosition(this.rows, setOp.row, rowsRefSeq, localSeq);
+				const col = this.rebasePosition(this.cols, setOp.col, colsRefSeq, localSeq);
+				if (row !== undefined && col !== undefined && row >= 0 && col >= 0) {
+					const lastCellModificationDetails = this.cellLastWriteTracker.getCell(
+						rowHandle,
+						colHandle,
+					);
+					// If the mode is LWW, then send the op.
+					// Otherwise if the current mode is FWW and if we generated this op, after seeing the
+					// last set op, or it is the first set op for the cell, then regenerate the op,
+					// otherwise raise conflict. We want to check the current mode here and not that
+					// whether op was made in FWW or not.
+					if (
+						this.setCellLwwToFwwPolicySwitchOpSeqNumber === -1 ||
+						lastCellModificationDetails === undefined ||
+						referenceSeqNumber >= lastCellModificationDetails.seqNum
+					) {
 						this.sendSetCellOp(
 							row,
 							col,
@@ -570,6 +690,9 @@ export class SharedMatrix<T = any>
 							rowsRefSeq,
 							colsRefSeq,
 						);
+					} else if (this.pending.getCell(rowHandle, colHandle) !== undefined) {
+						// Clear the pending changes if any as we are not sending the op.
+						this.pending.setCell(rowHandle, colHandle, undefined);
 					}
 				}
 				break;
@@ -594,19 +717,48 @@ export class SharedMatrix<T = any>
 				new ObjectStoragePartition(storage, SnapshotPath.cols),
 				this.serializer,
 			);
-			const [cellData, pendingCliSeqData] = await deserializeBlob(
-				storage,
-				SnapshotPath.cells,
-				this.serializer,
-			);
+			const [
+				cellData,
+				_pendingCliSeqData,
+				setCellLwwToFwwPolicySwitchOpSeqNumber,
+				cellLastWriteTracker,
+			] = await deserializeBlob(storage, SnapshotPath.cells, this.serializer);
 
 			this.cells = SparseArray2D.load(cellData);
-			this.pending = SparseArray2D.load(pendingCliSeqData);
+			this.setCellLwwToFwwPolicySwitchOpSeqNumber =
+				setCellLwwToFwwPolicySwitchOpSeqNumber ?? -1;
+			if (cellLastWriteTracker !== undefined) {
+				this.cellLastWriteTracker = SparseArray2D.load(cellLastWriteTracker);
+			}
 		} catch (error) {
 			this.logger.sendErrorEvent({ eventName: "MatrixLoadFailed" }, error);
 		}
 	}
 
+	/**
+	 * Tells whether the setCell op should be applied or not based on First Write Win policy. It assumes
+	 * we are in FWW mode.
+	 */
+	private shouldSetCellBasedOnFWW(
+		rowHandle: Handle,
+		colHandle: Handle,
+		message: ISequencedDocumentMessage,
+	) {
+		assert(
+			this.setCellLwwToFwwPolicySwitchOpSeqNumber > -1,
+			0x85f /* should be in Fww mode when calling this method */,
+		);
+		assert(message.clientId !== null, 0x860 /* clientId should not be null */);
+		const lastCellModificationDetails = this.cellLastWriteTracker.getCell(rowHandle, colHandle);
+		// If someone tried to Overwrite the cell value or first write on this cell or
+		// same client tried to modify the cell.
+		return (
+			lastCellModificationDetails === undefined ||
+			lastCellModificationDetails.clientId === message.clientId ||
+			message.referenceSequenceNumber >= lastCellModificationDetails.seqNum
+		);
+	}
+
 	protected processCore(
 		rawMessage: ISequencedDocumentMessage,
 		local: boolean,
@@ -629,20 +781,41 @@ export class SharedMatrix<T = any>
 					0x021 /* "SharedMatrix message contents have unexpected type!" */,
 				);
 
-				const { row, col } = contents;
+				const { row, col, value, fwwMode } = contents;
+				const isPreviousSetCellPolicyModeFWW =
+					this.setCellLwwToFwwPolicySwitchOpSeqNumber > -1;
+				// If this is the first op notifying us of the policy change, then set the policy change seq number.
+				if (this.setCellLwwToFwwPolicySwitchOpSeqNumber === -1 && fwwMode === true) {
+					this.setCellLwwToFwwPolicySwitchOpSeqNumber = rawMessage.sequenceNumber;
+				}
 
+				assert(rawMessage.clientId !== null, 0x861 /* clientId should not be null!! */);
 				if (local) {
 					// We are receiving the ACK for a local pending set operation.
 					const { rowHandle, colHandle, localSeq } = localOpMetadata as ISetOpMetadata;
+					const isLatestPendingOp = this.isLatestPendingWrite(
+						rowHandle,
+						colHandle,
+						localSeq,
+					);
+					// If policy is switched and cell should be modified too based on policy, then update the tracker.
+					// If policy is not switched, then also update the tracker in case it is the latest.
+					if (
+						(this.setCellLwwToFwwPolicySwitchOpSeqNumber > -1 &&
+							this.shouldSetCellBasedOnFWW(rowHandle, colHandle, rawMessage)) ||
+						(this.setCellLwwToFwwPolicySwitchOpSeqNumber === -1 && isLatestPendingOp)
+					) {
+						this.cellLastWriteTracker.setCell(rowHandle, colHandle, {
+							seqNum: rawMessage.sequenceNumber,
+							clientId: rawMessage.clientId,
+						});
+					}
 
-					// If this is the most recent write to the cell by the local client, remove our
-					// entry from 'pendingCliSeqs' to resume allowing remote writes.
-					if (this.isLatestPendingWrite(rowHandle, colHandle, localSeq)) {
+					if (isLatestPendingOp) {
 						this.pending.setCell(rowHandle, colHandle, undefined);
 					}
 				} else {
 					const adjustedRow = this.rows.adjustPosition(row, rawMessage);
-
 					if (adjustedRow !== undefined) {
 						const adjustedCol = this.cols.adjustPosition(col, rawMessage);
 
@@ -654,13 +827,45 @@ export class SharedMatrix<T = any>
 								isHandleValid(rowHandle) && isHandleValid(colHandle),
 								0x022 /* "SharedMatrix row and/or col handles are invalid!" */,
 							);
-
-							// If there is a pending (unACKed) local write to the same cell, skip the current op
-							// since it "happened before" the pending write.
-							if (this.pending.getCell(rowHandle, colHandle) === undefined) {
-								const { value } = contents;
+							if (this.setCellLwwToFwwPolicySwitchOpSeqNumber > -1) {
+								// If someone tried to Overwrite the cell value or first write on this cell or
+								// same client tried to modify the cell or if the previous mode was LWW, then we need to still
+								// overwrite the cell and raise conflict if we have pending changes as our change is going to be lost.
+								if (
+									!isPreviousSetCellPolicyModeFWW ||
+									this.shouldSetCellBasedOnFWW(rowHandle, colHandle, rawMessage)
+								) {
+									const previousValue = this.cells.getCell(rowHandle, colHandle);
+									this.cells.setCell(rowHandle, colHandle, value);
+									this.cellLastWriteTracker.setCell(rowHandle, colHandle, {
+										seqNum: rawMessage.sequenceNumber,
+										clientId: rawMessage.clientId,
+									});
+									for (const consumer of this.consumers.values()) {
+										consumer.cellsChanged(adjustedRow, adjustedCol, 1, 1, this);
+									}
+									// Check is there are any pending changes, which will be rejected. If so raise conflict.
+									if (this.pending.getCell(rowHandle, colHandle) !== undefined) {
+										// Don't reset the pending value yet, as there maybe more fww op from same client, so we want
+										// to raise conflict event for that op also.
+										this.emit(
+											"conflict",
+											row,
+											col,
+											value, // Current value
+											previousValue, // Ignored local value
+											this,
+										);
+									}
+								}
+							} else if (this.pending.getCell(rowHandle, colHandle) === undefined) {
+								// If there is a pending (unACKed) local write to the same cell, skip the current op
+								// since it "happened before" the pending write.
 								this.cells.setCell(rowHandle, colHandle, value);
-
+								this.cellLastWriteTracker.setCell(rowHandle, colHandle, {
+									seqNum: rawMessage.sequenceNumber,
+									clientId: rawMessage.clientId,
+								});
 								for (const consumer of this.consumers.values()) {
 									consumer.cellsChanged(adjustedRow, adjustedCol, 1, 1, this);
 								}
@@ -698,6 +903,7 @@ export class SharedMatrix<T = any>
 		for (const rowHandle of rowHandles) {
 			this.cells.clearRows(/* rowStart: */ rowHandle, /* rowCount: */ 1);
 			this.pending.clearRows(/* rowStart: */ rowHandle, /* rowCount: */ 1);
+			this.cellLastWriteTracker.clearRows(/* rowStart: */ rowHandle, /* rowCount: */ 1);
 		}
 	};
 
@@ -705,9 +911,24 @@ export class SharedMatrix<T = any>
 		for (const colHandle of colHandles) {
 			this.cells.clearCols(/* colStart: */ colHandle, /* colCount: */ 1);
 			this.pending.clearCols(/* colStart: */ colHandle, /* colCount: */ 1);
+			this.cellLastWriteTracker.clearCols(/* colStart: */ colHandle, /* colCount: */ 1);
 		}
 	};
 
+	/**
+	 * Api to switch Set Op policy from Last Writer Win to First Writer Win. It only switches from LWW to FWW
+	 * and not from FWW to LWW. The next SetOp which is sent will communicate this policy to other clients.
+	 */
+	public switchSetCellPolicy() {
+		if (this.setCellLwwToFwwPolicySwitchOpSeqNumber === -1) {
+			if (this.isAttached()) {
+				this.userSwitchedSetCellPolicy = true;
+			} else {
+				this.setCellLwwToFwwPolicySwitchOpSeqNumber = 0;
+			}
+		}
+	}
+
 	/**
 	 * Returns true if the latest pending write to the cell indicated by the given row/col handles
 	 * matches the given 'localSeq'.
@@ -808,6 +1029,7 @@ export class SharedMatrix<T = any>
 				localSeq,
 				rowsRefSeq,
 				colsRefSeq,
+				referenceSeqNumber: this.runtime.deltaManager.lastSequenceNumber,
 			};
 
 			this.pending.setCell(rowHandle, colHandle, localSeq);

package/src/ops.ts

@@ -9,6 +9,7 @@ export enum MatrixOp {
 	spliceCols,
 	spliceRows,
 	set,
+	changeSetCellPolicy,
 }
 
 export interface IMatrixMsg {
@@ -25,5 +26,9 @@ export interface IMatrixCellMsg extends IMatrixMsg {
 	type: MatrixOp.set;
 	row: number;
 	col: number;
-	value: Serializable;
+	value: Serializable<unknown>;
+}
+
+export interface IMatrixSwitchSetCellPolicy extends IMatrixMsg {
+	type: MatrixOp.changeSetCellPolicy;
 }

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/matrix";
-export const pkgVersion = "2.0.0-internal.7.3.0";
+export const pkgVersion = "2.0.0-internal.8.0.0";

package/src/permutationvector.ts

@@ -3,8 +3,6 @@
  * Licensed under the MIT License.
  */
 
-/* eslint-disable import/no-deprecated */
-
 import { assert } from "@fluidframework/core-utils";
 import { createChildLogger } from "@fluidframework/telemetry-utils";
 import {
@@ -14,6 +12,7 @@ import {
 import {
 	BaseSegment,
 	ISegment,
+	// eslint-disable-next-line import/no-deprecated
 	Client,
 	IMergeTreeDeltaOpArgs,
 	IMergeTreeDeltaCallbackArgs,
@@ -120,6 +119,7 @@ export class PermutationSegment extends BaseSegment {
 	}
 }
 
+// eslint-disable-next-line import/no-deprecated
 export class PermutationVector extends Client {
 	private handleTable = new HandleTable<never>(); // Tracks available storage handles for rows.
 	public readonly handleCache = new HandleCache(this);

package/src/runtime.ts

@@ -15,7 +15,7 @@ import { SharedMatrix } from "./matrix";
 
 /**
  * {@link @fluidframework/datastore-definitions#IChannelFactory} for {@link SharedMatrix}.
- * @public
+ * @alpha
  */
 export class SharedMatrixFactory implements IChannelFactory {
 	public static Type = "https://graph.microsoft.com/types/sharedmatrix";

package/src/serialization.ts

@@ -9,10 +9,10 @@ import { BlobTreeEntry } from "@fluidframework/driver-utils";
 import { IFluidSerializer } from "@fluidframework/shared-object-base";
 import { bufferToString } from "@fluid-internal/client-utils";
 
-export const serializeBlob = (
+export const serializeBlob = <T>(
 	handle: IFluidHandle,
 	path: string,
-	snapshot: Serializable,
+	snapshot: Serializable<T>,
 	serializer: IFluidSerializer,
 ) => new BlobTreeEntry(path, serializer.stringify(snapshot, handle));
 

package/src/types.ts

@@ -7,16 +7,16 @@
 //       of SharedMatrix undo while we decide on the correct layering for undo.
 
 /**
- * @public
+ * @alpha
  */
 export interface IRevertible {
-	revert();
-	discard();
+	revert(): void;
+	discard(): void;
 }
 
 /**
- * @public
+ * @alpha
  */
 export interface IUndoConsumer {
-	pushToCurrentOperation(revertible: IRevertible);
+	pushToCurrentOperation(revertible: IRevertible): void;
 }

package/tsconfig.json

@@ -8,5 +8,6 @@
 	"compilerOptions": {
 		"rootDir": "./src",
 		"outDir": "./dist",
+		"noImplicitAny": true,
 	},
 }