@fluidframework/matrix 2.0.0-internal.6.3.3 → 2.0.0-internal.7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/matrix",
-  "version": "2.0.0-internal.6.3.3",
+  "version": "2.0.0-internal.7.0.0",
   "description": "Distributed matrix",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -31,32 +31,32 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@fluidframework/core-utils": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@fluidframework/driver-utils": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@fluidframework/merge-tree": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@fluidframework/shared-object-base": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
+    "@fluid-internal/client-utils": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@fluidframework/core-utils": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@fluidframework/driver-utils": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@fluidframework/merge-tree": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@fluidframework/protocol-definitions": "^3.0.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@fluidframework/shared-object-base": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
     "@tiny-calc/nano": "0.0.0-alpha.5",
     "events": "^3.1.0",
     "tslib": "^1.10.0"
   },
   "devDependencies": {
-    "@fluid-internal/test-dds-utils": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
+    "@fluid-internal/test-dds-utils": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
     "@fluid-tools/benchmark": "^0.48.0",
-    "@fluid-tools/build-cli": "^0.22.0",
+    "@fluid-tools/build-cli": "^0.24.0",
     "@fluidframework/build-common": "^2.0.0",
-    "@fluidframework/build-tools": "^0.22.0",
+    "@fluidframework/build-tools": "^0.24.0",
     "@fluidframework/eslint-config-fluid": "^2.1.0",
-    "@fluidframework/matrix-previous": "npm:@fluidframework/matrix@2.0.0-internal.6.3.1",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.6.3.3 <2.0.0-internal.6.4.0",
-    "@microsoft/api-extractor": "^7.34.4",
+    "@fluidframework/matrix-previous": "npm:@fluidframework/matrix@2.0.0-internal.6.3.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.7.0.0 <2.0.0-internal.7.1.0",
+    "@microsoft/api-extractor": "^7.37.0",
     "@tiny-calc/micro": "0.0.0-alpha.5",
     "@types/mocha": "^9.1.1",
     "@types/node": "^16.18.38",
@@ -72,9 +72,8 @@
     "moment": "^2.21.0",
     "prettier": "~2.6.2",
     "rimraf": "^4.4.0",
-    "source-map-support": "^0.5.16",
     "ts-node": "^10.9.1",
-    "typescript": "~4.5.5",
+    "typescript": "~5.1.6",
     "uuid": "^9.0.0"
   },
   "typeValidation": {

package/src/matrix.ts

@@ -752,10 +752,16 @@ export class SharedMatrix<T = any>
 	 * {@inheritDoc @fluidframework/shared-object-base#SharedObjectCore.applyStashedOp}
 	 */
 	protected applyStashedOp(content: any): unknown {
-		if (content.target === SnapshotPath.cols || content.target === SnapshotPath.rows) {
-			const op = content as IMergeTreeOp;
-			const currentVector = content.target === SnapshotPath.cols ? this.cols : this.rows;
-			const oppositeVector = content.target === SnapshotPath.cols ? this.rows : this.cols;
+		const parsedContent = parseHandles(content, this.serializer);
+		if (
+			parsedContent.target === SnapshotPath.cols ||
+			parsedContent.target === SnapshotPath.rows
+		) {
+			const op = parsedContent as IMergeTreeOp;
+			const currentVector =
+				parsedContent.target === SnapshotPath.cols ? this.cols : this.rows;
+			const oppositeVector =
+				parsedContent.target === SnapshotPath.cols ? this.rows : this.cols;
 			const metadata = currentVector.applyStashedOp(op);
 			const localSeq = currentVector.getCollabWindow().localSeq;
 			const oppositeWindow = oppositeVector.getCollabWindow();
@@ -770,9 +776,12 @@ export class SharedMatrix<T = any>
 
 			return metadata;
 		} else {
-			assert(content.type === MatrixOp.set, 0x2da /* "Unknown SharedMatrix 'op' type." */);
+			assert(
+				parsedContent.type === MatrixOp.set,
+				0x2da /* "Unknown SharedMatrix 'op' type." */,
+			);
 
-			const setOp = content as ISetOp<T>;
+			const setOp = parsedContent as ISetOp<T>;
 			const rowHandle = this.rows.getAllocatedHandle(setOp.row);
 			const colHandle = this.cols.getAllocatedHandle(setOp.col);
 			const rowsRefSeq = this.rows.getCollabWindow().currentSeq;

package/src/packageVersion.ts

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

package/src/permutationvector.ts

@@ -404,6 +404,7 @@ export class PermutationVector extends Client {
 		const s: string[] = [];
 
 		this.walkSegments((segment) => {
+			// eslint-disable-next-line @typescript-eslint/no-base-to-string
 			s.push(`${segment}`);
 			return true;
 		});

package/src/sparsearray2d.ts

@@ -60,12 +60,8 @@ export class SparseArray2D<T>
 {
 	constructor(private readonly root: UA<UA<UA<UA<UA<T>>>>> = [undefined]) {}
 
-	public get rowCount() {
-		return 0xffffffff;
-	}
-	public get colCount() {
-		return 0xffffffff;
-	}
+	public readonly rowCount = 0xffffffff;
+	public readonly colCount = 0xffffffff;
 
 	public getCell(row: number, col: number): T | undefined {
 		const keyHi = r0c0ToMorton2x16(row >>> 16, col >>> 16);
@@ -226,7 +222,7 @@ export class SparseArray2D<T>
 	private getLevel<T>(parent: UA<UA<T>>, subKey: number) {
 		const level = parent[subKey];
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-		return level === undefined ? (parent[subKey] = new Array(256).fill(undefined)) : level;
+		return level ?? (parent[subKey] = new Array(256).fill(undefined));
 	}
 
 	public snapshot() {