@fluidframework/matrix 2.11.0 → 2.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/matrix",
-  "version": "2.11.0",
+  "version": "2.13.0",
   "description": "Distributed matrix",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -69,39 +69,39 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.11.0",
-    "@fluidframework/core-interfaces": "~2.11.0",
-    "@fluidframework/core-utils": "~2.11.0",
-    "@fluidframework/datastore-definitions": "~2.11.0",
-    "@fluidframework/driver-definitions": "~2.11.0",
-    "@fluidframework/driver-utils": "~2.11.0",
-    "@fluidframework/merge-tree": "~2.11.0",
-    "@fluidframework/runtime-definitions": "~2.11.0",
-    "@fluidframework/runtime-utils": "~2.11.0",
-    "@fluidframework/shared-object-base": "~2.11.0",
-    "@fluidframework/telemetry-utils": "~2.11.0",
+    "@fluid-internal/client-utils": "~2.13.0",
+    "@fluidframework/core-interfaces": "~2.13.0",
+    "@fluidframework/core-utils": "~2.13.0",
+    "@fluidframework/datastore-definitions": "~2.13.0",
+    "@fluidframework/driver-definitions": "~2.13.0",
+    "@fluidframework/driver-utils": "~2.13.0",
+    "@fluidframework/merge-tree": "~2.13.0",
+    "@fluidframework/runtime-definitions": "~2.13.0",
+    "@fluidframework/runtime-utils": "~2.13.0",
+    "@fluidframework/shared-object-base": "~2.13.0",
+    "@fluidframework/telemetry-utils": "~2.13.0",
     "@tiny-calc/nano": "0.0.0-alpha.5",
     "double-ended-queue": "^2.1.0-0",
     "tslib": "^1.10.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.16.4",
+    "@arethetypeswrong/cli": "^0.17.1",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "~2.11.0",
-    "@fluid-private/stochastic-test-utils": "~2.11.0",
-    "@fluid-private/test-dds-utils": "~2.11.0",
+    "@fluid-internal/mocha-test-setup": "~2.13.0",
+    "@fluid-private/stochastic-test-utils": "~2.13.0",
+    "@fluid-private/test-dds-utils": "~2.13.0",
     "@fluid-tools/benchmark": "^0.50.0",
     "@fluid-tools/build-cli": "^0.51.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.51.0",
-    "@fluidframework/container-definitions": "~2.11.0",
+    "@fluidframework/container-definitions": "~2.13.0",
     "@fluidframework/eslint-config-fluid": "^5.6.0",
-    "@fluidframework/matrix-previous": "npm:@fluidframework/matrix@2.10.0",
-    "@fluidframework/test-runtime-utils": "~2.11.0",
+    "@fluidframework/matrix-previous": "npm:@fluidframework/matrix@2.12.0",
+    "@fluidframework/test-runtime-utils": "~2.13.0",
     "@microsoft/api-extractor": "7.47.8",
     "@tiny-calc/micro": "0.0.0-alpha.5",
     "@types/double-ended-queue": "^2.1.0",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.0",
     "best-random": "^1.0.0",
     "c8": "^8.0.1",

package/src/matrix.ts

@@ -17,15 +17,14 @@ import {
 } from "@fluidframework/datastore-definitions/internal";
 import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
 import {
-	// eslint-disable-next-line import/no-deprecated
 	Client,
 	IJSONSegment,
 	IMergeTreeOp,
+	type ISegmentInternal,
 	type LocalReferencePosition,
 	MergeTreeDeltaType,
 	ReferenceType,
-	// eslint-disable-next-line import/no-deprecated
-	SegmentGroup,
+	segmentIsRemoved,
 } from "@fluidframework/merge-tree/internal";
 import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal";
 import {
@@ -753,24 +752,17 @@ export class SharedMatrix<T = any>
 	}
 
 	private rebasePosition(
-		// eslint-disable-next-line import/no-deprecated
 		client: Client,
 		ref: LocalReferencePosition,
 		localSeq: number,
 	): number | undefined {
-		const segment = ref.getSegment();
+		const segment: ISegmentInternal | undefined = ref.getSegment();
 		const offset = ref.getOffset();
 		// If the segment that contains the position is removed, then this setCell op should do nothing.
-		if (segment === undefined || offset === undefined || segment.removedSeq !== undefined) {
+		if (segment === undefined || offset === undefined || segmentIsRemoved(segment)) {
 			return;
 		}
 
-		assert(
-			segment.localRemovedSeq === undefined ||
-				(segment.localRemovedSeq !== undefined && segment.localRemovedSeq > localSeq),
-			0x8b8 /* Attempted to set a cell which was removed locally before the original op applied. */,
-		);
-
 		return client.findReconnectionPosition(segment, localSeq) + offset;
 	}
 
@@ -817,23 +809,11 @@ export class SharedMatrix<T = any>
 		} else {
 			switch (content.target) {
 				case SnapshotPath.cols: {
-					this.submitColMessage(
-						this.cols.regeneratePendingOp(
-							content,
-							// eslint-disable-next-line import/no-deprecated
-							localOpMetadata as SegmentGroup | SegmentGroup[],
-						),
-					);
+					this.submitColMessage(this.cols.regeneratePendingOp(content, localOpMetadata));
 					break;
 				}
 				case SnapshotPath.rows: {
-					this.submitRowMessage(
-						this.rows.regeneratePendingOp(
-							content,
-							// eslint-disable-next-line import/no-deprecated
-							localOpMetadata as SegmentGroup | SegmentGroup[],
-						),
-					);
+					this.submitRowMessage(this.rows.regeneratePendingOp(content, localOpMetadata));
 					break;
 				}
 				default: {

package/src/packageVersion.ts

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

package/src/permutationvector.ts

@@ -11,15 +11,17 @@ import {
 } from "@fluidframework/datastore-definitions/internal";
 import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
 import {
-	BaseSegment, // eslint-disable-next-line import/no-deprecated
+	BaseSegment,
 	Client,
 	IJSONSegment,
 	IMergeTreeDeltaCallbackArgs,
 	IMergeTreeDeltaOpArgs,
 	IMergeTreeMaintenanceCallbackArgs,
 	ISegment,
+	ISegmentInternal,
 	MergeTreeDeltaType,
 	MergeTreeMaintenanceType,
+	segmentIsRemoved,
 	type IMergeTreeInsertMsg,
 	type IMergeTreeRemoveMsg,
 } from "@fluidframework/merge-tree/internal";
@@ -200,7 +202,7 @@ export class PermutationVector extends Client {
 		pos: number,
 		op: Pick<ISequencedDocumentMessage, "referenceSequenceNumber" | "clientId">,
 	): number | undefined {
-		const { segment, offset } = this.getContainingSegment(pos, {
+		const { segment, offset } = this.getContainingSegment<ISegmentInternal>(pos, {
 			referenceSequenceNumber: op.referenceSequenceNumber,
 			clientId: op.clientId,
 		});
@@ -208,7 +210,7 @@ export class PermutationVector extends Client {
 		// Note that until the MergeTree GCs, the segment is still reachable via `getContainingSegment()` with
 		// a `refSeq` in the past.  Prevent remote ops from accidentally allocating or using recycled handles
 		// by checking for the presence of 'removedSeq'.
-		if (segment === undefined || segment.removedSeq !== undefined) {
+		if (segment === undefined || segmentIsRemoved(segment)) {
 			return undefined;
 		}