@manuscripts/track-changes-plugin 2.1.1 → 2.2.1

package/dist/cjs/ChangeSet.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangeSet = void 0;
 const change_1 = require("./types/change");
 const logger_1 = require("./utils/logger");
-const track_utils_1 = require("./utils/track-utils");
 class ChangeSet {
     constructor(changes = []) {
         _ChangeSet_instances.add(this);
@@ -172,9 +171,8 @@ class ChangeSet {
         if (!nextChange) {
             return false;
         }
-        const isInline = (c) => c.type === 'text-change' || (c.type === 'node-change' && c.node.isInline) || (0, track_utils_1.isInlineMarkChange)(c);
-        return (isInline(change) &&
-            isInline(nextChange) &&
+        return (ChangeSet.isInline(change) &&
+            ChangeSet.isInline(nextChange) &&
             change.to === nextChange.from &&
             (change.dataTracked.operation === nextChange.dataTracked.operation ||
                 this.areMatchingWrapOperations(change, nextChange) ||
@@ -199,11 +197,13 @@ class ChangeSet {
     }
     static shouldDeleteChange(change) {
         const { status, operation } = change.dataTracked;
-        return (((operation === change_1.CHANGE_OPERATION.insert ||
-            operation === change_1.CHANGE_OPERATION.node_split ||
-            operation === change_1.CHANGE_OPERATION.wrap_with_node ||
-            operation === change_1.CHANGE_OPERATION.move) &&
-            status === change_1.CHANGE_STATUS.rejected) ||
+        const allowedRejectedForDeletion = [
+            change_1.CHANGE_OPERATION.insert,
+            change_1.CHANGE_OPERATION.node_split,
+            change_1.CHANGE_OPERATION.wrap_with_node,
+            change_1.CHANGE_OPERATION.move,
+        ];
+        return ((allowedRejectedForDeletion.includes(operation) && status === change_1.CHANGE_STATUS.rejected) ||
             (operation === change_1.CHANGE_OPERATION.delete && status === change_1.CHANGE_STATUS.accepted));
     }
     static isValidDataTracked(dataTracked = {}) {
@@ -226,6 +226,17 @@ class ChangeSet {
             optionalEntries.every(([key, val]) => optionalKeys.includes(key) && val !== undefined) &&
             (dataTracked.id || '').length > 0);
     }
+    static isInlineMarkChange(change) {
+        if (ChangeSet.isMarkChange(change)) {
+            return change.nodeType.isInline || change.nodeType.isText;
+        }
+        return false;
+    }
+    static isInline(c) {
+        return (c.type === 'text-change' ||
+            (c.type === 'node-change' && c.node.isInline) ||
+            ChangeSet.isInlineMarkChange(c));
+    }
     static isTextChange(change) {
         return change.type === 'text-change';
     }
@@ -241,6 +252,9 @@ class ChangeSet {
     static isReferenceChange(change) {
         return change.type === 'reference-change';
     }
+    static isPendingChange(trackedAttrs, operation) {
+        return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === operation));
+    }
 }
 exports.ChangeSet = ChangeSet;
 _ChangeSet_changes = new WeakMap(), _ChangeSet_instances = new WeakSet(), _ChangeSet_isSameNodeChange = function _ChangeSet_isSameNodeChange(currentChange, nextChange) {

package/dist/cjs/actions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.skipTracking = exports.TrackChangesAction = void 0;
+exports.isIndentationAction = exports.skipTracking = exports.TrackChangesAction = void 0;
 exports.hasAction = hasAction;
 exports.getAction = getAction;
 exports.setAction = setAction;
@@ -26,3 +26,5 @@ function setAction(tr, action, payload) {
 }
 const skipTracking = (tr) => setAction(tr, TrackChangesAction.skipTrack, true);
 exports.skipTracking = skipTracking;
+const isIndentationAction = (action) => action === 'indent' || action === 'unindent';
+exports.isIndentationAction = isIndentationAction;

package/dist/cjs/{changes/applyChanges.js → applyChanges.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyAcceptedRejectedChanges = applyAcceptedRejectedChanges;
+exports.applyChanges = applyChanges;
 const prosemirror_transform_1 = require("prosemirror-transform");
-const ChangeSet_1 = require("../ChangeSet");
-const deleteNode_1 = require("../mutate/deleteNode");
-const mergeNode_1 = require("../mutate/mergeNode");
-const change_1 = require("../types/change");
-const logger_1 = require("../utils/logger");
-const track_utils_1 = require("../utils/track-utils");
-const revertChange_1 = require("./revertChange");
-const updateChangeAttrs_1 = require("./updateChangeAttrs");
+const revertChange_1 = require("./changeHelpers/revertChange");
+const updateChangeAttrs_1 = require("./changeHelpers/updateChangeAttrs");
+const ChangeSet_1 = require("./ChangeSet");
+const attributes_1 = require("./helpers/attributes");
+const deleteNode_1 = require("./tracking/lib/deleteNode");
+const mergeNode_1 = require("./tracking/lib/mergeNode");
+const change_1 = require("./types/change");
+const logger_1 = require("./utils/logger");
 function collectMoveNodeIds(containerNode, primaryMoveNodeId) {
     const moveNodeIds = new Set();
     moveNodeIds.add(primaryMoveNodeId);
@@ -25,7 +25,7 @@ function collectMoveNodeIds(containerNode, primaryMoveNodeId) {
     });
     return moveNodeIds;
 }
-function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap = new prosemirror_transform_1.Mapping()) {
+function applyChanges(tr, schema, changes, changeSet, deleteMap = new prosemirror_transform_1.Mapping()) {
     changes.sort((c1, c2) => {
         if ((c1.type === 'node-change' && c1.node.type === schema.nodes.list) ||
             (c2.type === 'node-change' && c2.node.type === schema.nodes.list)) {
@@ -84,23 +84,23 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
             deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
         }
         else if (ChangeSet_1.ChangeSet.isNodeAttrChange(change) && change.dataTracked.status === change_1.CHANGE_STATUS.accepted) {
-            tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, change.newAttrs), { dataTracked: (0, track_utils_1.excludeFromTracked)(node.attrs.dataTracked, change.id) }), node.marks);
+            tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, change.newAttrs), { dataTracked: (0, attributes_1.excludeFromTracked)(node.attrs.dataTracked, change.id) }), node.marks);
         }
         else if (ChangeSet_1.ChangeSet.isNodeAttrChange(change) && change.dataTracked.status === change_1.CHANGE_STATUS.rejected) {
-            tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, change.oldAttrs), { dataTracked: (0, track_utils_1.excludeFromTracked)(node.attrs.dataTracked, change.id) }), node.marks);
+            tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, change.oldAttrs), { dataTracked: (0, attributes_1.excludeFromTracked)(node.attrs.dataTracked, change.id) }), node.marks);
         }
         else if (ChangeSet_1.ChangeSet.isReferenceChange(change)) {
-            tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: (0, track_utils_1.excludeFromTracked)(node.attrs.dataTracked, change.id) }), node.marks);
+            tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: (0, attributes_1.excludeFromTracked)(node.attrs.dataTracked, change.id) }), node.marks);
         }
         else if (ChangeSet_1.ChangeSet.isMarkChange(change)) {
             const newMark = change.mark.type.create({
-                dataTracked: (0, track_utils_1.excludeFromTracked)(change.mark.attrs.dataTracked, change.id),
+                dataTracked: (0, attributes_1.excludeFromTracked)(change.mark.attrs.dataTracked, change.id),
             });
             const isInsert = change.dataTracked.operation === change_1.CHANGE_OPERATION.insert;
             const isDelete = change.dataTracked.operation === change_1.CHANGE_OPERATION.delete;
             const toBeRestored = (change.dataTracked.status === change_1.CHANGE_STATUS.accepted && isInsert) ||
                 (change.dataTracked.status === change_1.CHANGE_STATUS.rejected && isDelete);
-            if ((0, track_utils_1.isInlineMarkChange)(change)) {
+            if (ChangeSet_1.ChangeSet.isInlineMarkChange(change)) {
                 tr.removeMark(change.from, change.to, change.mark);
                 if (toBeRestored) {
                     tr.addMark(change.from, change.to, newMark);
@@ -128,7 +128,7 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
             return;
         }
         if (change.dataTracked.status === change_1.CHANGE_STATUS.accepted) {
-            const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: (0, track_utils_1.excludeFromTracked)(node.attrs.dataTracked, change.id) });
+            const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: (0, attributes_1.excludeFromTracked)(node.attrs.dataTracked, change.id) });
             tr.setNodeMarkup(from, undefined, attrs, node.marks);
             const originalChanges = changeSet.changes.filter((c) => c.dataTracked.moveNodeId === change.dataTracked.moveNodeId &&
                 c.dataTracked.operation === change_1.CHANGE_OPERATION.delete);

