@fluidframework/tree 2.4.0-297027 → 2.4.0-299374

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

@@ -85,7 +85,18 @@ class ModularChangeFamily {
     composePair(change1, change2, revInfos, idState) {
         const { fieldChanges, nodeChanges, nodeToParent, nodeAliases, crossFieldKeys } = this.composeAllFields(change1, change2, revInfos, idState);
         const { allBuilds, allDestroys, allRefreshers } = composeBuildsDestroysAndRefreshers(change1, change2);
-        return makeModularChangeset(fieldChanges, nodeChanges, nodeToParent, nodeAliases, crossFieldKeys, idState.maxId, revInfos, undefined, allBuilds, allDestroys, allRefreshers);
+        return makeModularChangeset({
+            fieldChanges,
+            nodeChanges,
+            nodeToParent,
+            nodeAliases,
+            crossFieldKeys,
+            maxId: idState.maxId,
+            revisions: revInfos,
+            builds: allBuilds,
+            destroys: allDestroys,
+            refreshers: allRefreshers,
+        });
     }
     composeAllFields(change1, change2, revInfos, idState) {
         if (hasConflicts(change1) && hasConflicts(change2)) {
@@ -306,15 +317,23 @@ class ModularChangeFamily {
     /**
      * @param change - The change to invert.
      * @param isRollback - Whether the inverted change is meant to rollback a change on a branch as is the case when
+     * @param revisionForInvert - The revision for the invert changeset.
      * performing a sandwich rebase.
      */
-    invert(change, isRollback) {
+    invert(change, isRollback, revisionForInvert) {
         // Rollback changesets destroy the nodes created by the change being rolled back.
         const destroys = isRollback ? invertBuilds(change.change.builds) : undefined;
         // Destroys only occur in rollback changesets, which are never inverted.
         (0, internal_1.assert)(change.change.destroys === undefined, 0x89a /* Unexpected destroys in change to invert */);
+        const revInfos = isRollback
+            ? [{ revision: revisionForInvert, rollbackOf: change.revision }]
+            : [{ revision: revisionForInvert }];
         if (hasConflicts(change.change)) {
-            return makeModularChangeset(undefined, undefined, undefined, undefined, undefined, change.change.maxId, [], undefined, undefined, destroys);
+            return makeModularChangeset({
+                maxId: change.change.maxId,
+                revisions: revInfos,
+                destroys,
+            });
         }
         const genId = (0, index_js_2.idAllocatorFromMaxId)(change.change.maxId ?? -1);
         const crossFieldTable = {
@@ -322,12 +341,12 @@ class ModularChangeFamily {
             originalFieldToContext: new Map(),
             invertedNodeToParent: (0, index_js_2.brand)(change.change.nodeToParent.clone()),
         };
-        const { revInfos } = getRevInfoFromTaggedChanges([change]);
-        const revisionMetadata = (0, index_js_1.revisionMetadataSourceFromInfo)(revInfos);
-        const invertedFields = this.invertFieldMap(change.change.fieldChanges, undefined, isRollback, genId, crossFieldTable, revisionMetadata);
+        const { revInfos: oldRevInfos } = getRevInfoFromTaggedChanges([change]);
+        const revisionMetadata = (0, index_js_1.revisionMetadataSourceFromInfo)(oldRevInfos);
+        const invertedFields = this.invertFieldMap(change.change.fieldChanges, undefined, isRollback, genId, crossFieldTable, revisionMetadata, revisionForInvert);
         const invertedNodes = newTupleBTree();
         change.change.nodeChanges.forEachPair(([revision, localId], nodeChangeset) => {
-            invertedNodes.set([revision, localId], this.invertNodeChange(nodeChangeset, { revision, localId }, isRollback, genId, crossFieldTable, revisionMetadata));
+            invertedNodes.set([revision, localId], this.invertNodeChange(nodeChangeset, { revision, localId }, isRollback, genId, crossFieldTable, revisionMetadata, revisionForInvert));
         });
         if (crossFieldTable.invalidatedFields.size > 0) {
             const fieldsToUpdate = crossFieldTable.invalidatedFields;
@@ -337,19 +356,29 @@ class ModularChangeFamily {
                 const context = crossFieldTable.originalFieldToContext.get(fieldChange);
                 (0, internal_1.assert)(context !== undefined, 0x851 /* Should have context for every invalidated field */);
                 const { invertedField, fieldId } = context;
-                const amendedChange = getChangeHandler(this.fieldKinds, fieldChange.fieldKind).rebaser.invert(originalFieldChange, isRollback, genId, new InvertManager(crossFieldTable, fieldChange, fieldId), revisionMetadata);
+                const amendedChange = getChangeHandler(this.fieldKinds, fieldChange.fieldKind).rebaser.invert(originalFieldChange, isRollback, genId, revisionForInvert, new InvertManager(crossFieldTable, fieldChange, fieldId), revisionMetadata);
                 invertedField.change = (0, index_js_2.brand)(amendedChange);
             }
         }
         const crossFieldKeys = this.makeCrossFieldKeyTable(invertedFields, invertedNodes);
-        return makeModularChangeset(invertedFields, invertedNodes, crossFieldTable.invertedNodeToParent, change.change.nodeAliases, crossFieldKeys, genId.getMaxId(), [], change.change.constraintViolationCount, undefined, destroys);
+        return makeModularChangeset({
+            fieldChanges: invertedFields,
+            nodeChanges: invertedNodes,
+            nodeToParent: crossFieldTable.invertedNodeToParent,
+            nodeAliases: change.change.nodeAliases,
+            crossFieldKeys,
+            maxId: genId.getMaxId(),
+            revisions: revInfos,
+            constraintViolationCount: change.change.constraintViolationCount,
+            destroys,
+        });
     }
-    invertFieldMap(changes, parentId, isRollback, genId, crossFieldTable, revisionMetadata) {
+    invertFieldMap(changes, parentId, isRollback, genId, crossFieldTable, revisionMetadata, revisionForInvert) {
         const invertedFields = new Map();
         for (const [field, fieldChange] of changes) {
             const fieldId = { nodeId: parentId, field };
             const manager = new InvertManager(crossFieldTable, fieldChange, fieldId);
-            const invertedChange = getChangeHandler(this.fieldKinds, fieldChange.fieldKind).rebaser.invert(fieldChange.change, isRollback, genId, manager, revisionMetadata);
+            const invertedChange = getChangeHandler(this.fieldKinds, fieldChange.fieldKind).rebaser.invert(fieldChange.change, isRollback, genId, revisionForInvert, manager, revisionMetadata);
             const invertedFieldChange = {
                 ...fieldChange,
                 change: (0, index_js_2.brand)(invertedChange),
@@ -362,10 +391,10 @@ class ModularChangeFamily {
         }
         return invertedFields;
     }
-    invertNodeChange(change, id, isRollback, genId, crossFieldTable, revisionMetadata) {
+    invertNodeChange(change, id, isRollback, genId, crossFieldTable, revisionMetadata, revisionForInvert) {
         const inverse = {};
         if (change.fieldChanges !== undefined) {
-            inverse.fieldChanges = this.invertFieldMap(change.fieldChanges, id, isRollback, genId, crossFieldTable, revisionMetadata);
+            inverse.fieldChanges = this.invertFieldMap(change.fieldChanges, id, isRollback, genId, crossFieldTable, revisionMetadata, revisionForInvert);
         }
         return inverse;
     }
@@ -401,7 +430,19 @@ class ModularChangeFamily {
         const rebasedFields = this.rebaseIntersectingFields(crossFieldTable, rebasedNodes, genId, constraintState, rebaseMetadata);
         this.rebaseInvalidatedElements(rebasedFields, rebasedNodes, crossFieldTable, rebaseMetadata, genId);
         this.updateConstraintsForFields(rebasedFields, fieldChangeHandler_js_1.NodeAttachState.Attached, constraintState, rebasedNodes);
-        const rebased = makeModularChangeset(this.pruneFieldMap(rebasedFields, rebasedNodes), rebasedNodes, crossFieldTable.rebasedNodeToParent, change.nodeAliases, crossFieldTable.rebasedCrossFieldKeys, idState.maxId, change.revisions, constraintState.violationCount, change.builds, change.destroys, change.refreshers);
+        const rebased = makeModularChangeset({
+            fieldChanges: this.pruneFieldMap(rebasedFields, rebasedNodes),
+            nodeChanges: rebasedNodes,
+            nodeToParent: crossFieldTable.rebasedNodeToParent,
+            nodeAliases: change.nodeAliases,
+            crossFieldKeys: crossFieldTable.rebasedCrossFieldKeys,
+            maxId: idState.maxId,
+            revisions: change.revisions,
+            constraintViolationCount: constraintState.violationCount,
+            builds: change.builds,
+            destroys: change.destroys,
+            refreshers: change.refreshers,
+        });
         return rebased;
     }
     // This performs a first pass on all fields which have both new and base changes.
@@ -666,7 +707,7 @@ class ModularChangeFamily {
         }
     }
     changeRevision(change, newRevision, rollbackOf) {
-        const oldRevisions = new Set(change.revisions === undefined
+        const oldRevisions = new Set(change.revisions === undefined || change.revisions.length === 0
             ? [undefined]
             : change.revisions.map((revInfo) => revInfo.revision));
         const updatedFields = this.replaceFieldMapRevisions(change.fieldChanges, oldRevisions, newRevision);
@@ -938,7 +979,19 @@ function updateRefreshers(change, getDetachedNode, removedRoots, requireRefreshe
         }
     }
     const { fieldChanges, nodeChanges, maxId, revisions, constraintViolationCount, builds, destroys, } = change;
-    return makeModularChangeset(fieldChanges, nodeChanges, change.nodeToParent, change.nodeAliases, change.crossFieldKeys, maxId, revisions, constraintViolationCount, builds, destroys, refreshers);
+    return makeModularChangeset({
+        fieldChanges,
+        nodeChanges,
+        nodeToParent: change.nodeToParent,
+        nodeAliases: change.nodeAliases,
+        crossFieldKeys: change.crossFieldKeys,
+        maxId: maxId,
+        revisions,
+        constraintViolationCount,
+        builds,
+        destroys,
+        refreshers,
+    });
 }
 exports.updateRefreshers = updateRefreshers;
 /**
@@ -1222,31 +1275,33 @@ class ComposeManager extends CrossFieldManagerI {
         return this.crossFieldTable;
     }
 }
-function makeModularChangeset(fieldChanges = undefined, nodeChanges = undefined, nodeToParent = undefined, nodeAliases = undefined, crossFieldKeys = undefined, maxId = -1, revisions = undefined, constraintViolationCount = undefined, builds, destroys, refreshers) {
+function makeModularChangeset(props = {
+    maxId: -1,
+}) {
     const changeset = {
-        fieldChanges: fieldChanges ?? new Map(),
-        nodeChanges: nodeChanges ?? newTupleBTree(),
-        nodeToParent: nodeToParent ?? newTupleBTree(),
-        nodeAliases: nodeAliases ?? newTupleBTree(),
-        crossFieldKeys: crossFieldKeys ?? newCrossFieldKeyTable(),
+        fieldChanges: props.fieldChanges ?? new Map(),
+        nodeChanges: props.nodeChanges ?? newTupleBTree(),
+        nodeToParent: props.nodeToParent ?? newTupleBTree(),
+        nodeAliases: props.nodeAliases ?? newTupleBTree(),
+        crossFieldKeys: props.crossFieldKeys ?? newCrossFieldKeyTable(),
     };
-    if (revisions !== undefined && revisions.length > 0) {
-        changeset.revisions = revisions;
+    if (props.revisions !== undefined && props.revisions.length > 0) {
+        changeset.revisions = props.revisions;
     }
-    if (maxId >= 0) {
-        changeset.maxId = (0, index_js_2.brand)(maxId);
+    if (props.maxId >= 0) {
+        changeset.maxId = (0, index_js_2.brand)(props.maxId);
     }
-    if (constraintViolationCount !== undefined && constraintViolationCount > 0) {
-        changeset.constraintViolationCount = constraintViolationCount;
+    if (props.constraintViolationCount !== undefined && props.constraintViolationCount > 0) {
+        changeset.constraintViolationCount = props.constraintViolationCount;
     }
-    if (builds !== undefined && builds.size > 0) {
-        changeset.builds = builds;
+    if (props.builds !== undefined && props.builds.size > 0) {
+        changeset.builds = props.builds;
     }
-    if (destroys !== undefined && destroys.size > 0) {
-        changeset.destroys = destroys;
+    if (props.destroys !== undefined && props.destroys.size > 0) {
+        changeset.destroys = props.destroys;
     }
-    if (refreshers !== undefined && refreshers.size > 0) {
-        changeset.refreshers = refreshers;
+    if (props.refreshers !== undefined && props.refreshers.size > 0) {
+        changeset.refreshers = props.refreshers;
     }
     return changeset;
 }
@@ -1273,11 +1328,12 @@ class ModularEditBuilder extends index_js_1.EditBuilder {
     /**
      * @param firstId - The ID to associate with the first node
      * @param content - The node(s) to build. Can be in either Field or Node mode.
+     * @param revision - The revision to use for the build.
      * @returns A description of the edit that can be passed to `submitChanges`.
      */
-    buildTrees(firstId, content, idCompressor) {
+    buildTrees(firstId, content, revision, idCompressor) {
         if (content.mode === 1 /* CursorLocationType.Fields */ && content.getFieldLength() === 0) {
-            return { type: "global" };
+            return { type: "global", revision };
         }
         const builds = newTupleBTree();
         const chunkCompressor = {
@@ -1287,10 +1343,11 @@ class ModularEditBuilder extends index_js_1.EditBuilder {
         const chunk = content.mode === 1 /* CursorLocationType.Fields */
             ? (0, index_js_3.chunkFieldSingle)(content, chunkCompressor)
             : (0, index_js_3.chunkTree)(content, chunkCompressor);
-        builds.set([undefined, firstId], chunk);
+        builds.set([revision, firstId], chunk);
         return {
             type: "global",
             builds,
+            revision,
         };
     }
     /**
@@ -1298,25 +1355,55 @@ class ModularEditBuilder extends index_js_1.EditBuilder {
      * @param field - the field which is being edited
      * @param fieldKind - the kind of the field
      * @param change - the change to the field
-     * @param maxId - the highest `ChangesetLocalId` used in this change
+     * @param revision - the revision of the change
      */
-    submitChange(field, fieldKind, change) {
-        const crossFieldKeys = getChangeHandler(this.fieldKinds, fieldKind).getCrossFieldKeys(change);
-        const modularChange = buildModularChangesetFromField(field, { fieldKind, change }, newTupleBTree(), newTupleBTree(), newCrossFieldKeyTable(), this.idAllocator, crossFieldKeys);
-        this.applyChange(modularChange);
+    submitChange(field, fieldKind, change, revision) {
+        const localCrossFieldKeys = getChangeHandler(this.fieldKinds, fieldKind).getCrossFieldKeys(change);
+        const modularChange = buildModularChangesetFromField({
+            path: field,
+            fieldChange: { fieldKind, change },
+            nodeChanges: newTupleBTree(),
+            nodeToParent: newTupleBTree(),
+            crossFieldKeys: newCrossFieldKeyTable(),
+            idAllocator: this.idAllocator,
+            localCrossFieldKeys,
+            revision,
+        });
+        this.applyChange((0, index_js_1.tagChange)(modularChange, revision));
     }
-    submitChanges(changes) {
+    submitChanges(changes, revision) {
         const modularChange = this.buildChanges(changes);
-        this.applyChange(modularChange);
+        this.applyChange((0, index_js_1.tagChange)(modularChange, revision));
     }
     buildChanges(changes) {
-        const changeMaps = changes.map((change) => (0, index_js_1.makeAnonChange)(change.type === "global"
-            ? makeModularChangeset(undefined, undefined, undefined, undefined, undefined, this.idAllocator.getMaxId(), undefined, undefined, change.builds)
-            : buildModularChangesetFromField(change.field, {
-                fieldKind: change.fieldKind,
-                change: change.change,
-            }, newTupleBTree(), newTupleBTree(), newCrossFieldKeyTable(), this.idAllocator, getChangeHandler(this.fieldKinds, change.fieldKind).getCrossFieldKeys(change.change))));
-        const composedChange = this.changeFamily.rebaser.compose(changeMaps);
+        const revisions = new Set();
+        const changeMaps = changes.map((change) => {
+            revisions.add(change.revision);
+            return (0, index_js_1.makeAnonChange)(change.type === "global"
+                ? makeModularChangeset({
+                    maxId: this.idAllocator.getMaxId(),
+                    builds: change.builds,
+                    revisions: [{ revision: change.revision }],
+                })
+                : buildModularChangesetFromField({
+                    path: change.field,
+                    fieldChange: {
+                        fieldKind: change.fieldKind,
+                        change: change.change,
+                    },
+                    nodeChanges: newTupleBTree(),
+                    nodeToParent: newTupleBTree(),
+                    crossFieldKeys: newCrossFieldKeyTable(),
+                    idAllocator: this.idAllocator,
+                    localCrossFieldKeys: getChangeHandler(this.fieldKinds, change.fieldKind).getCrossFieldKeys(change.change),
+                    revision: change.revision,
+                }));
+        });
+        const revInfo = Array.from(revisions).map((revision) => ({ revision }));
+        const composedChange = {
+            ...this.changeFamily.rebaser.compose(changeMaps),
+            revisions: revInfo,
+        };
         const maxId = (0, index_js_2.brand)(this.idAllocator.getMaxId());
         if (maxId >= 0) {
             composedChange.maxId = maxId;
@@ -1326,15 +1413,24 @@ class ModularEditBuilder extends index_js_1.EditBuilder {
     generateId(count) {
         return (0, index_js_2.brand)(this.idAllocator.allocate(count));
     }
-    addNodeExistsConstraint(path) {
+    addNodeExistsConstraint(path, revision) {
         const nodeChange = {
             nodeExistsConstraint: { violated: false },
         };
-        this.applyChange(buildModularChangesetFromNode(path, nodeChange, newTupleBTree(), newTupleBTree(), newCrossFieldKeyTable(), this.idAllocator));
+        this.applyChange((0, index_js_1.tagChange)(buildModularChangesetFromNode({
+            path,
+            nodeChange,
+            nodeChanges: newTupleBTree(),
+            nodeToParent: newTupleBTree(),
+            crossFieldKeys: newCrossFieldKeyTable(),
+            idAllocator: this.idAllocator,
+            revision,
+        }), revision));
     }
 }
 exports.ModularEditBuilder = ModularEditBuilder;
-function buildModularChangesetFromField(path, fieldChange, nodeChanges, nodeToParent, crossFieldKeys, idAllocator = (0, index_js_2.idAllocatorFromMaxId)(), localCrossFieldKeys = [], childId = undefined) {
+function buildModularChangesetFromField(props) {
+    const { path, fieldChange, nodeChanges, nodeToParent, crossFieldKeys, idAllocator = (0, index_js_2.idAllocatorFromMaxId)(), localCrossFieldKeys = [], childId, revision, } = props;
     const fieldChanges = new Map([[path.field, fieldChange]]);
     if (path.parent === undefined) {
         for (const key of localCrossFieldKeys) {
@@ -1346,12 +1442,19 @@ function buildModularChangesetFromField(path, fieldChange, nodeChanges, nodeToPa
                 field: path.field,
             });
         }
-        return makeModularChangeset(fieldChanges, nodeChanges, nodeToParent, undefined, crossFieldKeys, idAllocator.getMaxId());
+        return makeModularChangeset({
+            fieldChanges,
+            nodeChanges,
+            nodeToParent,
+            crossFieldKeys,
+            maxId: idAllocator.getMaxId(),
+            revisions: [{ revision }],
+        });
     }
     const nodeChangeset = {
         fieldChanges,
     };
-    const parentId = { localId: (0, index_js_2.brand)(idAllocator.allocate()) };
+    const parentId = { localId: (0, index_js_2.brand)(idAllocator.allocate()), revision };
     for (const key of localCrossFieldKeys) {
         crossFieldKeys.set(key, { nodeId: parentId, field: path.field });
     }
@@ -1361,16 +1464,32 @@ function buildModularChangesetFromField(path, fieldChange, nodeChanges, nodeToPa
             field: path.field,
         });
     }
-    return buildModularChangesetFromNode(path.parent, nodeChangeset, nodeChanges, nodeToParent, crossFieldKeys, idAllocator, parentId);
+    return buildModularChangesetFromNode({
+        path: path.parent,
+        nodeChange: nodeChangeset,
+        nodeChanges,
+        nodeToParent,
+        crossFieldKeys,
+        idAllocator,
+        revision,
+        nodeId: parentId,
+    });
 }
-function buildModularChangesetFromNode(path, nodeChange, nodeChanges, nodeToParent, crossFieldKeys, idAllocator, nodeId = { localId: (0, index_js_2.brand)(idAllocator.allocate()) }) {
-    setInChangeAtomIdMap(nodeChanges, nodeId, nodeChange);
+function buildModularChangesetFromNode(props) {
+    const { path, nodeId = { localId: (0, index_js_2.brand)(props.idAllocator.allocate()), revision: props.revision }, } = props;
+    setInChangeAtomIdMap(props.nodeChanges, nodeId, props.nodeChange);
     const fieldChangeset = genericFieldKind_js_1.genericFieldKind.changeHandler.editor.buildChildChange(path.parentIndex, nodeId);
     const fieldChange = {
         fieldKind: genericFieldKind_js_1.genericFieldKind.identifier,
         change: fieldChangeset,
     };
-    return buildModularChangesetFromField({ parent: path.parent, field: path.parentField }, fieldChange, nodeChanges, nodeToParent, crossFieldKeys, idAllocator, [], nodeId);
+    return buildModularChangesetFromField({
+        ...props,
+        path: { parent: path.parent, field: path.parentField },
+        fieldChange,
+        localCrossFieldKeys: [],
+        childId: nodeId,
+    });
 }
 function getRevInfoFromTaggedChanges(changes) {
     let maxId = -1;