@fluidframework/tree 2.81.1 → 2.83.0

package/lib/feature-libraries/modular-schema/modularChangeFamily.js

@@ -7,9 +7,9 @@ import { UsageError } from "@fluidframework/telemetry-utils/internal";
 import { BTree } from "@tylerbu/sorted-btree-es6";
 import { lt } from "semver-ts";
 import { FluidClientVersion, } from "../../codec/index.js";
-import { EditBuilder, makeDetachedNodeId, revisionMetadataSourceFromInfo, areEqualChangeAtomIds, areEqualChangeAtomIdOpts, tagChange, makeAnonChange, newChangeAtomIdRangeMap, mapTaggedChange, } from "../../core/index.js";
-import { brand, idAllocatorFromMaxId, idAllocatorFromState, getOrCreate, newTupleBTree, mergeTupleBTrees, RangeMap, balancedReduce, } from "../../util/index.js";
-import { getFromChangeAtomIdMap, setInChangeAtomIdMap, } from "../changeAtomIdBTree.js";
+import { EditBuilder, makeDetachedNodeId, revisionMetadataSourceFromInfo, areEqualChangeAtomIds, areEqualChangeAtomIdOpts, tagChange, makeAnonChange, newChangeAtomIdRangeMap, mapTaggedChange, comparePartialRevisions, comparePartialChangesetLocalIds, } from "../../core/index.js";
+import { brand, idAllocatorFromMaxId, idAllocatorFromState, getOrCreate, mergeTupleBTrees, RangeMap, balancedReduce, newTupleBTree, compareStrings, createTupleComparator, } from "../../util/index.js";
+import { getFromChangeAtomIdMap, newChangeAtomIdBTree, setInChangeAtomIdMap, } from "../changeAtomIdBTree.js";
 import { CrossFieldTarget, getFirstFromCrossFieldMap, setInCrossFieldMap, } from "./crossFieldQueries.js";
 import { NodeAttachState, } from "./fieldChangeHandler.js";
 import { convertGenericChange, genericFieldKind } from "./genericFieldKind.js";