package/dist/cjs/{changes → changeHelpers}/revertChange.js

@@ -4,8 +4,7 @@ exports.revertSplitNodeChange = revertSplitNodeChange;
 exports.revertWrapNodeChange = revertWrapNodeChange;
 const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_transform_1 = require("prosemirror-transform");
-const nodeHelpers_1 = require("../compute/nodeHelpers");
-const track_utils_1 = require("../utils/track-utils");
+const attributes_1 = require("../helpers/attributes");
 function revertSplitNodeChange(tr, change, changeSet) {
     const sourceChange = changeSet.changes.find((c) => c.dataTracked.operation === 'reference' && c.dataTracked.referenceId === change.id);
     const node = tr.doc.nodeAt(tr.mapping.map(change.from));
@@ -17,14 +16,14 @@ function revertSplitNodeChange(tr, change, changeSet) {
     const childSource = changeSet.changes.find((c) => c.from === change.from && c.dataTracked.operation === 'reference');
     if (childSource) {
         const node = tr.doc.nodeAt(tr.mapping.map(sourceChange.from));
-        const data = (0, nodeHelpers_1.getBlockInlineTrackedData)(node) || [];
+        const data = (0, attributes_1.getBlockInlineTrackedData)(node) || [];
         const dataTracked = data.map((c) => (c.operation === 'reference' ? childSource.dataTracked : c));
         tr.setNodeMarkup(tr.mapping.map(sourceChange.from), undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked }), node.marks);
     }
     const deleteChange = changeSet.changes.find((c) => c.dataTracked.operation == 'delete' && c.from === sourceChange.from);
     if (deleteChange) {
         const node = tr.doc.nodeAt(tr.mapping.map(deleteChange.from));
-        tr.setNodeMarkup(tr.mapping.map(deleteChange.from), undefined, (0, track_utils_1.excludeFromTracked)(node.attrs.dataTracked, deleteChange.id));
+        tr.setNodeMarkup(tr.mapping.map(deleteChange.from), undefined, (0, attributes_1.excludeFromTracked)(node.attrs.dataTracked, deleteChange.id));
     }
 }
 function revertWrapNodeChange(tr, change, deleteMap) {

package/dist/cjs/{mutate/dropStructureChange.js → changeHelpers/structureChange.js}

@@ -11,15 +11,16 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinStructureChanges = exports.dropOrphanChanges = exports.dropStructuralChangeShadow = void 0;
+exports.isStructuralChange = exports.joinStructureChanges = exports.dropOrphanChanges = exports.dropStructuralChangeShadow = void 0;
 const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_state_1 = require("prosemirror-state");
-const findChanges_1 = require("../changes/findChanges");
-const updateChangeAttrs_1 = require("../changes/updateChangeAttrs");
-const nodeHelpers_1 = require("../compute/nodeHelpers");
-const setFragmentAsInserted_1 = require("../compute/setFragmentAsInserted");
+const prosemirror_transform_1 = require("prosemirror-transform");
+const actions_1 = require("../actions");
+const findChanges_1 = require("../findChanges");
+const attributes_1 = require("../helpers/attributes");
+const fragment_1 = require("../helpers/fragment");
 const change_1 = require("../types/change");
-const track_utils_1 = require("../utils/track-utils");
+const updateChangeAttrs_1 = require("./updateChangeAttrs");
 const dropStructuralChangeShadow = (moveNodeId, tr) => {
     const changeSet = (0, findChanges_1.findChanges)(prosemirror_state_1.EditorState.create({ doc: tr.doc }));
     const changes = changeSet.changes.filter((c) => c.type === 'node-change' && c.dataTracked.moveNodeId === moveNodeId);
@@ -61,18 +62,18 @@ const dropOrphanChanges = (newTr) => {
         if (c.dataTracked.operation === change_1.CHANGE_OPERATION.reference &&
             !changesIds.has(c.dataTracked.referenceId)) {
             const node = newTr.doc.nodeAt(c.from);
-            const dataTracked = node && ((0, nodeHelpers_1.getBlockInlineTrackedData)(node) || []).filter((d) => d.id !== c.id);
+            const dataTracked = node && ((0, attributes_1.getBlockInlineTrackedData)(node) || []).filter((d) => d.id !== c.id);
             newTr.setNodeMarkup(c.from, undefined, Object.assign(Object.assign({}, node === null || node === void 0 ? void 0 : node.attrs), { dataTracked }));
         }
         if (c.type === 'node-change' &&
             c.dataTracked.operation === change_1.CHANGE_OPERATION.node_split &&
             !referenceIds.has(c.id)) {
             const _a = c.dataTracked, { id } = _a, attrs = __rest(_a, ["id"]);
-            newTr.replaceWith(c.from, c.to, (0, setFragmentAsInserted_1.setFragmentAsInserted)(prosemirror_model_1.Fragment.from(c.node), (0, track_utils_1.createNewInsertAttrs)(attrs), newTr.doc.type.schema));
-            const referenceChanges = ((0, nodeHelpers_1.getBlockInlineTrackedData)(c.node) || []).filter((d) => d.operation === change_1.CHANGE_OPERATION.reference);
+            newTr.replaceWith(c.from, c.to, (0, fragment_1.setFragmentAsInserted)(prosemirror_model_1.Fragment.from(c.node), (0, attributes_1.createNewInsertAttrs)(attrs), newTr.doc.type.schema));
+            const referenceChanges = ((0, attributes_1.getBlockInlineTrackedData)(c.node) || []).filter((d) => d.operation === change_1.CHANGE_OPERATION.reference);
             if (referenceChanges.length) {
                 const node = newTr.doc.nodeAt(c.from);
-                const dataTracked = (node && (0, nodeHelpers_1.getBlockInlineTrackedData)(node)) || [];
+                const dataTracked = (node && (0, attributes_1.getBlockInlineTrackedData)(node)) || [];
                 newTr.setNodeMarkup(c.from, undefined, Object.assign(Object.assign({}, node === null || node === void 0 ? void 0 : node.attrs), { dataTracked: [...dataTracked, ...referenceChanges] }));
             }
         }
@@ -88,7 +89,7 @@ const dropOrphanChanges = (newTr) => {
             }
             else if (c.type === 'node-change') {
                 const _b = c.dataTracked, { id, moveNodeId } = _b, attrs = __rest(_b, ["id", "moveNodeId"]);
-                newTr.replaceWith(c.from, c.to, (0, setFragmentAsInserted_1.setFragmentAsInserted)(prosemirror_model_1.Fragment.from(c.node), (0, track_utils_1.createNewInsertAttrs)(attrs), newTr.doc.type.schema));
+                newTr.replaceWith(c.from, c.to, (0, fragment_1.setFragmentAsInserted)(prosemirror_model_1.Fragment.from(c.node), (0, attributes_1.createNewInsertAttrs)(attrs), newTr.doc.type.schema));
             }
         }
     });
