@manuscripts/track-changes-plugin 1.7.1-LEAN-2832 → 1.7.2-LEAN-2832

package/dist/index.cjs

@@ -162,13 +162,14 @@ const enableDebug = (enabled) => {
     }
 };
 
-var _ChangeSet_changes;
+var _ChangeSet_instances, _ChangeSet_changes, _ChangeSet_isSameNodeChange, _ChangeSet_isNotPendingOrDeleted;
 /**
  * ChangeSet is a data structure to contain the tracked changes with some utility methods and computed
  * values to allow easier operability.
  */
 class ChangeSet {
     constructor(changes = []) {
+        _ChangeSet_instances.add(this);
         _ChangeSet_changes.set(this, void 0);
         __classPrivateFieldSet(this, _ChangeSet_changes, changes, "f");
     }
@@ -199,7 +200,10 @@ class ChangeSet {
                 rootNodes.push(currentNodeChange);
                 currentNodeChange = undefined;
             }
-            if (currentNodeChange && c.from < currentNodeChange.to) {
+            if (currentNodeChange &&
+                c.from < currentNodeChange.to &&
+                !(__classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isSameNodeChange).call(this, currentNodeChange, c) &&
+                    __classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isNotPendingOrDeleted).call(this, currentNodeChange))) {
                 currentNodeChange.children.push(c);
             }
             else if (c.type === 'node-change') {
@@ -321,7 +325,12 @@ class ChangeSet {
         return change.type === 'node-attr-change';
     }
 }
-_ChangeSet_changes = new WeakMap();
+_ChangeSet_changes = new WeakMap(), _ChangeSet_instances = new WeakSet(), _ChangeSet_isSameNodeChange = function _ChangeSet_isSameNodeChange(currentChange, nextChange) {
+    return currentChange.from === nextChange.from && currentChange.to === nextChange.to;
+}, _ChangeSet_isNotPendingOrDeleted = function _ChangeSet_isNotPendingOrDeleted(change) {
+    return (change.dataTracked.operation !== exports.CHANGE_OPERATION.delete &&
+        change.dataTracked.status !== exports.CHANGE_STATUS.pending);
+};
 
 /*!
  * © 2021 Atypon Systems LLC
@@ -1483,8 +1492,9 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
                 }
                 : 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)) {
+            if ((JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) ||
+                c.node.type === c.node.type.schema.nodes.citation) &&
+                !oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.insert && d.status === exports.CHANGE_STATUS.pending)) {
                 newDataTracked.push(newUpdate);
             }
             newTr.setNodeMarkup(mapping.map(c.pos), undefined, {

package/dist/index.js

@@ -154,13 +154,14 @@ const enableDebug = (enabled) => {
     }
 };
 
-var _ChangeSet_changes;
+var _ChangeSet_instances, _ChangeSet_changes, _ChangeSet_isSameNodeChange, _ChangeSet_isNotPendingOrDeleted;
 /**
  * ChangeSet is a data structure to contain the tracked changes with some utility methods and computed
  * values to allow easier operability.
  */
 class ChangeSet {
     constructor(changes = []) {
+        _ChangeSet_instances.add(this);
         _ChangeSet_changes.set(this, void 0);
         __classPrivateFieldSet(this, _ChangeSet_changes, changes, "f");
     }
@@ -191,7 +192,10 @@ class ChangeSet {
                 rootNodes.push(currentNodeChange);
                 currentNodeChange = undefined;
             }
-            if (currentNodeChange && c.from < currentNodeChange.to) {
+            if (currentNodeChange &&
+                c.from < currentNodeChange.to &&
+                !(__classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isSameNodeChange).call(this, currentNodeChange, c) &&
+                    __classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isNotPendingOrDeleted).call(this, currentNodeChange))) {
                 currentNodeChange.children.push(c);
             }
             else if (c.type === 'node-change') {
@@ -313,7 +317,12 @@ class ChangeSet {
         return change.type === 'node-attr-change';
     }
 }
-_ChangeSet_changes = new WeakMap();
+_ChangeSet_changes = new WeakMap(), _ChangeSet_instances = new WeakSet(), _ChangeSet_isSameNodeChange = function _ChangeSet_isSameNodeChange(currentChange, nextChange) {
+    return currentChange.from === nextChange.from && currentChange.to === nextChange.to;
+}, _ChangeSet_isNotPendingOrDeleted = function _ChangeSet_isNotPendingOrDeleted(change) {
+    return (change.dataTracked.operation !== CHANGE_OPERATION.delete &&
+        change.dataTracked.status !== CHANGE_STATUS.pending);
+};
 
 /*!
  * © 2021 Atypon Systems LLC
@@ -1475,8 +1484,9 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
                 }
                 : 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)) {
+            if ((JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) ||
+                c.node.type === c.node.type.schema.nodes.citation) &&
+                !oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.insert && d.status === CHANGE_STATUS.pending)) {
                 newDataTracked.push(newUpdate);
             }
             newTr.setNodeMarkup(mapping.map(c.pos), undefined, {

package/package.json

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