@@ -351,7 +351,7 @@ export class ModularChangeFamily {
         const { revInfos: oldRevInfos } = getRevInfoFromTaggedChanges([change]);
         const revisionMetadata = revisionMetadataSourceFromInfo(oldRevInfos);
         const invertedFields = this.invertFieldMap(change.change.fieldChanges, undefined, isRollback, genId, crossFieldTable, revisionMetadata, revisionForInvert);
-        const invertedNodes = newTupleBTree();
+        const invertedNodes = newChangeAtomIdBTree();
         change.change.nodeChanges.forEachPair(([revision, localId], nodeChangeset) => {
             invertedNodes.set([revision, localId], this.invertNodeChange(nodeChangeset, { revision, localId }, isRollback, genId, crossFieldTable, revisionMetadata, revisionForInvert));
         });
@@ -434,12 +434,12 @@ export class ModularChangeFamily {
             newChange: change,
             baseChange: over.change,
             baseFieldToContext: new Map(),
-            baseToRebasedNodeId: newTupleBTree(),
+            baseToRebasedNodeId: newChangeAtomIdBTree(),
             rebasedFields: new Set(),
             rebasedNodeToParent: brand(change.nodeToParent.clone()),
             rebasedCrossFieldKeys: change.crossFieldKeys.clone(),
             nodeIdPairs: [],
-            affectedBaseFields: newTupleBTree(),
+            affectedBaseFields: newFieldIdKeyBTree(),
             fieldsWithUnattachedChild: new Set(),
         };
         const getBaseRevisions = () => revisionInfoFromTaggedChange(over).map((info) => info.revision);
@@ -752,8 +752,11 @@ export class ModularChangeFamily {
         }
     }
     getRevisions(change) {
+        if (change.revisions === undefined || change.revisions.length === 0) {
+            return new Set([undefined]);
+        }
         const aggregated = new Set();
-        for (const revInfo of change.revisions ?? [{ revision: undefined }]) {
+        for (const revInfo of change.revisions) {
             aggregated.add(revInfo.revision);
         }
         return aggregated;
@@ -768,7 +771,7 @@ export class ModularChangeFamily {
             nodeChanges: updatedNodes,
             nodeToParent: updatedNodeToParent,
             // We've updated all references to old node IDs, so we no longer need an alias table.
-            nodeAliases: newTupleBTree(),
+            nodeAliases: newChangeAtomIdBTree(),
             crossFieldKeys: replaceCrossFieldKeyTableRevisions(change.crossFieldKeys, replacer, change.nodeAliases),
         };
         if (change.builds !== undefined) {
@@ -905,7 +908,7 @@ function replaceCrossFieldKeyTableRevisions(table, replacer, nodeAliases) {
     const updated = newCrossFieldKeyTable();
     for (const entry of table.entries()) {
         const key = entry.start;
-        const updatedKey = replacer.getUpdatedAtomId(key);
+        const updatedKey = replacer.getUpdatedAtomId(key, entry.length);
         const field = entry.value;
         const normalizedFieldId = normalizeFieldId(field, nodeAliases);
         const updatedNodeId = normalizedFieldId.nodeId === undefined
@@ -920,7 +923,7 @@ function replaceCrossFieldKeyTableRevisions(table, replacer, nodeAliases) {
     return updated;
 }
 function replaceIdMapRevisions(map, replacer, valueMapper = (value) => value) {
-    const updated = newTupleBTree();
+    const updated = newChangeAtomIdBTree();
     for (const [[revision, localId], value] of map.entries()) {
         const newAtom = replacer.getUpdatedAtomId({ revision, localId });
         updated.set([newAtom.revision, newAtom.localId], valueMapper(value));
@@ -938,9 +941,9 @@ function composeBuildsDestroysAndRefreshers(change1, change2) {
     // Note that it would in principle be possible to adopt the later build and exclude from the
     // composition all the changes already reflected on the tree, but that is not something we
     // care to support at this time.
-    const allBuilds = brand(mergeTupleBTrees(change1.builds ?? newTupleBTree(), change2.builds ?? newTupleBTree(), true));
-    const allDestroys = brand(mergeTupleBTrees(change1.destroys ?? newTupleBTree(), change2.destroys ?? newTupleBTree()));
-    const allRefreshers = brand(mergeTupleBTrees(change1.refreshers ?? newTupleBTree(), change2.refreshers ?? newTupleBTree(), true));
+    const allBuilds = brand(mergeTupleBTrees(change1.builds ?? newChangeAtomIdBTree(), change2.builds ?? newChangeAtomIdBTree(), true));
+    const allDestroys = brand(mergeTupleBTrees(change1.destroys ?? newChangeAtomIdBTree(), change2.destroys ?? newChangeAtomIdBTree()));
+    const allRefreshers = brand(mergeTupleBTrees(change1.refreshers ?? newChangeAtomIdBTree(), change2.refreshers ?? newChangeAtomIdBTree(), true));
     if (change1.destroys !== undefined && change2.builds !== undefined) {
         for (const [key, chunk] of change2.builds.entries()) {
             const destroyCount = change1.destroys.get(key);
@@ -1012,7 +1015,7 @@ function* relevantRemovedRootsFromFields(change, nodeChanges, fieldKinds) {
  * corresponding build or refresher.
  */
 export function updateRefreshers(change, getDetachedNode, removedRoots, requireRefreshers = true) {
-    const refreshers = newTupleBTree();
+    const refreshers = newChangeAtomIdBTree();
     const chunkLengths = new Map();
     if (change.builds !== undefined) {
         for (const [[revision, id], chunk] of change.builds.entries()) {
@@ -1125,7 +1128,7 @@ function intoDeltaImpl(change, nodeChanges, fieldKinds, global, rename) {
             const nodeChange = nodeChangeFromId(nodeChanges, childChange);
             return deltaFromNodeChange(nodeChange, nodeChanges, fieldKinds, global, rename);
         });
-        if (fieldChanges !== undefined && fieldChanges.length > 0) {
+        if (fieldChanges !== undefined && fieldChanges.marks.length > 0) {
             delta.set(field, fieldChanges);
         }
         for (const c of fieldGlobal ?? []) {
@@ -1193,13 +1196,13 @@ function newComposeTable(baseChange, newChange, composedNodeToParent) {
         newChange,
         fieldToContext: new Map(),
         newFieldToBaseField: new Map(),
-        newToBaseNodeId: newTupleBTree(),
+        newToBaseNodeId: newChangeAtomIdBTree(),
         composedNodes: new Set(),
         composedNodeToParent,
         pendingCompositions: {
             nodeIdsToCompose: [],
-            affectedBaseFields: newTupleBTree(),
-            affectedNewFields: newTupleBTree(),
+            affectedBaseFields: newFieldIdKeyBTree(),
+            affectedNewFields: newFieldIdKeyBTree(),
         },
     };
 }
@@ -1353,9 +1356,9 @@ function makeModularChangeset(props) {
     const p = props ?? { maxId: -1 };
     const changeset = {
         fieldChanges: p.fieldChanges ?? new Map(),
-        nodeChanges: p.nodeChanges ?? newTupleBTree(),
-        nodeToParent: p.nodeToParent ?? newTupleBTree(),
-        nodeAliases: p.nodeAliases ?? newTupleBTree(),
+        nodeChanges: p.nodeChanges ?? newChangeAtomIdBTree(),
+        nodeToParent: p.nodeToParent ?? newChangeAtomIdBTree(),
+        nodeAliases: p.nodeAliases ?? newChangeAtomIdBTree(),
         crossFieldKeys: p.crossFieldKeys ?? newCrossFieldKeyTable(),
     };
     if (p.revisions !== undefined && p.revisions.length > 0) {
@@ -1424,7 +1427,7 @@ export class ModularEditBuilder extends EditBuilder {
         }
         // This content will be added to a GlobalEditDescription whose lifetime exceeds the scope of this function.
         content.referenceAdded();
-        const builds = newTupleBTree();
+        const builds = newChangeAtomIdBTree();
         builds.set([revision, firstId], content);
         return {
             type: "global",
@@ -1444,8 +1447,8 @@ export class ModularEditBuilder extends EditBuilder {
         const modularChange = buildModularChangesetFromField({
             path: field,
             fieldChange: { fieldKind, change },
-            nodeChanges: newTupleBTree(),
-            nodeToParent: newTupleBTree(),
+            nodeChanges: newChangeAtomIdBTree(),
+            nodeToParent: newChangeAtomIdBTree(),
             crossFieldKeys: newCrossFieldKeyTable(),
             idAllocator: this.idAllocator,
             localCrossFieldKeys,
@@ -1473,8 +1476,8 @@ export class ModularEditBuilder extends EditBuilder {
                         fieldKind: change.fieldKind,
                         change: change.change,
                     },
-                    nodeChanges: newTupleBTree(),
-                    nodeToParent: newTupleBTree(),
+                    nodeChanges: newChangeAtomIdBTree(),
+                    nodeToParent: newChangeAtomIdBTree(),
                     crossFieldKeys: newCrossFieldKeyTable(),
                     idAllocator: this.idAllocator,
                     localCrossFieldKeys: getChangeHandler(this.fieldKinds, change.fieldKind).getCrossFieldKeys(change.change),
@@ -1502,8 +1505,8 @@ export class ModularEditBuilder extends EditBuilder {
         this.applyChange(tagChange(buildModularChangesetFromNode({
             path,
             nodeChange,
-            nodeChanges: newTupleBTree(),
-            nodeToParent: newTupleBTree(),
+            nodeChanges: newChangeAtomIdBTree(),
+            nodeToParent: newChangeAtomIdBTree(),
             crossFieldKeys: newCrossFieldKeyTable(),
             idAllocator: this.idAllocator,
             revision,
@@ -1516,8 +1519,8 @@ export class ModularEditBuilder extends EditBuilder {
         this.applyChange(tagChange(buildModularChangesetFromNode({
             path,
             nodeChange,
-            nodeChanges: newTupleBTree(),
-            nodeToParent: newTupleBTree(),
+            nodeChanges: newChangeAtomIdBTree(),
+            nodeToParent: newChangeAtomIdBTree(),
             crossFieldKeys: newCrossFieldKeyTable(),
             idAllocator: this.idAllocator,
             revision,
@@ -1740,4 +1743,12 @@ function noNewChangesRebaseChild(child, _baseChild, _stateChange) {
 function areEqualFieldIds(a, b) {
     return areEqualChangeAtomIdOpts(a.nodeId, b.nodeId) && a.field === b.field;
 }
+function newFieldIdKeyBTree() {
+    return newTupleBTree(compareFieldIdKeys);
+}
+const compareFieldIdKeys = createTupleComparator([
+    comparePartialRevisions,
+    comparePartialChangesetLocalIds,
+    (compareStrings),
+]);
 //# sourceMappingURL=modularChangeFamily.js.map