@@ -104,7 +105,7 @@ const groupStructureChanges = (tr, toNode) => {
         .append(fromNodes)
         .descendants((node) => {
         var _a;
-        const moveNodeId = (_a = ((0, nodeHelpers_1.getBlockInlineTrackedData)(node) || []).find((c) => c.operation === change_1.CHANGE_OPERATION.structure)) === null || _a === void 0 ? void 0 : _a.moveNodeId;
+        const moveNodeId = (_a = ((0, attributes_1.getBlockInlineTrackedData)(node) || []).find((c) => c.operation === change_1.CHANGE_OPERATION.structure)) === null || _a === void 0 ? void 0 : _a.moveNodeId;
         moveNodeId && moveNodeIds.add(moveNodeId);
     });
     return moveNodeIds;
@@ -118,14 +119,19 @@ const joinStructureChanges = (attrs, sliceContent, content, tr, newTr) => {
     const changeSet = (0, findChanges_1.findChanges)(prosemirror_state_1.EditorState.create({ doc: newTr.doc }));
     const relatedChanges = changeSet.changes.filter((c) => c.dataTracked.moveNodeId && idsSet.has(c.dataTracked.moveNodeId));
     relatedChanges.map((c) => (0, updateChangeAttrs_1.updateChangeAttrs)(newTr, c, Object.assign(Object.assign({}, c.dataTracked), { moveNodeId }), newTr.doc.type.schema));
-    const toInsertChange = toNode && ((_b = (0, nodeHelpers_1.getBlockInlineTrackedData)(toNode)) === null || _b === void 0 ? void 0 : _b.find((c) => c.operation === change_1.CHANGE_OPERATION.insert));
+    const toInsertChange = toNode && ((_b = (0, attributes_1.getBlockInlineTrackedData)(toNode)) === null || _b === void 0 ? void 0 : _b.find((c) => c.operation === change_1.CHANGE_OPERATION.insert));
     const fromInsertChange = sliceContent.firstChild &&
-        ((_c = (0, nodeHelpers_1.getBlockInlineTrackedData)(sliceContent.firstChild)) === null || _c === void 0 ? void 0 : _c.find((c) => c.operation === change_1.CHANGE_OPERATION.insert));
+        ((_c = (0, attributes_1.getBlockInlineTrackedData)(sliceContent.firstChild)) === null || _c === void 0 ? void 0 : _c.find((c) => c.operation === change_1.CHANGE_OPERATION.insert));
     if (toInsertChange || fromInsertChange) {
-        return (0, setFragmentAsInserted_1.setFragmentAsInserted)(content, (0, track_utils_1.createNewInsertAttrs)(attrs), newTr.doc.type.schema);
+        return (0, fragment_1.setFragmentAsInserted)(content, (0, attributes_1.createNewInsertAttrs)(attrs), newTr.doc.type.schema);
     }
-    return (0, track_utils_1.updateBlockNodesAttrs)(sliceContent, (_, node) => {
-        return Object.assign(Object.assign({}, _), { dataTracked: [(0, nodeHelpers_1.addTrackIdIfDoesntExist)((0, track_utils_1.createNewStructureAttrs)(Object.assign(Object.assign({}, attrs), { moveNodeId })))] });
+    return (0, attributes_1.updateBlockNodesAttrs)(sliceContent, (_, node) => {
+        return Object.assign(Object.assign({}, _), { dataTracked: [(0, attributes_1.addTrackIdIfDoesntExist)((0, attributes_1.createNewStructureAttrs)(Object.assign(Object.assign({}, attrs), { moveNodeId })))] });
     });
 };
 exports.joinStructureChanges = joinStructureChanges;
+const isStructuralChange = (tr) => tr.getMeta(actions_1.TrackChangesAction.structuralChangeAction) &&
+    tr.steps.length === 2 &&
+    tr.steps[0] instanceof prosemirror_transform_1.ReplaceStep &&
+    tr.steps[1] instanceof prosemirror_transform_1.ReplaceStep;
+exports.isStructuralChange = isStructuralChange;

package/dist/cjs/{changes → changeHelpers}/updateChangeAttrs.js

@@ -4,10 +4,9 @@ exports.updateChangeAttrs = updateChangeAttrs;
 exports.updateChangeChildrenAttributes = updateChangeChildrenAttributes;
 exports.restoreNode = restoreNode;
 const ChangeSet_1 = require("../ChangeSet");
-const nodeHelpers_1 = require("../compute/nodeHelpers");
+const attributes_1 = require("../helpers/attributes");
 const change_1 = require("../types/change");
 const logger_1 = require("../utils/logger");
-const track_utils_1 = require("../utils/track-utils");
 function updateChangeAttrs(tr, change, trackedAttrs, schema) {
     const node = tr.doc.nodeAt(change.from);
     if (!node) {
@@ -15,7 +14,7 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         return tr;
     }
     const { operation } = trackedAttrs;
-    const oldTrackData = change.type === 'text-change' ? (0, nodeHelpers_1.getTextNodeTrackedMarkData)(node, schema) : (0, nodeHelpers_1.getBlockInlineTrackedData)(node);
+    const oldTrackData = change.type === 'text-change' ? (0, attributes_1.getTextNodeTrackedMarkData)(node, schema) : (0, attributes_1.getBlockInlineTrackedData)(node);
     if (!operation) {
         logger_1.log.warn('updateChangeAttrs: unable to determine operation of change ', change);
     }
@@ -44,7 +43,7 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
             trackedAttrs.status === change_1.CHANGE_STATUS.rejected) {
             restoredAttrs = trackedAttrs.oldAttrs;
         }
-        const trackedDataSource = (0, nodeHelpers_1.getBlockInlineTrackedData)(node) || [];
+        const trackedDataSource = (0, attributes_1.getBlockInlineTrackedData)(node) || [];
         const targetDataTracked = trackedDataSource.find((t) => change.id === t.id);
         const newDataTracked = trackedDataSource
             .map((oldTrack) => {
@@ -83,7 +82,7 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
                 return dt;
             });
             const newMark = markChange.mark.type.create(Object.assign(Object.assign({}, markChange.mark.attrs), { dataTracked: newDT }));
-            if ((0, track_utils_1.isInlineMarkChange)(markChange)) {
+            if (ChangeSet_1.ChangeSet.isInlineMarkChange(markChange)) {
                 tr.removeMark(markChange.from, markChange.to, markChange.mark);
                 tr.addMark(markChange.from, markChange.to, newMark);
             }

package/dist/cjs/{changes → changeHelpers}/updateChangesStatus.js

@@ -17,10 +17,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateChangesStatus = updateChangesStatus;
 const prosemirror_history_1 = require("prosemirror-history");
+const applyChanges_1 = require("../applyChanges");
 const ChangeSet_1 = require("../ChangeSet");
-const dropStructureChange_1 = require("../mutate/dropStructureChange");
 const change_1 = require("../types/change");
-const applyChanges_1 = require("./applyChanges");
+const structureChange_1 = require("./structureChange");
 const updateChangeAttrs_1 = require("./updateChangeAttrs");
 function updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState) {
     const change = changeSet.get(ids[0]);
@@ -61,9 +61,9 @@ function updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState
                 }
             }
         });
