@fluidframework/merge-tree 2.10.0-305357 → 2.10.0-307060

package/lib/test/propertyManager.spec.js

@@ -0,0 +1,154 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { strict as assert } from "node:assert";
+import { UnassignedSequenceNumber } from "../constants.js";
+import { matchProperties } from "../properties.js";
+import { PropertiesManager, PropertiesRollback, } from "../segmentPropertiesManager.js";
+describe("PropertiesManager", () => {
+    describe("handleProperties", () => {
+        it("should handle properties without collaboration", () => {
+            const propertiesManager = new PropertiesManager();
+            const seg = {
+                properties: { key: "value" },
+            };
+            const op = { props: { key: "newValue" } };
+            const deltas = propertiesManager.handleProperties(op, seg, 1, 0, false);
+            assert.deepEqual(deltas, { key: "value" });
+            assert.deepEqual(seg.properties, { key: "newValue" });
+        });
+        it("should handle properties with collaboration", () => {
+            const propertiesManager = new PropertiesManager();
+            const seg = {
+                properties: { key: "value" },
+            };
+            const op = { props: { key: "newValue" } };
+            const deltas = propertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 0, true);
+            assert.deepEqual(deltas, { key: "value" });
+            assert.deepEqual(seg.properties, { key: "newValue" });
+        });
+        it("should handle properties with rollback", () => {
+            const propertiesManager = new PropertiesManager();
+            const seg = {
+                properties: { key: "value" },
+            };
+            const op = { props: { key: "newValue" } };
+            // Simulate pending state for rollback
+            propertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 0, true);
+            const deltas = propertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 0, true, PropertiesRollback.Rollback);
+            assert.deepEqual(deltas, { key: "newValue" });
+            assert.deepEqual(seg.properties, { key: "value" });
+        });
+        it("should handle properties with seq as a number and collaborating true", () => {
+            const propertiesManager = new PropertiesManager();
+            const seg = {
+                properties: { key: "value" },
+            };
+            const op = { props: { key: "newValue" } };
+            const deltas = propertiesManager.handleProperties(op, seg, 2, 1, true);
+            assert.deepEqual(deltas, { key: "value" });
+            assert.deepEqual(seg.properties, { key: "newValue" });
+        });
+        it("should handle properties with seq as a number and collaborating false", () => {
+            const propertiesManager = new PropertiesManager();
+            const seg = {
+                properties: { key: "value" },
+            };
+            const op = { props: { key: "newValue" } };
+            const deltas = propertiesManager.handleProperties(op, seg, 2, 1, false);
+            assert.deepEqual(deltas, { key: "value" });
+            assert.deepEqual(seg.properties, { key: "newValue" });
+        });
+        it("should handle properties with adjusts", () => {
+            const propertiesManager = new PropertiesManager();
+            const seg = {
+                properties: { key: 1 },
+            };
+            const op = { adjust: { key: { delta: 1 } } };
+            const deltas = propertiesManager.handleProperties(op, seg, 2, 1, true);
+            assert.deepEqual(deltas, { key: 1 });
+            assert.deepEqual(seg.properties, { key: 2 });
+        });
+        it("should handle properties with props and adjusts interleaved", () => {
+            const propertiesManager = new PropertiesManager();
+            const seg = {
+                properties: { key: 1, otherKey: "value" },
+            };
+            const op1 = { props: { otherKey: "newValue" } };
+            const op2 = { adjust: { key: { delta: 1 } } };
+            propertiesManager.handleProperties(op1, seg, 2, 1, true);
+            const deltas = propertiesManager.handleProperties(op2, seg, 3, 2, true);
+            assert.deepEqual(deltas, { key: 1 });
+            assert.deepEqual(seg.properties, { key: 2, otherKey: "newValue" });
+        });
+    });
+    describe("rollbackProperties", () => {
+        it("should rollback properties when collaborating is true", () => {
+            const propertiesManager = new PropertiesManager();
+            const seg = {
+                properties: { key: "value" },
+            };
+            const op = { props: { key: "newValue" } };
+            const rollbackDeltas = propertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 0, true);
+            const deltas = propertiesManager.rollbackProperties({ props: rollbackDeltas }, seg, true);
+            assert.deepEqual(deltas, { key: "newValue" });
+            assert.deepEqual(seg.properties, { key: "value" });
+        });
+        it("should rollback properties when collaborating is false", () => {
+            const propertiesManager = new PropertiesManager();
+            const seg = {
+                properties: { key: "value" },
+            };
+            const op = { props: { key: "newValue" } };
+            const rollbackDeltas = propertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 0, false);
+            const deltas = propertiesManager.rollbackProperties({ props: rollbackDeltas }, seg, false);
+            assert.deepEqual(deltas, { key: "newValue" });
+            assert.deepEqual(seg.properties, { key: "value" });
+        });
+    });
+    describe("ack", () => {
+        it("should acknowledge property changes", () => {
+            const propertiesManager = new PropertiesManager();
+            const op = { props: { key: "value" } };
+            const seg = { properties: {} };
+            propertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 1, true);
+            assert(propertiesManager.hasPendingProperties({ key: "value" }));
+            propertiesManager.ack(1, 0, op);
+        });
+    });
+    describe("copyTo", () => {
+        it("should copy properties and manager state", () => {
+            const propertiesManager = new PropertiesManager();
+            const op = { props: { key: "value" } };
+            const seg = { properties: {} };
+            propertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 1, true);
+            assert(propertiesManager.hasPendingProperties({ key: "value" }));
+            const dest = {};
+            propertiesManager.copyTo({ key: "value" }, dest);
+            assert(dest.propertyManager instanceof PropertiesManager);
+            assert(dest.propertyManager.hasPendingProperties({ key: "value" }));
+        });
+    });
+    describe("getAtSeq", () => {
+        it("should retrieve properties at a specific sequence number", () => {
+            const propertiesManager = new PropertiesManager();
+            const op = { adjust: { key: { delta: 5 } } };
+            const seg = { properties: {} };
+            propertiesManager.handleProperties(op, seg, 1, 0, true);
+            const properties = propertiesManager.getAtSeq(seg.properties, 0);
+            assert(matchProperties(properties, {}));
+        });
+    });
+    describe("hasPendingProperties", () => {
+        it("should check for pending properties", () => {
+            const propertiesManager = new PropertiesManager();
+            const op = { props: { key: "value" } };
+            const seg = { properties: {} };
+            propertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 1, true);
+            assert(propertiesManager.hasPendingProperties({ key: "value" }));
+            assert(!propertiesManager.hasPendingProperties({ otherKey: "otherValue" }));
+        });
+    });
+});
+//# sourceMappingURL=propertyManager.spec.js.map

