@fluidframework/tree 2.81.1 → 2.83.0

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

@@ -354,7 +354,7 @@ class ModularChangeFamily {
         const { revInfos: oldRevInfos } = getRevInfoFromTaggedChanges([change]);
         const revisionMetadata = (0, index_js_2.revisionMetadataSourceFromInfo)(oldRevInfos);
         const invertedFields = this.invertFieldMap(change.change.fieldChanges, undefined, isRollback, genId, crossFieldTable, revisionMetadata, revisionForInvert);
-        const invertedNodes = (0, index_js_3.newTupleBTree)();
+        const invertedNodes = (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)();
         change.change.nodeChanges.forEachPair(([revision, localId], nodeChangeset) => {
             invertedNodes.set([revision, localId], this.invertNodeChange(nodeChangeset, { revision, localId }, isRollback, genId, crossFieldTable, revisionMetadata, revisionForInvert));
         });
@@ -437,12 +437,12 @@ class ModularChangeFamily {
             newChange: change,
             baseChange: over.change,
             baseFieldToContext: new Map(),
-            baseToRebasedNodeId: (0, index_js_3.newTupleBTree)(),
+            baseToRebasedNodeId: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
             rebasedFields: new Set(),
             rebasedNodeToParent: (0, index_js_3.brand)(change.nodeToParent.clone()),
             rebasedCrossFieldKeys: change.crossFieldKeys.clone(),
             nodeIdPairs: [],
-            affectedBaseFields: (0, index_js_3.newTupleBTree)(),
+            affectedBaseFields: newFieldIdKeyBTree(),
             fieldsWithUnattachedChild: new Set(),
         };
         const getBaseRevisions = () => revisionInfoFromTaggedChange(over).map((info) => info.revision);
@@ -755,8 +755,11 @@ 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;
@@ -771,7 +774,7 @@ class ModularChangeFamily {
             nodeChanges: updatedNodes,
             nodeToParent: updatedNodeToParent,
             // We've updated all references to old node IDs, so we no longer need an alias table.
-            nodeAliases: (0, index_js_3.newTupleBTree)(),
+            nodeAliases: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
             crossFieldKeys: replaceCrossFieldKeyTableRevisions(change.crossFieldKeys, replacer, change.nodeAliases),
         };
         if (change.builds !== undefined) {
@@ -909,7 +912,7 @@ function replaceCrossFieldKeyTableRevisions(table, replacer, nodeAliases) {
     const updated = (0, modularChangeTypes_js_1.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
@@ -924,7 +927,7 @@ function replaceCrossFieldKeyTableRevisions(table, replacer, nodeAliases) {
     return updated;
 }
 function replaceIdMapRevisions(map, replacer, valueMapper = (value) => value) {
-    const updated = (0, index_js_3.newTupleBTree)();
+    const updated = (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)();
     for (const [[revision, localId], value] of map.entries()) {
         const newAtom = replacer.getUpdatedAtomId({ revision, localId });
         updated.set([newAtom.revision, newAtom.localId], valueMapper(value));
@@ -942,9 +945,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 = (0, index_js_3.brand)((0, index_js_3.mergeTupleBTrees)(change1.builds ?? (0, index_js_3.newTupleBTree)(), change2.builds ?? (0, index_js_3.newTupleBTree)(), true));
-    const allDestroys = (0, index_js_3.brand)((0, index_js_3.mergeTupleBTrees)(change1.destroys ?? (0, index_js_3.newTupleBTree)(), change2.destroys ?? (0, index_js_3.newTupleBTree)()));
-    const allRefreshers = (0, index_js_3.brand)((0, index_js_3.mergeTupleBTrees)(change1.refreshers ?? (0, index_js_3.newTupleBTree)(), change2.refreshers ?? (0, index_js_3.newTupleBTree)(), true));
+    const allBuilds = (0, index_js_3.brand)((0, index_js_3.mergeTupleBTrees)(change1.builds ?? (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(), change2.builds ?? (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(), true));
+    const allDestroys = (0, index_js_3.brand)((0, index_js_3.mergeTupleBTrees)(change1.destroys ?? (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(), change2.destroys ?? (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)()));
+    const allRefreshers = (0, index_js_3.brand)((0, index_js_3.mergeTupleBTrees)(change1.refreshers ?? (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(), change2.refreshers ?? (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(), true));
     if (change1.destroys !== undefined && change2.builds !== undefined) {
         for (const [key, chunk] of change2.builds.entries()) {
             const destroyCount = change1.destroys.get(key);
@@ -1017,7 +1020,7 @@ function* relevantRemovedRootsFromFields(change, nodeChanges, fieldKinds) {
  * corresponding build or refresher.
  */
 function updateRefreshers(change, getDetachedNode, removedRoots, requireRefreshers = true) {
-    const refreshers = (0, index_js_3.newTupleBTree)();
+    const refreshers = (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)();
     const chunkLengths = new Map();
     if (change.builds !== undefined) {
         for (const [[revision, id], chunk] of change.builds.entries()) {
@@ -1132,7 +1135,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 ?? []) {
@@ -1203,13 +1206,13 @@ function newComposeTable(baseChange, newChange, composedNodeToParent) {
         newChange,
         fieldToContext: new Map(),
         newFieldToBaseField: new Map(),
-        newToBaseNodeId: (0, index_js_3.newTupleBTree)(),
+        newToBaseNodeId: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
         composedNodes: new Set(),
         composedNodeToParent,
         pendingCompositions: {
             nodeIdsToCompose: [],
-            affectedBaseFields: (0, index_js_3.newTupleBTree)(),
-            affectedNewFields: (0, index_js_3.newTupleBTree)(),
+            affectedBaseFields: newFieldIdKeyBTree(),
+            affectedNewFields: newFieldIdKeyBTree(),
         },
     };
 }
@@ -1363,9 +1366,9 @@ function makeModularChangeset(props) {
     const p = props ?? { maxId: -1 };
     const changeset = {
         fieldChanges: p.fieldChanges ?? new Map(),
-        nodeChanges: p.nodeChanges ?? (0, index_js_3.newTupleBTree)(),
-        nodeToParent: p.nodeToParent ?? (0, index_js_3.newTupleBTree)(),
-        nodeAliases: p.nodeAliases ?? (0, index_js_3.newTupleBTree)(),
+        nodeChanges: p.nodeChanges ?? (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
+        nodeToParent: p.nodeToParent ?? (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
+        nodeAliases: p.nodeAliases ?? (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
         crossFieldKeys: p.crossFieldKeys ?? (0, modularChangeTypes_js_1.newCrossFieldKeyTable)(),
     };
     if (p.revisions !== undefined && p.revisions.length > 0) {
@@ -1434,7 +1437,7 @@ class ModularEditBuilder extends index_js_2.EditBuilder {
         }
         // This content will be added to a GlobalEditDescription whose lifetime exceeds the scope of this function.
         content.referenceAdded();
-        const builds = (0, index_js_3.newTupleBTree)();
+        const builds = (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)();
         builds.set([revision, firstId], content);
         return {
             type: "global",
@@ -1454,8 +1457,8 @@ class ModularEditBuilder extends index_js_2.EditBuilder {
         const modularChange = buildModularChangesetFromField({
             path: field,
             fieldChange: { fieldKind, change },
-            nodeChanges: (0, index_js_3.newTupleBTree)(),
-            nodeToParent: (0, index_js_3.newTupleBTree)(),
+            nodeChanges: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
+            nodeToParent: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
             crossFieldKeys: (0, modularChangeTypes_js_1.newCrossFieldKeyTable)(),
             idAllocator: this.idAllocator,
             localCrossFieldKeys,
@@ -1483,8 +1486,8 @@ class ModularEditBuilder extends index_js_2.EditBuilder {
                         fieldKind: change.fieldKind,
                         change: change.change,
                     },
-                    nodeChanges: (0, index_js_3.newTupleBTree)(),
-                    nodeToParent: (0, index_js_3.newTupleBTree)(),
+                    nodeChanges: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
+                    nodeToParent: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
                     crossFieldKeys: (0, modularChangeTypes_js_1.newCrossFieldKeyTable)(),
                     idAllocator: this.idAllocator,
                     localCrossFieldKeys: getChangeHandler(this.fieldKinds, change.fieldKind).getCrossFieldKeys(change.change),
@@ -1512,8 +1515,8 @@ class ModularEditBuilder extends index_js_2.EditBuilder {
         this.applyChange((0, index_js_2.tagChange)(buildModularChangesetFromNode({
             path,
             nodeChange,
-            nodeChanges: (0, index_js_3.newTupleBTree)(),
-            nodeToParent: (0, index_js_3.newTupleBTree)(),
+            nodeChanges: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
+            nodeToParent: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
             crossFieldKeys: (0, modularChangeTypes_js_1.newCrossFieldKeyTable)(),
             idAllocator: this.idAllocator,
             revision,
@@ -1526,8 +1529,8 @@ class ModularEditBuilder extends index_js_2.EditBuilder {
         this.applyChange((0, index_js_2.tagChange)(buildModularChangesetFromNode({
             path,
             nodeChange,
-            nodeChanges: (0, index_js_3.newTupleBTree)(),
-            nodeToParent: (0, index_js_3.newTupleBTree)(),
+            nodeChanges: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
+            nodeToParent: (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)(),
             crossFieldKeys: (0, modularChangeTypes_js_1.newCrossFieldKeyTable)(),
             idAllocator: this.idAllocator,
             revision,
@@ -1753,4 +1756,12 @@ function noNewChangesRebaseChild(child, _baseChild, _stateChange) {
 function areEqualFieldIds(a, b) {
     return (0, index_js_2.areEqualChangeAtomIdOpts)(a.nodeId, b.nodeId) && a.field === b.field;
 }
+function newFieldIdKeyBTree() {
+    return (0, index_js_3.newTupleBTree)(compareFieldIdKeys);
+}
+const compareFieldIdKeys = (0, index_js_3.createTupleComparator)([
+    index_js_2.comparePartialRevisions,
+    index_js_2.comparePartialChangesetLocalIds,
+    (index_js_3.compareStrings),
+]);
 //# sourceMappingURL=modularChangeFamily.js.map