@fluidframework/tree 2.102.0 → 2.110.0

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

@@ -371,6 +371,8 @@ class ModularChangeFamily {
             }
         }
         const crossFieldKeys = this.makeCrossFieldKeyTable(invertedFields, invertedNodes);
+        const constraintState = newConstraintState(0);
+        this.updateConstraintsForFields(invertedFields, fieldChangeHandler_js_1.NodeAttachState.Attached, constraintState, invertedNodes);
         return makeModularChangeset({
             fieldChanges: invertedFields,
             nodeChanges: invertedNodes,
@@ -379,8 +381,7 @@ class ModularChangeFamily {
             crossFieldKeys,
             maxId: genId.getMaxId(),
             revisions: revInfos,
-            constraintViolationCount: change.change.constraintViolationCountOnRevert,
-            constraintViolationCountOnRevert: change.change.constraintViolationCount,
+            constraintViolationCount: constraintState.violationCount,
             noChangeConstraint,
             noChangeConstraintOnRevert,
             destroys,
@@ -455,7 +456,6 @@ class ModularChangeFamily {
         const rebasedFields = this.rebaseIntersectingFields(crossFieldTable, rebasedNodes, genId, rebaseMetadata);
         this.rebaseInvalidatedElements(rebasedFields, rebasedNodes, crossFieldTable, rebaseMetadata, genId);
         const constraintState = newConstraintState(change.constraintViolationCount ?? 0);
-        const revertConstraintState = newConstraintState(change.constraintViolationCountOnRevert ?? 0);
         let noChangeConstraint = change.noChangeConstraint;
         if (noChangeConstraint !== undefined &&
             !noChangeConstraint.violated &&
@@ -463,7 +463,7 @@ class ModularChangeFamily {
             noChangeConstraint = { violated: true };
             constraintState.violationCount += 1;
         }
-        this.updateConstraintsForFields(rebasedFields, fieldChangeHandler_js_1.NodeAttachState.Attached, fieldChangeHandler_js_1.NodeAttachState.Attached, constraintState, revertConstraintState, rebasedNodes);
+        this.updateConstraintsForFields(rebasedFields, fieldChangeHandler_js_1.NodeAttachState.Attached, constraintState, rebasedNodes);
         const rebased = makeModularChangeset({
             fieldChanges: this.pruneFieldMap(rebasedFields, rebasedNodes),
             nodeChanges: rebasedNodes,
@@ -473,7 +473,6 @@ class ModularChangeFamily {
             maxId: idState.maxId,
             revisions: change.revisions,
             constraintViolationCount: constraintState.violationCount,
-            constraintViolationCountOnRevert: revertConstraintState.violationCount,
             noChangeConstraint,
             noChangeConstraintOnRevert: change.noChangeConstraintOnRevert,
             builds: change.builds,
@@ -682,23 +681,19 @@ class ModularChangeFamily {
         (0, changeAtomIdBTree_js_1.setInChangeAtomIdMap)(crossFieldTable.baseToRebasedNodeId, baseId, newId);
         return rebasedChange;
     }
-    updateConstraintsForFields(fields, parentInputAttachState, parentOutputAttachState, constraintState, revertConstraintState, nodes) {
+    updateConstraintsForFields(fields, parentInputAttachState, constraintState, nodes) {
         for (const field of fields.values()) {
             const handler = getChangeHandler(this.fieldKinds, field.fieldKind);
-            for (const [nodeId, inputIndex, outputIndex] of handler.getNestedChanges(field.change)) {
+            for (const [nodeId, inputIndex, _outputIndex] of handler.getNestedChanges(field.change)) {
                 const isInputDetached = inputIndex === undefined;
                 const inputAttachState = parentInputAttachState === fieldChangeHandler_js_1.NodeAttachState.Detached || isInputDetached
                     ? fieldChangeHandler_js_1.NodeAttachState.Detached
                     : fieldChangeHandler_js_1.NodeAttachState.Attached;
-                const isOutputDetached = outputIndex === undefined;
-                const outputAttachState = parentOutputAttachState === fieldChangeHandler_js_1.NodeAttachState.Detached || isOutputDetached
-                    ? fieldChangeHandler_js_1.NodeAttachState.Detached
-                    : fieldChangeHandler_js_1.NodeAttachState.Attached;
-                this.updateConstraintsForNode(nodeId, inputAttachState, outputAttachState, nodes, constraintState, revertConstraintState);
+                this.updateConstraintsForNode(nodeId, inputAttachState, nodes, constraintState);
             }
         }
     }
-    updateConstraintsForNode(nodeId, inputAttachState, outputAttachState, nodes, constraintState, revertConstraintState) {
+    updateConstraintsForNode(nodeId, inputAttachState, nodes, constraintState) {
         const node = nodes.get([nodeId.revision, nodeId.localId]) ?? (0, internal_1.fail)(0xb24 /* Unknown node ID */);
         if (node.nodeExistsConstraint !== undefined) {
             const isNowViolated = inputAttachState === fieldChangeHandler_js_1.NodeAttachState.Detached;
@@ -710,18 +705,8 @@ class ModularChangeFamily {
                 constraintState.violationCount += isNowViolated ? 1 : -1;
             }
         }
-        if (node.nodeExistsConstraintOnRevert !== undefined) {
-            const isNowViolated = outputAttachState === fieldChangeHandler_js_1.NodeAttachState.Detached;
-            if (node.nodeExistsConstraintOnRevert.violated !== isNowViolated) {
-                node.nodeExistsConstraintOnRevert = {
-                    ...node.nodeExistsConstraintOnRevert,
-                    violated: isNowViolated,
-                };
-                revertConstraintState.violationCount += isNowViolated ? 1 : -1;
-            }
-        }
         if (node.fieldChanges !== undefined) {
-            this.updateConstraintsForFields(node.fieldChanges, inputAttachState, outputAttachState, constraintState, revertConstraintState, nodes);
+            this.updateConstraintsForFields(node.fieldChanges, inputAttachState, constraintState, nodes);
         }
     }
     pruneFieldMap(changeset, nodeMap) {
@@ -1053,7 +1038,7 @@ function updateRefreshers(change, getDetachedNode, removedRoots, requireRefreshe
             refreshers.set([root.major, (0, index_js_3.brand)(root.minor)], node);
         }
     }
-    const { fieldChanges, nodeChanges, nodeToParent, nodeAliases, crossFieldKeys, maxId, revisions, constraintViolationCount, constraintViolationCountOnRevert, builds, destroys, } = change;
+    const { fieldChanges, nodeChanges, nodeToParent, nodeAliases, crossFieldKeys, maxId, revisions, constraintViolationCount, builds, destroys, } = change;
     return makeModularChangeset({
         fieldChanges,
         nodeChanges,
@@ -1063,7 +1048,6 @@ function updateRefreshers(change, getDetachedNode, removedRoots, requireRefreshe
         maxId: maxId,
         revisions,
         constraintViolationCount,
-        constraintViolationCountOnRevert,
         builds,
         destroys,
         refreshers,
@@ -1382,10 +1366,6 @@ function makeModularChangeset(props) {
     if (p.constraintViolationCount !== undefined && p.constraintViolationCount > 0) {
         changeset.constraintViolationCount = p.constraintViolationCount;
     }
-    if (p.constraintViolationCountOnRevert !== undefined &&
-        p.constraintViolationCountOnRevert > 0) {
-        changeset.constraintViolationCountOnRevert = p.constraintViolationCountOnRevert;
-    }
     if (p.noChangeConstraint !== undefined) {
         changeset.noChangeConstraint = p.noChangeConstraint;
     }