package/lib/test/propertyManager.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"propertyManager.spec.js","sourceRoot":"","sources":["../../src/test/propertyManager.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EACN,iBAAiB,EACjB,kBAAkB,GAElB,MAAM,gCAAgC,CAAC;AAExC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAClC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;YACzD,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,GAAG,GAAyD;gBACjE,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;aAC5B,CAAC;YACF,MAAM,EAAE,GAAkB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;YACzD,MAAM,MAAM,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YACxE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACtD,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,GAAG,GAAyD;gBACjE,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;aAC5B,CAAC;YACF,MAAM,EAAE,GAAkB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;YACzD,MAAM,MAAM,GAAG,iBAAiB,CAAC,gBAAgB,CAChD,EAAE,EACF,GAAG,EACH,wBAAwB,EACxB,CAAC,EACD,IAAI,CACJ,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YACjD,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,GAAG,GAAyD;gBACjE,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;aAC5B,CAAC;YACF,MAAM,EAAE,GAAkB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;YACzD,sCAAsC;YACtC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAC/E,MAAM,MAAM,GAAG,iBAAiB,CAAC,gBAAgB,CAChD,EAAE,EACF,GAAG,EACH,wBAAwB,EACxB,CAAC,EACD,IAAI,EACJ,kBAAkB,CAAC,QAAQ,CAC3B,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;YAC9C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;YAC/E,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,GAAG,GAAyD;gBACjE,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;aAC5B,CAAC;YACF,MAAM,EAAE,GAAkB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;YACzD,MAAM,MAAM,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YACvE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;YAChF,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,GAAG,GAAyD;gBACjE,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;aAC5B,CAAC;YACF,MAAM,EAAE,GAAkB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;YACzD,MAAM,MAAM,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YACxE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAChD,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,GAAG,GAAyD;gBACjE,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE;aACtB,CAAC;YACF,MAAM,EAAE,GAAkB,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YAC5D,MAAM,MAAM,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YACvE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YACrC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;YACtE,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,GAAG,GAAyD;gBACjE,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE;aACzC,CAAC;YACF,MAAM,GAAG,GAAkB,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC;YAC/D,MAAM,GAAG,GAAkB,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YAC7D,iBAAiB,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YACzD,MAAM,MAAM,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YACxE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YACrC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAChE,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,GAAG,GAAyD;gBACjE,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;aAC5B,CAAC;YACF,MAAM,EAAE,GAAkB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;YACzD,MAAM,cAAc,GAAG,iBAAiB,CAAC,gBAAgB,CACxD,EAAE,EACF,GAAG,EACH,wBAAwB,EACxB,CAAC,EACD,IAAI,CACJ,CAAC;YACF,MAAM,MAAM,GAAG,iBAAiB,CAAC,kBAAkB,CAClD,EAAE,KAAK,EAAE,cAAc,EAAE,EACzB,GAAG,EACH,IAAI,CACJ,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;YAC9C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;YACjE,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,GAAG,GAAyD;gBACjE,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;aAC5B,CAAC;YACF,MAAM,EAAE,GAAkB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;YACzD,MAAM,cAAc,GAAG,iBAAiB,CAAC,gBAAgB,CACxD,EAAE,EACF,GAAG,EACH,wBAAwB,EACxB,CAAC,EACD,KAAK,CACL,CAAC;YACF,MAAM,MAAM,GAAG,iBAAiB,CAAC,kBAAkB,CAClD,EAAE,KAAK,EAAE,cAAc,EAAE,EACzB,GAAG,EACH,KAAK,CACL,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;YAC9C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;QACpB,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC9C,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,EAAE,GAAkB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC;YACtD,MAAM,GAAG,GAAyD,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;YAErF,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAC/E,MAAM,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YACjE,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YACnD,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,EAAE,GAAkB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC;YACtD,MAAM,GAAG,GAAyD,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;YAErF,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAC/E,MAAM,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YACjE,MAAM,IAAI,GAAyD,EAAE,CAAC;YACtE,iBAAiB,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;YACjD,MAAM,CAAC,IAAI,CAAC,eAAe,YAAY,iBAAiB,CAAC,CAAC;YAC1D,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YACnE,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,EAAE,GAAkB,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YAC5D,MAAM,GAAG,GAAyD,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;YAErF,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YACxD,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACjE,MAAM,CAAC,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC9C,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,MAAM,EAAE,GAAkB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC;YACtD,MAAM,GAAG,GAAyD,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;YAErF,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAC/E,MAAM,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YACjE,MAAM,CAAC,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QAC7E,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"node:assert\";\n\nimport { UnassignedSequenceNumber } from \"../constants.js\";\nimport type { ISegmentLeaf } from \"../mergeTreeNodes.js\";\nimport { matchProperties } from \"../properties.js\";\nimport {\n\tPropertiesManager,\n\tPropertiesRollback,\n\ttype PropsOrAdjust,\n} from \"../segmentPropertiesManager.js\";\n\ndescribe(\"PropertiesManager\", () => {\n\tdescribe(\"handleProperties\", () => {\n\t\tit(\"should handle properties without collaboration\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = {\n\t\t\t\tproperties: { key: \"value\" },\n\t\t\t};\n\t\t\tconst op: PropsOrAdjust = { props: { key: \"newValue\" } };\n\t\t\tconst deltas = propertiesManager.handleProperties(op, seg, 1, 0, false);\n\t\t\tassert.deepEqual(deltas, { key: \"value\" });\n\t\t\tassert.deepEqual(seg.properties, { key: \"newValue\" });\n\t\t});\n\n\t\tit(\"should handle properties with collaboration\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = {\n\t\t\t\tproperties: { key: \"value\" },\n\t\t\t};\n\t\t\tconst op: PropsOrAdjust = { props: { key: \"newValue\" } };\n\t\t\tconst deltas = propertiesManager.handleProperties(\n\t\t\t\top,\n\t\t\t\tseg,\n\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t0,\n\t\t\t\ttrue,\n\t\t\t);\n\t\t\tassert.deepEqual(deltas, { key: \"value\" });\n\t\t\tassert.deepEqual(seg.properties, { key: \"newValue\" });\n\t\t});\n\n\t\tit(\"should handle properties with rollback\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = {\n\t\t\t\tproperties: { key: \"value\" },\n\t\t\t};\n\t\t\tconst op: PropsOrAdjust = { props: { key: \"newValue\" } };\n\t\t\t// Simulate pending state for rollback\n\t\t\tpropertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 0, true);\n\t\t\tconst deltas = propertiesManager.handleProperties(\n\t\t\t\top,\n\t\t\t\tseg,\n\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t0,\n\t\t\t\ttrue,\n\t\t\t\tPropertiesRollback.Rollback,\n\t\t\t);\n\t\t\tassert.deepEqual(deltas, { key: \"newValue\" });\n\t\t\tassert.deepEqual(seg.properties, { key: \"value\" });\n\t\t});\n\n\t\tit(\"should handle properties with seq as a number and collaborating true\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = {\n\t\t\t\tproperties: { key: \"value\" },\n\t\t\t};\n\t\t\tconst op: PropsOrAdjust = { props: { key: \"newValue\" } };\n\t\t\tconst deltas = propertiesManager.handleProperties(op, seg, 2, 1, true);\n\t\t\tassert.deepEqual(deltas, { key: \"value\" });\n\t\t\tassert.deepEqual(seg.properties, { key: \"newValue\" });\n\t\t});\n\n\t\tit(\"should handle properties with seq as a number and collaborating false\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = {\n\t\t\t\tproperties: { key: \"value\" },\n\t\t\t};\n\t\t\tconst op: PropsOrAdjust = { props: { key: \"newValue\" } };\n\t\t\tconst deltas = propertiesManager.handleProperties(op, seg, 2, 1, false);\n\t\t\tassert.deepEqual(deltas, { key: \"value\" });\n\t\t\tassert.deepEqual(seg.properties, { key: \"newValue\" });\n\t\t});\n\n\t\tit(\"should handle properties with adjusts\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = {\n\t\t\t\tproperties: { key: 1 },\n\t\t\t};\n\t\t\tconst op: PropsOrAdjust = { adjust: { key: { delta: 1 } } };\n\t\t\tconst deltas = propertiesManager.handleProperties(op, seg, 2, 1, true);\n\t\t\tassert.deepEqual(deltas, { key: 1 });\n\t\t\tassert.deepEqual(seg.properties, { key: 2 });\n\t\t});\n\n\t\tit(\"should handle properties with props and adjusts interleaved\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = {\n\t\t\t\tproperties: { key: 1, otherKey: \"value\" },\n\t\t\t};\n\t\t\tconst op1: PropsOrAdjust = { props: { otherKey: \"newValue\" } };\n\t\t\tconst op2: PropsOrAdjust = { adjust: { key: { delta: 1 } } };\n\t\t\tpropertiesManager.handleProperties(op1, seg, 2, 1, true);\n\t\t\tconst deltas = propertiesManager.handleProperties(op2, seg, 3, 2, true);\n\t\t\tassert.deepEqual(deltas, { key: 1 });\n\t\t\tassert.deepEqual(seg.properties, { key: 2, otherKey: \"newValue\" });\n\t\t});\n\t});\n\n\tdescribe(\"rollbackProperties\", () => {\n\t\tit(\"should rollback properties when collaborating is true\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = {\n\t\t\t\tproperties: { key: \"value\" },\n\t\t\t};\n\t\t\tconst op: PropsOrAdjust = { props: { key: \"newValue\" } };\n\t\t\tconst rollbackDeltas = propertiesManager.handleProperties(\n\t\t\t\top,\n\t\t\t\tseg,\n\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t0,\n\t\t\t\ttrue,\n\t\t\t);\n\t\t\tconst deltas = propertiesManager.rollbackProperties(\n\t\t\t\t{ props: rollbackDeltas },\n\t\t\t\tseg,\n\t\t\t\ttrue,\n\t\t\t);\n\t\t\tassert.deepEqual(deltas, { key: \"newValue\" });\n\t\t\tassert.deepEqual(seg.properties, { key: \"value\" });\n\t\t});\n\n\t\tit(\"should rollback properties when collaborating is false\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = {\n\t\t\t\tproperties: { key: \"value\" },\n\t\t\t};\n\t\t\tconst op: PropsOrAdjust = { props: { key: \"newValue\" } };\n\t\t\tconst rollbackDeltas = propertiesManager.handleProperties(\n\t\t\t\top,\n\t\t\t\tseg,\n\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t0,\n\t\t\t\tfalse,\n\t\t\t);\n\t\t\tconst deltas = propertiesManager.rollbackProperties(\n\t\t\t\t{ props: rollbackDeltas },\n\t\t\t\tseg,\n\t\t\t\tfalse,\n\t\t\t);\n\t\t\tassert.deepEqual(deltas, { key: \"newValue\" });\n\t\t\tassert.deepEqual(seg.properties, { key: \"value\" });\n\t\t});\n\t});\n\n\tdescribe(\"ack\", () => {\n\t\tit(\"should acknowledge property changes\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst op: PropsOrAdjust = { props: { key: \"value\" } };\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = { properties: {} };\n\n\t\t\tpropertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 1, true);\n\t\t\tassert(propertiesManager.hasPendingProperties({ key: \"value\" }));\n\t\t\tpropertiesManager.ack(1, 0, op);\n\t\t});\n\t});\n\n\tdescribe(\"copyTo\", () => {\n\t\tit(\"should copy properties and manager state\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst op: PropsOrAdjust = { props: { key: \"value\" } };\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = { properties: {} };\n\n\t\t\tpropertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 1, true);\n\t\t\tassert(propertiesManager.hasPendingProperties({ key: \"value\" }));\n\t\t\tconst dest: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = {};\n\t\t\tpropertiesManager.copyTo({ key: \"value\" }, dest);\n\t\t\tassert(dest.propertyManager instanceof PropertiesManager);\n\t\t\tassert(dest.propertyManager.hasPendingProperties({ key: \"value\" }));\n\t\t});\n\t});\n\n\tdescribe(\"getAtSeq\", () => {\n\t\tit(\"should retrieve properties at a specific sequence number\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst op: PropsOrAdjust = { adjust: { key: { delta: 5 } } };\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = { properties: {} };\n\n\t\t\tpropertiesManager.handleProperties(op, seg, 1, 0, true);\n\t\t\tconst properties = propertiesManager.getAtSeq(seg.properties, 0);\n\t\t\tassert(matchProperties(properties, {}));\n\t\t});\n\t});\n\n\tdescribe(\"hasPendingProperties\", () => {\n\t\tit(\"should check for pending properties\", () => {\n\t\t\tconst propertiesManager = new PropertiesManager();\n\t\t\tconst op: PropsOrAdjust = { props: { key: \"value\" } };\n\t\t\tconst seg: Pick<ISegmentLeaf, \"properties\" | \"propertyManager\"> = { properties: {} };\n\n\t\t\tpropertiesManager.handleProperties(op, seg, UnassignedSequenceNumber, 1, true);\n\t\t\tassert(propertiesManager.hasPendingProperties({ key: \"value\" }));\n\t\t\tassert(!propertiesManager.hasPendingProperties({ otherKey: \"otherValue\" }));\n\t\t});\n\t});\n});\n"]}

