npm - @manuscripts/track-changes-plugin - Versions diffs - 1.6.1-LEAN-2850 → 1.6.1-LEAN-2752-2 - Mend

@manuscripts/track-changes-plugin 1.6.1-LEAN-2850 → 1.6.1-LEAN-2752-2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.cjs CHANGED Viewed

@@ -530,9 +530,7 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         return tr;
     }
     const { operation } = trackedAttrs;
-    const oldTrackData = change.type === 'text-change'
-        ? getTextNodeTrackedMarkData(node, schema)
-        : getBlockInlineTrackedData(node);
+    const oldTrackData = change.type === 'text-change' ? getTextNodeTrackedMarkData(node, schema) : getBlockInlineTrackedData(node);
     if (!operation) {
         log.warn('updateChangeAttrs: unable to determine operation of change ', change);
     }
@@ -553,7 +551,15 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         tr.setNodeMarkup(change.from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
     }
     else if (change.type === 'node-change' || change.type === 'node-attr-change') {
-        const newDataTracked = (getBlockInlineTrackedData(node) || []).map((oldTrack) => {
+        const trackedDataSource = getBlockInlineTrackedData(node) || [];
+        const targetDataTracked = trackedDataSource.find((t) => change.id === t.id);
+        const newDataTracked = trackedDataSource.map((oldTrack) => {
+            if (targetDataTracked) {
+                if (oldTrack.id === targetDataTracked.id) {
+                    return { ...oldTrack, ...trackedAttrs };
+                }
+                return oldTrack;
+            }
             if (oldTrack.operation === operation) {
                 return { ...oldTrack, ...trackedAttrs };
             }
@@ -622,7 +628,7 @@ function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new prose
         }
         else if (ChangeSet.isNodeAttrChange(change) &&
             change.dataTracked.status === exports.CHANGE_STATUS.accepted) {
-            tr.setNodeMarkup(from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
+            tr.setNodeMarkup(from, undefined, { ...change.newAttrs, dataTracked: null }, node.marks);
         }
         else if (ChangeSet.isNodeAttrChange(change) &&
             change.dataTracked.status === exports.CHANGE_STATUS.rejected) {
@@ -951,7 +957,7 @@ function createNewUpdateAttrs(attrs, oldAttrs) {
     return {
         ...attrs,
         operation: exports.CHANGE_OPERATION.set_node_attributes,
-        oldAttrs: restAttrs,
+        oldAttrs: JSON.parse(JSON.stringify(restAttrs)),
     };
 }
@@ -1198,7 +1204,8 @@ function trackReplaceAroundStep(step, oldState, newTr, attrs) {
  */
 function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
     log.info('###### ReplaceStep ######');
-    let selectionPos = 0, changeSteps = [];
+    let selectionPos = 0;
+    const changeSteps = [];
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
         var _a, _b;
@@ -1422,18 +1429,32 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
         }
         else if (c.type === 'update-node-attrs') {
             const oldDataTracked = getBlockInlineTrackedData(c.node) || [];
-            const oldUpdate = oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.set_node_attributes && d.status === exports.CHANGE_STATUS.pending);
-            const { dataTracked, ...oldAttrs } = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
-            const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
-            const newUpdate = oldUpdate
+            const oldUpdate = oldDataTracked.reverse().find((d) => {
+                // reversing to start from the most recent change
+                if (d.operation === exports.CHANGE_OPERATION.set_node_attributes &&
+                    (d.status === exports.CHANGE_STATUS.pending || d.status === exports.CHANGE_STATUS.rejected)) {
+                    return true;
+                }
+                return false;
+            });
+            // if the selected last change is with status "rejected" we need to use oldAttrs from it because
+            // node's actual attributes represent the "rejected" values
+            const lastChangeRejected = oldUpdate && oldUpdate.status === exports.CHANGE_STATUS.rejected;
+            const sourceAttrs = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
+            const { dataTracked, ...restAttrs } = sourceAttrs;
+            const oldAttrs = lastChangeRejected ? oldUpdate.oldAttrs : restAttrs;
+            const newDataTracked = [
+                ...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id || lastChangeRejected),
+            ];
+            const newUpdate = oldUpdate && oldUpdate.status !== exports.CHANGE_STATUS.rejected
                 ? {
                     ...oldUpdate,
                     updatedAt: emptyAttrs.updatedAt,
                 }
-                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, c.node.attrs));
+                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, lastChangeRejected ? oldAttrs : c.node.attrs));
             // Dont add update changes if there exists already an insert change for this node
             if (JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) &&
-                !oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.insert && d.status === exports.CHANGE_STATUS.pending)) {
+                !oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.insert)) {
                 newDataTracked.push(newUpdate);
             }
             newTr.setNodeMarkup(mapping.map(c.pos), undefined, {

package/dist/index.js CHANGED Viewed

@@ -522,9 +522,7 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         return tr;
     }
     const { operation } = trackedAttrs;
-    const oldTrackData = change.type === 'text-change'
-        ? getTextNodeTrackedMarkData(node, schema)
-        : getBlockInlineTrackedData(node);
+    const oldTrackData = change.type === 'text-change' ? getTextNodeTrackedMarkData(node, schema) : getBlockInlineTrackedData(node);
     if (!operation) {
         log.warn('updateChangeAttrs: unable to determine operation of change ', change);
     }
@@ -545,7 +543,15 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         tr.setNodeMarkup(change.from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
     }
     else if (change.type === 'node-change' || change.type === 'node-attr-change') {
-        const newDataTracked = (getBlockInlineTrackedData(node) || []).map((oldTrack) => {
+        const trackedDataSource = getBlockInlineTrackedData(node) || [];
+        const targetDataTracked = trackedDataSource.find((t) => change.id === t.id);
+        const newDataTracked = trackedDataSource.map((oldTrack) => {
+            if (targetDataTracked) {
+                if (oldTrack.id === targetDataTracked.id) {
+                    return { ...oldTrack, ...trackedAttrs };
+                }
+                return oldTrack;
+            }
             if (oldTrack.operation === operation) {
                 return { ...oldTrack, ...trackedAttrs };
             }
@@ -614,7 +620,7 @@ function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new Mappi
         }
         else if (ChangeSet.isNodeAttrChange(change) &&
             change.dataTracked.status === CHANGE_STATUS.accepted) {
-            tr.setNodeMarkup(from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
+            tr.setNodeMarkup(from, undefined, { ...change.newAttrs, dataTracked: null }, node.marks);
         }
         else if (ChangeSet.isNodeAttrChange(change) &&
             change.dataTracked.status === CHANGE_STATUS.rejected) {
@@ -943,7 +949,7 @@ function createNewUpdateAttrs(attrs, oldAttrs) {
     return {
         ...attrs,
         operation: CHANGE_OPERATION.set_node_attributes,
-        oldAttrs: restAttrs,
+        oldAttrs: JSON.parse(JSON.stringify(restAttrs)),
     };
 }
@@ -1190,7 +1196,8 @@ function trackReplaceAroundStep(step, oldState, newTr, attrs) {
  */
 function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
     log.info('###### ReplaceStep ######');
-    let selectionPos = 0, changeSteps = [];
+    let selectionPos = 0;
+    const changeSteps = [];
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
         var _a, _b;
@@ -1414,18 +1421,32 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
         }
         else if (c.type === 'update-node-attrs') {
             const oldDataTracked = getBlockInlineTrackedData(c.node) || [];
-            const oldUpdate = oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.set_node_attributes && d.status === CHANGE_STATUS.pending);
-            const { dataTracked, ...oldAttrs } = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
-            const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
-            const newUpdate = oldUpdate
+            const oldUpdate = oldDataTracked.reverse().find((d) => {
+                // reversing to start from the most recent change
+                if (d.operation === CHANGE_OPERATION.set_node_attributes &&
+                    (d.status === CHANGE_STATUS.pending || d.status === CHANGE_STATUS.rejected)) {
+                    return true;
+                }
+                return false;
+            });
+            // if the selected last change is with status "rejected" we need to use oldAttrs from it because
+            // node's actual attributes represent the "rejected" values
+            const lastChangeRejected = oldUpdate && oldUpdate.status === CHANGE_STATUS.rejected;
+            const sourceAttrs = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
+            const { dataTracked, ...restAttrs } = sourceAttrs;
+            const oldAttrs = lastChangeRejected ? oldUpdate.oldAttrs : restAttrs;
+            const newDataTracked = [
+                ...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id || lastChangeRejected),
+            ];
+            const newUpdate = oldUpdate && oldUpdate.status !== CHANGE_STATUS.rejected
                 ? {
                     ...oldUpdate,
                     updatedAt: emptyAttrs.updatedAt,
                 }
-                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, c.node.attrs));
+                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, lastChangeRejected ? oldAttrs : c.node.attrs));
             // Dont add update changes if there exists already an insert change for this node
             if (JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) &&
-                !oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.insert && d.status === CHANGE_STATUS.pending)) {
+                !oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.insert)) {
                 newDataTracked.push(newUpdate);
             }
             newTr.setNodeMarkup(mapping.map(c.pos), undefined, {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.6.1-LEAN-2850",
+  "version": "1.6.1-LEAN-2752-2",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-quarterback/tree/main/quarterback-packages/track-changes-plugin",