-        const mapping = (0, applyChanges_1.applyAcceptedRejectedChanges)(createdTr, oldState.schema, nonTextChanges, changeSet);
-        (0, applyChanges_1.applyAcceptedRejectedChanges)(createdTr, oldState.schema, textChanges, changeSet, mapping);
-        (0, dropStructureChange_1.dropOrphanChanges)(createdTr);
+        const mapping = (0, applyChanges_1.applyChanges)(createdTr, oldState.schema, nonTextChanges, changeSet);
+        (0, applyChanges_1.applyChanges)(createdTr, oldState.schema, textChanges, changeSet, mapping);
+        (0, structureChange_1.dropOrphanChanges)(createdTr);
     }
     else {
         ids.forEach((changeId) => {

package/dist/cjs/{changes/findChanges.js → findChanges.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findChanges = findChanges;
-const ChangeSet_1 = require("../ChangeSet");
-const nodeHelpers_1 = require("../compute/nodeHelpers");
-const change_1 = require("../types/change");
+const ChangeSet_1 = require("./ChangeSet");
+const attributes_1 = require("./helpers/attributes");
+const change_1 = require("./types/change");
 function findChanges(state) {
     const changes = [];
     let current;
     state.doc.descendants((node, pos) => {
-        const tracked = (0, nodeHelpers_1.getNodeTrackedData)(node, state.schema) || [];
-        const marksWithTrackChanges = (0, nodeHelpers_1.getMarkTrackedData)(node);
+        const tracked = (0, attributes_1.getNodeTrackedData)(node, state.schema) || [];
+        const marksWithTrackChanges = (0, attributes_1.getMarkTrackedData)(node);
         marksWithTrackChanges === null || marksWithTrackChanges === void 0 ? void 0 : marksWithTrackChanges.forEach((trackAttrs, mark) => {
             trackAttrs.forEach((c) => {
                 const ch = {

package/dist/cjs/helpers/attributes.js

@@ -0,0 +1,157 @@
+"use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateBlockNodesAttrs = void 0;
+exports.createNewInsertAttrs = createNewInsertAttrs;
+exports.createNewWrapAttrs = createNewWrapAttrs;
+exports.createNewSplitAttrs = createNewSplitAttrs;
+exports.createNewReferenceAttrs = createNewReferenceAttrs;
+exports.createNewDeleteAttrs = createNewDeleteAttrs;
+exports.createNewMoveAttrs = createNewMoveAttrs;
+exports.createNewUpdateAttrs = createNewUpdateAttrs;
+exports.createNewStructureAttrs = createNewStructureAttrs;
+exports.createNewPendingAttrs = createNewPendingAttrs;
+exports.addTrackIdIfDoesntExist = addTrackIdIfDoesntExist;
+exports.getTextNodeTrackedMarkData = getTextNodeTrackedMarkData;
+exports.getBlockInlineTrackedData = getBlockInlineTrackedData;
+exports.getMarkTrackedData = getMarkTrackedData;
+exports.getNodeTrackedData = getNodeTrackedData;
+exports.shouldMergeTrackedAttributes = shouldMergeTrackedAttributes;
+exports.getMergeableMarkTrackedAttrs = getMergeableMarkTrackedAttrs;
+exports.excludeFromTracked = excludeFromTracked;
+const prosemirror_model_1 = require("prosemirror-model");
+const change_1 = require("../types/change");
+const logger_1 = require("../utils/logger");
+const uuidv4_1 = require("../utils/uuidv4");
+const mark_1 = require("./mark");
+function createNewInsertAttrs(attrs) {
+    return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.insert });
+}
+function createNewWrapAttrs(attrs) {
+    return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.wrap_with_node });
+}
+function createNewSplitAttrs(attrs) {
+    return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.node_split });
+}
+function createNewReferenceAttrs(attrs, id) {
+    return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.reference, referenceId: id });
+}
+function createNewDeleteAttrs(attrs) {
+    return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.delete });
+}
+function createNewMoveAttrs(attrs, indentationType) {
+    return Object.assign(Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.move }), (indentationType && { indentationType }));
+}
+function createNewUpdateAttrs(attrs, oldAttrs) {
+    const { dataTracked } = oldAttrs, restAttrs = __rest(oldAttrs, ["dataTracked"]);
+    return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.set_node_attributes, oldAttrs: JSON.parse(JSON.stringify(restAttrs)) });
+}
+function createNewStructureAttrs(attrs) {
+    return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.structure });
+}
+function createNewPendingAttrs(time, authorID) {
+    return {
+        authorID,
+        reviewedByID: null,
+        createdAt: time,
+        updatedAt: time,
+        statusUpdateAt: 0,
+        status: change_1.CHANGE_STATUS.pending,
+    };
+}
+function addTrackIdIfDoesntExist(attrs) {
+    if (!attrs.id) {
+        return Object.assign({ id: (0, uuidv4_1.uuidv4)() }, attrs);
+    }
+    return attrs;
+}
+function getTextNodeTrackedMarkData(node, schema) {
+    if (!node || !node.isText) {
+        return undefined;
+    }
+    const marksTrackedData = [];
+    node.marks.forEach((mark) => {
+        if (mark.type === schema.marks.tracked_insert || mark.type === schema.marks.tracked_delete) {
+            const operation = mark.type === schema.marks.tracked_insert ? change_1.CHANGE_OPERATION.insert : change_1.CHANGE_OPERATION.delete;
+            marksTrackedData.push(Object.assign(Object.assign({}, mark.attrs.dataTracked), { operation }));
+        }
+    });
+    if (marksTrackedData.length > 1) {
+        logger_1.log.warn('inline node with more than 1 of tracked marks', marksTrackedData);
+    }
+    return marksTrackedData[0] || undefined;
+}
+function getBlockInlineTrackedData(node) {
+    const { dataTracked } = node.attrs;
+    if (dataTracked && !Array.isArray(dataTracked)) {
+        return [dataTracked];
+    }
+    return dataTracked || [];
+}
+function getMarkTrackedData(node) {
+    const tracked = node === null || node === void 0 ? void 0 : node.marks.reduce((acc, current) => {
+        if ((0, mark_1.isValidTrackableMark)(current) && current.attrs.dataTracked) {
+            acc.set(current, current.attrs.dataTracked);
+        }
+        return acc;
+    }, new Map());
+    return tracked || new Map();
+}
+function getNodeTrackedData(node, schema) {
+    let tracked;
+    if (node && !node.isText) {
+        tracked = getBlockInlineTrackedData(node);
+    }
+    else if (node === null || node === void 0 ? void 0 : node.isText) {
+        tracked = getTextNodeTrackedMarkData(node, schema);
+    }
+    if (tracked && !Array.isArray(tracked)) {
+        tracked = [tracked];
+    }
+    return tracked;
+}
+function shouldMergeTrackedAttributes(left, right) {
+    if (!left || !right) {
+        logger_1.log.warn('passed undefined dataTracked attributes to shouldMergeTrackedAttributes', {
+            left,
+            right,
+        });
+        return false;
+    }
+    return (left.status === right.status && left.operation === right.operation && left.authorID === right.authorID);
+}
+function getMergeableMarkTrackedAttrs(node, attrs, schema) {
+    const nodeAttrs = getTextNodeTrackedMarkData(node, schema);
+    return nodeAttrs && shouldMergeTrackedAttributes(nodeAttrs, attrs) ? nodeAttrs : null;
+}
+const updateBlockNodesAttrs = (fragment, predicate) => {
+    const updatedNodes = [];
+    fragment.forEach((child) => {
+        if (!child.isBlock) {
+            updatedNodes.push(child);
+            return;
+        }
+        const newContent = child.content.size ? (0, exports.updateBlockNodesAttrs)(child.content, predicate) : child.content;
+        const newAttrs = predicate(child.attrs, child);
+        updatedNodes.push(child.type.create(newAttrs, newContent, child.marks));
+    });
+    return prosemirror_model_1.Fragment.fromArray(updatedNodes);
+};
+exports.updateBlockNodesAttrs = updateBlockNodesAttrs;
+function excludeFromTracked(dataTracked, changeIdToExclude) {
+    if (!dataTracked) {
+        return null;
+    }
+    const newDataTracked = dataTracked.filter((c) => c.id !== changeIdToExclude);
+    return newDataTracked.length ? newDataTracked : null;
+}