package/lib/zamboni.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zamboni.d.ts","sourceRoot":"","sources":["../src/zamboni.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EACN,KAAK,UAAU,EAQf,MAAM,qBAAqB,CAAC;AAG7B,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAKpC,wBAAgB,eAAe,CAC9B,SAAS,EAAE,SAAS,EACpB,uBAAuB,SAAqB,GAC1C,IAAI,CAyCN;AAGD,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,CAwDzE"}
+{"version":3,"file":"zamboni.d.ts","sourceRoot":"","sources":["../src/zamboni.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EACN,KAAK,UAAU,EAQf,MAAM,qBAAqB,CAAC;AAG7B,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAKpC,wBAAgB,eAAe,CAC9B,SAAS,EAAE,SAAS,EACpB,uBAAuB,SAAqB,GAC1C,IAAI,CA4CN;AAGD,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,CAwDzE"}

package/lib/zamboni.js

@@ -17,6 +17,7 @@ export function zamboniSegments(mergeTree, zamboniSegmentsMaxCount = zamboniSegm
     }
     for (let i = 0; i < zamboniSegmentsMaxCount; i++) {
         let segmentToScour = mergeTree.segmentsToScour.peek()?.value;
+        segmentToScour?.segment?.propertyManager?.updateMsn(mergeTree.collabWindow.minSeq);
         if (!segmentToScour || segmentToScour.maxSeq > mergeTree.collabWindow.minSeq) {
             break;
         }

package/lib/zamboni.js.map

@@ -1 +1 @@
-{"version":3,"file":"zamboni.js","sourceRoot":"","sources":["../src/zamboni.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\n/* eslint-disable @typescript-eslint/no-non-null-assertion */\n\nimport { UnassignedSequenceNumber } from \"./constants.js\";\nimport { MergeTree } from \"./mergeTree.js\";\nimport { MergeTreeMaintenanceType } from \"./mergeTreeDeltaCallback.js\";\nimport {\n\ttype MergeBlock,\n\tIMergeNode,\n\tISegment,\n\tMarker,\n\tMaxNodesInBlock,\n\tseqLTE,\n\ttoMoveInfo,\n\ttoRemovalInfo,\n} from \"./mergeTreeNodes.js\";\nimport { matchProperties } from \"./properties.js\";\n\nexport const zamboniSegmentsMax = 2;\nfunction underflow(node: MergeBlock): boolean {\n\treturn node.childCount < MaxNodesInBlock / 2;\n}\n\nexport function zamboniSegments(\n\tmergeTree: MergeTree,\n\tzamboniSegmentsMaxCount = zamboniSegmentsMax,\n): void {\n\tif (!mergeTree.collabWindow.collaborating) {\n\t\treturn;\n\t}\n\n\tfor (let i = 0; i < zamboniSegmentsMaxCount; i++) {\n\t\tlet segmentToScour = mergeTree.segmentsToScour.peek()?.value;\n\t\tif (!segmentToScour || segmentToScour.maxSeq > mergeTree.collabWindow.minSeq) {\n\t\t\tbreak;\n\t\t}\n\t\tsegmentToScour = mergeTree.segmentsToScour.get()!;\n\t\t// Only skip scouring if needs scour is explicitly false, not true or undefined\n\t\tif (\n\t\t\tsegmentToScour?.segment?.parent &&\n\t\t\tsegmentToScour.segment.parent.needsScour !== false\n\t\t) {\n\t\t\tconst block = segmentToScour.segment.parent;\n\t\t\tconst childrenCopy: IMergeNode[] = [];\n\t\t\tscourNode(block, childrenCopy, mergeTree);\n\t\t\t// This will avoid the cost of re-scouring nodes\n\t\t\t// that have recently been scoured\n\t\t\tblock.needsScour = false;\n\n\t\t\tconst newChildCount = childrenCopy.length;\n\n\t\t\tif (newChildCount < block.childCount) {\n\t\t\t\tblock.childCount = newChildCount;\n\t\t\t\tblock.children = childrenCopy;\n\t\t\t\tfor (let j = 0; j < newChildCount; j++) {\n\t\t\t\t\tblock.assignChild(childrenCopy[j], j, false);\n\t\t\t\t}\n\n\t\t\t\tif (underflow(block) && block.parent) {\n\t\t\t\t\tpackParent(block.parent, mergeTree);\n\t\t\t\t} else {\n\t\t\t\t\tmergeTree.nodeUpdateOrdinals(block);\n\t\t\t\t\tmergeTree.blockUpdatePathLengths(block, UnassignedSequenceNumber, -1, true);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n\n// Interior node with all node children\nexport function packParent(parent: MergeBlock, mergeTree: MergeTree): void {\n\tconst children = parent.children;\n\tlet childIndex: number;\n\tlet childBlock: MergeBlock;\n\tconst holdNodes: IMergeNode[] = [];\n\tfor (childIndex = 0; childIndex < parent.childCount; childIndex++) {\n\t\t// Debug assert not isLeaf()\n\t\tchildBlock = children[childIndex] as MergeBlock;\n\t\tscourNode(childBlock, holdNodes, mergeTree);\n\t\t// Will replace this block with a packed block\n\t\tchildBlock.parent = undefined;\n\t}\n\tif (holdNodes.length > 0) {\n\t\tconst totalNodeCount = holdNodes.length;\n\t\tconst halfOfMaxNodeCount = MaxNodesInBlock / 2;\n\t\tlet childCount = Math.min(\n\t\t\tMaxNodesInBlock - 1,\n\t\t\tMath.floor(totalNodeCount / halfOfMaxNodeCount),\n\t\t);\n\t\tif (childCount < 1) {\n\t\t\tchildCount = 1;\n\t\t}\n\t\tconst baseNodesInBlockCount = Math.floor(totalNodeCount / childCount);\n\t\tlet remainderCount = totalNodeCount % childCount;\n\t\tconst packedBlocks: IMergeNode[] = Array.from({ length: MaxNodesInBlock });\n\t\tlet childrenPackedCount = 0;\n\t\tfor (let nodeIndex = 0; nodeIndex < childCount; nodeIndex++) {\n\t\t\tlet nodeCount = baseNodesInBlockCount;\n\t\t\tif (remainderCount > 0) {\n\t\t\t\tnodeCount++;\n\t\t\t\tremainderCount--;\n\t\t\t}\n\t\t\tconst packedBlock = mergeTree.makeBlock(nodeCount);\n\t\t\tfor (let packedNodeIndex = 0; packedNodeIndex < nodeCount; packedNodeIndex++) {\n\t\t\t\tconst nodeToPack = holdNodes[childrenPackedCount++];\n\t\t\t\tpackedBlock.assignChild(nodeToPack, packedNodeIndex, false);\n\t\t\t}\n\t\t\tpackedBlock.parent = parent;\n\t\t\tpackedBlocks[nodeIndex] = packedBlock;\n\t\t\tmergeTree.nodeUpdateLengthNewStructure(packedBlock);\n\t\t}\n\t\tparent.children = packedBlocks;\n\t\tfor (let j = 0; j < childCount; j++) {\n\t\t\tparent.assignChild(packedBlocks[j], j, false);\n\t\t}\n\t\tparent.childCount = childCount;\n\t} else {\n\t\tparent.children = [];\n\t\tparent.childCount = 0;\n\t}\n\tif (underflow(parent) && parent.parent) {\n\t\tpackParent(parent.parent, mergeTree);\n\t} else {\n\t\tmergeTree.nodeUpdateOrdinals(parent);\n\t\tmergeTree.blockUpdatePathLengths(parent, UnassignedSequenceNumber, -1, true);\n\t}\n}\n\nfunction scourNode(node: MergeBlock, holdNodes: IMergeNode[], mergeTree: MergeTree): void {\n\t// The previous segment is tracked while scouring for the purposes of merging adjacent segments\n\t// when possible.\n\tlet prevSegment: ISegment | undefined;\n\tfor (let k = 0; k < node.childCount; k++) {\n\t\t// TODO Non null asserting, why is this not null?\n\t\tconst childNode = node.children[k]!;\n\t\tif (!childNode.isLeaf() || childNode.segmentGroups?.empty === false) {\n\t\t\tholdNodes.push(childNode);\n\t\t\tprevSegment = undefined;\n\t\t\tcontinue;\n\t\t}\n\n\t\tconst segment = childNode;\n\t\tconst removalInfo = toRemovalInfo(segment);\n\t\tconst moveInfo = toMoveInfo(segment);\n\t\tif (removalInfo !== undefined || moveInfo !== undefined) {\n\t\t\t// If the segment's removal is below the MSN and it's not being held onto by a tracking group,\n\t\t\t// it can be unlinked (i.e. removed from the merge-tree)\n\t\t\tif (\n\t\t\t\t((!!removalInfo && seqLTE(removalInfo.removedSeq, mergeTree.collabWindow.minSeq)) ||\n\t\t\t\t\t(!!moveInfo && seqLTE(moveInfo.movedSeq, mergeTree.collabWindow.minSeq))) &&\n\t\t\t\tsegment.trackingCollection.empty\n\t\t\t) {\n\t\t\t\tmergeTree.mergeTreeMaintenanceCallback?.(\n\t\t\t\t\t{\n\t\t\t\t\t\toperation: MergeTreeMaintenanceType.UNLINK,\n\t\t\t\t\t\tdeltaSegments: [{ segment }],\n\t\t\t\t\t},\n\t\t\t\t\tundefined,\n\t\t\t\t);\n\n\t\t\t\tsegment.parent = undefined;\n\n\t\t\t\tif (Marker.is(segment)) {\n\t\t\t\t\tmergeTree.unlinkMarker(segment);\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tholdNodes.push(segment);\n\t\t\t}\n\n\t\t\tprevSegment = undefined;\n\t\t} else {\n\t\t\tif (segment.seq! <= mergeTree.collabWindow.minSeq) {\n\t\t\t\tconst segmentHasPositiveLength = (mergeTree.localNetLength(segment) ?? 0) > 0;\n\t\t\t\tconst canAppend =\n\t\t\t\t\tprevSegment?.canAppend(segment) &&\n\t\t\t\t\tmatchProperties(prevSegment.properties, segment.properties) &&\n\t\t\t\t\tprevSegment.trackingCollection.matches(segment.trackingCollection) &&\n\t\t\t\t\tsegmentHasPositiveLength;\n\n\t\t\t\tif (canAppend) {\n\t\t\t\t\tprevSegment!.append(segment);\n\t\t\t\t\tmergeTree.mergeTreeMaintenanceCallback?.(\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\toperation: MergeTreeMaintenanceType.APPEND,\n\t\t\t\t\t\t\tdeltaSegments: [{ segment: prevSegment! }, { segment }],\n\t\t\t\t\t\t},\n\t\t\t\t\t\tundefined,\n\t\t\t\t\t);\n\n\t\t\t\t\tsegment.parent = undefined;\n\t\t\t\t\tfor (const tg of segment.trackingCollection.trackingGroups) tg.unlink(segment);\n\t\t\t\t} else {\n\t\t\t\t\tholdNodes.push(segment);\n\t\t\t\t\tprevSegment = segmentHasPositiveLength ? segment : undefined;\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tholdNodes.push(segment);\n\t\t\t\tprevSegment = undefined;\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
+{"version":3,"file":"zamboni.js","sourceRoot":"","sources":["../src/zamboni.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\n/* eslint-disable @typescript-eslint/no-non-null-assertion */\n\nimport { UnassignedSequenceNumber } from \"./constants.js\";\nimport { MergeTree } from \"./mergeTree.js\";\nimport { MergeTreeMaintenanceType } from \"./mergeTreeDeltaCallback.js\";\nimport {\n\ttype MergeBlock,\n\tIMergeNode,\n\tISegment,\n\tMarker,\n\tMaxNodesInBlock,\n\tseqLTE,\n\ttoMoveInfo,\n\ttoRemovalInfo,\n} from \"./mergeTreeNodes.js\";\nimport { matchProperties } from \"./properties.js\";\n\nexport const zamboniSegmentsMax = 2;\nfunction underflow(node: MergeBlock): boolean {\n\treturn node.childCount < MaxNodesInBlock / 2;\n}\n\nexport function zamboniSegments(\n\tmergeTree: MergeTree,\n\tzamboniSegmentsMaxCount = zamboniSegmentsMax,\n): void {\n\tif (!mergeTree.collabWindow.collaborating) {\n\t\treturn;\n\t}\n\n\tfor (let i = 0; i < zamboniSegmentsMaxCount; i++) {\n\t\tlet segmentToScour = mergeTree.segmentsToScour.peek()?.value;\n\n\t\tsegmentToScour?.segment?.propertyManager?.updateMsn(mergeTree.collabWindow.minSeq);\n\n\t\tif (!segmentToScour || segmentToScour.maxSeq > mergeTree.collabWindow.minSeq) {\n\t\t\tbreak;\n\t\t}\n\t\tsegmentToScour = mergeTree.segmentsToScour.get()!;\n\t\t// Only skip scouring if needs scour is explicitly false, not true or undefined\n\t\tif (\n\t\t\tsegmentToScour?.segment?.parent &&\n\t\t\tsegmentToScour.segment.parent.needsScour !== false\n\t\t) {\n\t\t\tconst block = segmentToScour.segment.parent;\n\t\t\tconst childrenCopy: IMergeNode[] = [];\n\t\t\tscourNode(block, childrenCopy, mergeTree);\n\t\t\t// This will avoid the cost of re-scouring nodes\n\t\t\t// that have recently been scoured\n\t\t\tblock.needsScour = false;\n\n\t\t\tconst newChildCount = childrenCopy.length;\n\n\t\t\tif (newChildCount < block.childCount) {\n\t\t\t\tblock.childCount = newChildCount;\n\t\t\t\tblock.children = childrenCopy;\n\t\t\t\tfor (let j = 0; j < newChildCount; j++) {\n\t\t\t\t\tblock.assignChild(childrenCopy[j], j, false);\n\t\t\t\t}\n\n\t\t\t\tif (underflow(block) && block.parent) {\n\t\t\t\t\tpackParent(block.parent, mergeTree);\n\t\t\t\t} else {\n\t\t\t\t\tmergeTree.nodeUpdateOrdinals(block);\n\t\t\t\t\tmergeTree.blockUpdatePathLengths(block, UnassignedSequenceNumber, -1, true);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n\n// Interior node with all node children\nexport function packParent(parent: MergeBlock, mergeTree: MergeTree): void {\n\tconst children = parent.children;\n\tlet childIndex: number;\n\tlet childBlock: MergeBlock;\n\tconst holdNodes: IMergeNode[] = [];\n\tfor (childIndex = 0; childIndex < parent.childCount; childIndex++) {\n\t\t// Debug assert not isLeaf()\n\t\tchildBlock = children[childIndex] as MergeBlock;\n\t\tscourNode(childBlock, holdNodes, mergeTree);\n\t\t// Will replace this block with a packed block\n\t\tchildBlock.parent = undefined;\n\t}\n\tif (holdNodes.length > 0) {\n\t\tconst totalNodeCount = holdNodes.length;\n\t\tconst halfOfMaxNodeCount = MaxNodesInBlock / 2;\n\t\tlet childCount = Math.min(\n\t\t\tMaxNodesInBlock - 1,\n\t\t\tMath.floor(totalNodeCount / halfOfMaxNodeCount),\n\t\t);\n\t\tif (childCount < 1) {\n\t\t\tchildCount = 1;\n\t\t}\n\t\tconst baseNodesInBlockCount = Math.floor(totalNodeCount / childCount);\n\t\tlet remainderCount = totalNodeCount % childCount;\n\t\tconst packedBlocks: IMergeNode[] = Array.from({ length: MaxNodesInBlock });\n\t\tlet childrenPackedCount = 0;\n\t\tfor (let nodeIndex = 0; nodeIndex < childCount; nodeIndex++) {\n\t\t\tlet nodeCount = baseNodesInBlockCount;\n\t\t\tif (remainderCount > 0) {\n\t\t\t\tnodeCount++;\n\t\t\t\tremainderCount--;\n\t\t\t}\n\t\t\tconst packedBlock = mergeTree.makeBlock(nodeCount);\n\t\t\tfor (let packedNodeIndex = 0; packedNodeIndex < nodeCount; packedNodeIndex++) {\n\t\t\t\tconst nodeToPack = holdNodes[childrenPackedCount++];\n\t\t\t\tpackedBlock.assignChild(nodeToPack, packedNodeIndex, false);\n\t\t\t}\n\t\t\tpackedBlock.parent = parent;\n\t\t\tpackedBlocks[nodeIndex] = packedBlock;\n\t\t\tmergeTree.nodeUpdateLengthNewStructure(packedBlock);\n\t\t}\n\t\tparent.children = packedBlocks;\n\t\tfor (let j = 0; j < childCount; j++) {\n\t\t\tparent.assignChild(packedBlocks[j], j, false);\n\t\t}\n\t\tparent.childCount = childCount;\n\t} else {\n\t\tparent.children = [];\n\t\tparent.childCount = 0;\n\t}\n\tif (underflow(parent) && parent.parent) {\n\t\tpackParent(parent.parent, mergeTree);\n\t} else {\n\t\tmergeTree.nodeUpdateOrdinals(parent);\n\t\tmergeTree.blockUpdatePathLengths(parent, UnassignedSequenceNumber, -1, true);\n\t}\n}\n\nfunction scourNode(node: MergeBlock, holdNodes: IMergeNode[], mergeTree: MergeTree): void {\n\t// The previous segment is tracked while scouring for the purposes of merging adjacent segments\n\t// when possible.\n\tlet prevSegment: ISegment | undefined;\n\tfor (let k = 0; k < node.childCount; k++) {\n\t\t// TODO Non null asserting, why is this not null?\n\t\tconst childNode = node.children[k]!;\n\t\tif (!childNode.isLeaf() || childNode.segmentGroups?.empty === false) {\n\t\t\tholdNodes.push(childNode);\n\t\t\tprevSegment = undefined;\n\t\t\tcontinue;\n\t\t}\n\n\t\tconst segment = childNode;\n\t\tconst removalInfo = toRemovalInfo(segment);\n\t\tconst moveInfo = toMoveInfo(segment);\n\t\tif (removalInfo !== undefined || moveInfo !== undefined) {\n\t\t\t// If the segment's removal is below the MSN and it's not being held onto by a tracking group,\n\t\t\t// it can be unlinked (i.e. removed from the merge-tree)\n\t\t\tif (\n\t\t\t\t((!!removalInfo && seqLTE(removalInfo.removedSeq, mergeTree.collabWindow.minSeq)) ||\n\t\t\t\t\t(!!moveInfo && seqLTE(moveInfo.movedSeq, mergeTree.collabWindow.minSeq))) &&\n\t\t\t\tsegment.trackingCollection.empty\n\t\t\t) {\n\t\t\t\tmergeTree.mergeTreeMaintenanceCallback?.(\n\t\t\t\t\t{\n\t\t\t\t\t\toperation: MergeTreeMaintenanceType.UNLINK,\n\t\t\t\t\t\tdeltaSegments: [{ segment }],\n\t\t\t\t\t},\n\t\t\t\t\tundefined,\n\t\t\t\t);\n\n\t\t\t\tsegment.parent = undefined;\n\n\t\t\t\tif (Marker.is(segment)) {\n\t\t\t\t\tmergeTree.unlinkMarker(segment);\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tholdNodes.push(segment);\n\t\t\t}\n\n\t\t\tprevSegment = undefined;\n\t\t} else {\n\t\t\tif (segment.seq! <= mergeTree.collabWindow.minSeq) {\n\t\t\t\tconst segmentHasPositiveLength = (mergeTree.localNetLength(segment) ?? 0) > 0;\n\t\t\t\tconst canAppend =\n\t\t\t\t\tprevSegment?.canAppend(segment) &&\n\t\t\t\t\tmatchProperties(prevSegment.properties, segment.properties) &&\n\t\t\t\t\tprevSegment.trackingCollection.matches(segment.trackingCollection) &&\n\t\t\t\t\tsegmentHasPositiveLength;\n\n\t\t\t\tif (canAppend) {\n\t\t\t\t\tprevSegment!.append(segment);\n\t\t\t\t\tmergeTree.mergeTreeMaintenanceCallback?.(\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\toperation: MergeTreeMaintenanceType.APPEND,\n\t\t\t\t\t\t\tdeltaSegments: [{ segment: prevSegment! }, { segment }],\n\t\t\t\t\t\t},\n\t\t\t\t\t\tundefined,\n\t\t\t\t\t);\n\n\t\t\t\t\tsegment.parent = undefined;\n\t\t\t\t\tfor (const tg of segment.trackingCollection.trackingGroups) tg.unlink(segment);\n\t\t\t\t} else {\n\t\t\t\t\tholdNodes.push(segment);\n\t\t\t\t\tprevSegment = segmentHasPositiveLength ? segment : undefined;\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tholdNodes.push(segment);\n\t\t\t\tprevSegment = undefined;\n\t\t\t}\n\t\t}\n\t}\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/merge-tree",
-  "version": "2.10.0-305357",
+  "version": "2.10.0-307060",
   "description": "Merge tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -81,30 +81,30 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.10.0-305357",
-    "@fluidframework/container-definitions": "2.10.0-305357",
-    "@fluidframework/core-interfaces": "2.10.0-305357",
-    "@fluidframework/core-utils": "2.10.0-305357",
-    "@fluidframework/datastore-definitions": "2.10.0-305357",
-    "@fluidframework/driver-definitions": "2.10.0-305357",
-    "@fluidframework/runtime-definitions": "2.10.0-305357",
-    "@fluidframework/runtime-utils": "2.10.0-305357",
-    "@fluidframework/shared-object-base": "2.10.0-305357",
-    "@fluidframework/telemetry-utils": "2.10.0-305357"
+    "@fluid-internal/client-utils": "2.10.0-307060",
+    "@fluidframework/container-definitions": "2.10.0-307060",
+    "@fluidframework/core-interfaces": "2.10.0-307060",
+    "@fluidframework/core-utils": "2.10.0-307060",
+    "@fluidframework/datastore-definitions": "2.10.0-307060",
+    "@fluidframework/driver-definitions": "2.10.0-307060",
+    "@fluidframework/runtime-definitions": "2.10.0-307060",
+    "@fluidframework/runtime-utils": "2.10.0-307060",
+    "@fluidframework/shared-object-base": "2.10.0-307060",
+    "@fluidframework/telemetry-utils": "2.10.0-307060"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.16.4",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "2.10.0-305357",
-    "@fluid-private/stochastic-test-utils": "2.10.0-305357",
-    "@fluid-private/test-pairwise-generator": "2.10.0-305357",
+    "@fluid-internal/mocha-test-setup": "2.10.0-307060",
+    "@fluid-private/stochastic-test-utils": "2.10.0-307060",
+    "@fluid-private/test-pairwise-generator": "2.10.0-307060",
     "@fluid-tools/benchmark": "^0.50.0",
     "@fluid-tools/build-cli": "^0.50.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.50.0",
     "@fluidframework/eslint-config-fluid": "^5.4.0",
     "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@2.5.0",
-    "@fluidframework/test-runtime-utils": "2.10.0-305357",
+    "@fluidframework/test-runtime-utils": "2.10.0-307060",
     "@microsoft/api-extractor": "7.47.8",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^9.1.1",
@@ -195,6 +195,13 @@
       },
       "TypeAlias_Trackable": {
         "backCompat": false
+      },
+      "Class_PropertiesManager": {
+        "forwardCompat": false,
+        "backCompat": false
+      },
+      "ClassStatics_PropertiesManager": {
+        "backCompat": false
       }
     },
     "entrypoint": "legacy"

package/src/collections/index.ts

@@ -3,7 +3,13 @@
  * Licensed under the MIT License.
  */
 
-export { DoublyLinkedList, ListNode, ListNodeRange, walkList } from "./list.js";
+export {
+	DoublyLinkedList,
+	ListNode,
+	ListNodeRange,
+	walkList,
+	iterateListValuesWhile,
+} from "./list.js";
 export {
 	ConflictAction,
 	Dictionary,

package/src/collections/list.ts

@@ -273,3 +273,32 @@ export function walkList<T>(
 	}
 	return true;
 }
+
+/**
+ * Creates a lazily evaluated iterable which returns values while the predicate returns true,
+ * and stops iterating at the first value where the predicate is false.
+ * @param start - the node to start the iteration from
+ * @param includePredicate - determine if the current value be included in the iteration or stop if iteration
+ */
+export function iterateListValuesWhile<T>(
+	start: ListNode<T> | undefined,
+	includePredicate: (n: ListNode<T>) => boolean,
+): Iterable<T> {
+	let next: ListNode<T> | undefined = start;
+	const iterator: IterableIterator<T> = {
+		next: (): IteratorResult<T> => {
+			if (next !== undefined) {
+				const current = next;
+				next = current.next;
+				if (includePredicate(current) === true) {
+					return { value: current.data, done: false };
+				}
+			}
+			return { done: true, value: undefined };
+		},
+		[Symbol.iterator]() {
+			return this;
+		},
+	};
+	return iterator;
+}

package/src/index.ts

@@ -88,6 +88,7 @@ export {
 	createObliterateRangeOp,
 } from "./opBuilder.js";
 export {
+	AdjustParams,
 	IJSONSegment,
 	IMarkerDef,
 	IMergeTreeAnnotateMsg,
@@ -97,6 +98,7 @@ export {
 	IMergeTreeInsertMsg,
 	IMergeTreeOp,
 	IMergeTreeRemoveMsg,
+	IMergeTreeAnnotateAdjustMsg,
 	IRelativePosition,
 	MergeTreeDeltaType,
 	ReferenceType,
@@ -124,6 +126,7 @@ export {
 	reservedTileLabelsKey,
 } from "./referencePositions.js";
 export {
+	PropsOrAdjust,
 	copyPropertiesAndManager,
 	PropertiesManager,
 	PropertiesRollback,

package/src/mergeTree.ts

@@ -153,13 +153,18 @@ function ackSegment(
 ): boolean {
 	const currentSegmentGroup = segment.segmentGroups?.dequeue();
 	assert(currentSegmentGroup === segmentGroup, 0x043 /* "On ack, unexpected segmentGroup!" */);
-	switch (opArgs.op.type) {
+	assert(opArgs.sequencedMessage !== undefined, "must have sequencedMessage");
+	const {
+		op,
+		sequencedMessage: { sequenceNumber, minimumSequenceNumber },
+	} = opArgs;
+	switch (op.type) {
 		case MergeTreeDeltaType.ANNOTATE: {
 			assert(
 				!!segment.propertyManager,
 				0x044 /* "On annotate ack, missing segment property manager!" */,
 			);
-			segment.propertyManager.ackPendingProperties(opArgs.op);
+			segment.propertyManager.ack(sequenceNumber, minimumSequenceNumber, op);
 			return true;
 		}
 
@@ -168,7 +173,7 @@ function ackSegment(
 				segment.seq === UnassignedSequenceNumber,
 				0x045 /* "On insert, seq number already assigned!" */,
 			);
-			segment.seq = opArgs.sequencedMessage!.sequenceNumber;
+			segment.seq = sequenceNumber;
 			segment.localSeq = undefined;
 			return true;
 		}
@@ -178,7 +183,7 @@ function ackSegment(
 			assert(removalInfo !== undefined, 0x046 /* "On remove ack, missing removal info!" */);
 			segment.localRemovedSeq = undefined;
 			if (removalInfo.removedSeq === UnassignedSequenceNumber) {
-				removalInfo.removedSeq = opArgs.sequencedMessage!.sequenceNumber;
+				removalInfo.removedSeq = sequenceNumber;
 				return true;
 			}
 			return false;
@@ -193,11 +198,10 @@ function ackSegment(
 			segment.localMovedSeq = obliterateInfo.localSeq = undefined;
 			const seqIdx = moveInfo.movedSeqs.indexOf(UnassignedSequenceNumber);
 			assert(seqIdx !== -1, 0x86f /* expected movedSeqs to contain unacked seq */);
-			moveInfo.movedSeqs[seqIdx] = obliterateInfo.seq =
-				opArgs.sequencedMessage!.sequenceNumber;
+			moveInfo.movedSeqs[seqIdx] = sequenceNumber;
 
 			if (moveInfo.movedSeq === UnassignedSequenceNumber) {
-				moveInfo.movedSeq = opArgs.sequencedMessage!.sequenceNumber;
+				moveInfo.movedSeq = sequenceNumber;
 				return true;
 			}
 
@@ -205,7 +209,7 @@ function ackSegment(
 		}
 
 		default: {
-			throw new Error(`${opArgs.op.type} is in unrecognized operation type`);
+			throw new Error(`${op.type} is in unrecognized operation type`);
 		}
 	}
 }
@@ -1317,11 +1321,9 @@ export class MergeTree {
 				});
 			});
 
-			if (
-				opArgs.op.type === MergeTreeDeltaType.OBLITERATE ||
-				opArgs.op.type === MergeTreeDeltaType.OBLITERATE_SIDED
-			) {
-				this.obliterates.addOrUpdate(pendingSegmentGroup.obliterateInfo!);
+			if (pendingSegmentGroup.obliterateInfo !== undefined) {
+				pendingSegmentGroup.obliterateInfo.seq = seq;
+				this.obliterates.addOrUpdate(pendingSegmentGroup.obliterateInfo);
 			}
 
 			// Perform slides after all segments have been acked, so that
@@ -1928,11 +1930,11 @@ export class MergeTree {
 			);
 
 			const propertyManager = (segment.propertyManager ??= new PropertiesManager());
-			const properties = (segment.properties ??= createMap());
-			const propertyDeltas = propertyManager.addProperties(
-				properties,
-				props,
+			const propertyDeltas = propertyManager.handleProperties(
+				{ props },
+				segment,
 				seq,
+				this.collabWindow.minSeq,
 				this.collabWindow.collaborating,
 				rollback,
 			);
@@ -2157,7 +2159,7 @@ export class MergeTree {
 
 		this.slideAckedRemovedSegmentReferences(localOverlapWithRefs);
 		// opArgs == undefined => test code
-		if (movedSegments.length > 0) {
+		if (start.pos !== end.pos || start.side !== end.side) {
 			this.mergeTreeDeltaCallback?.(opArgs, {
 				operation: MergeTreeDeltaType.OBLITERATE,
 				deltaSegments: movedSegments,

package/src/ops.ts

@@ -195,6 +195,44 @@ export interface IMergeTreeAnnotateMsg extends IMergeTreeDelta {
 	relativePos2?: IRelativePosition;
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	props: Record<string, any>;
+	adjust?: never;
+}
+
+/**
+ * Used to define per key adjustments in an {@link IMergeTreeAnnotateAdjustMsg}
+ * @alpha
+ * @legacy
+ */
+export interface AdjustParams {
+	/**
+	 * The adjustment delta which will be summed with the current value if it is a number,
+	 * or summed with zero if the current value is not a number.
+	 */
+	delta: number;
+	/**
+	 * An optional minimum value for the computed value of the key this adjustment is applied to.
+	 * The minimum will be applied after the value is applied.
+	 */
+	min?: number | undefined;
+	/**
+	 * An optional maximum value for the computed value of the key this adjustment is applied to.
+	 * The maximum will be applied after the value is applied.
+	 */
+	max?: number | undefined;
+}
+
+/**
+ * @legacy
+ * @alpha
+ */
+export interface IMergeTreeAnnotateAdjustMsg extends IMergeTreeDelta {
+	type: typeof MergeTreeDeltaType.ANNOTATE;
+	pos1?: number;
+	pos2?: number;
+	relativePos1?: undefined;
+	relativePos2?: undefined;
+	props?: never;
+	adjust: Record<string, AdjustParams>;
 }
 
 /**