@manuscripts/track-changes-plugin 2.1.1 → 2.2.1

package/dist/cjs/{mutate → tracking/lib}/deleteNode.js

@@ -4,13 +4,12 @@ exports.keepPairedChanges = void 0;
 exports.deleteNode = deleteNode;
 exports.deleteOrSetNodeDeleted = deleteOrSetNodeDeleted;
 const prosemirror_model_1 = require("prosemirror-model");
-const nodeHelpers_1 = require("../compute/nodeHelpers");
-const change_1 = require("../types/change");
-const logger_1 = require("../utils/logger");
-const dropStructureChange_1 = require("./dropStructureChange");
+const structureChange_1 = require("../../changeHelpers/structureChange");
+const attributes_1 = require("../../helpers/attributes");
+const change_1 = require("../../types/change");
+const logger_1 = require("../../utils/logger");
 function deleteNode(node, pos, tr) {
     var _a;
-    const startPos = tr.doc.resolve(pos + 1);
     const resPos = tr.doc.resolve(pos);
     const canMergeToNodeAbove = resPos.parent !== tr.doc && resPos.nodeBefore && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
     if (canMergeToNodeAbove) {
@@ -21,7 +20,7 @@ function deleteNode(node, pos, tr) {
     }
 }
 function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
-    const dataTracked = (0, nodeHelpers_1.getBlockInlineTrackedData)(node);
+    const dataTracked = (0, attributes_1.getBlockInlineTrackedData)(node);
     const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => (d.operation === change_1.CHANGE_OPERATION.insert || d.operation === change_1.CHANGE_OPERATION.wrap_with_node) &&
         (d.status === change_1.CHANGE_STATUS.pending || d.status === change_1.CHANGE_STATUS.accepted));
     const updated = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.set_node_attributes ||
@@ -43,15 +42,15 @@ function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
         });
         return;
     }
-    const newDeleted = (0, nodeHelpers_1.addTrackIdIfDoesntExist)(deleteAttrs);
+    const newDeleted = (0, attributes_1.addTrackIdIfDoesntExist)(deleteAttrs);
     newTr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: updated ? [newDeleted, updated] : moved ? [newDeleted, moved] : [newDeleted] }), node.marks);
     if (!deleteAttrs.moveNodeId && (structure === null || structure === void 0 ? void 0 : structure.moveNodeId)) {
-        (0, dropStructureChange_1.dropStructuralChangeShadow)(structure.moveNodeId, newTr);
+        (0, structureChange_1.dropStructuralChangeShadow)(structure.moveNodeId, newTr);
     }
 }
 const keepPairedChanges = (node) => {
     var _a;
-    const dataTracked = (_a = (0, nodeHelpers_1.getBlockInlineTrackedData)(node)) === null || _a === void 0 ? void 0 : _a.filter((c) => (c.operation === change_1.CHANGE_OPERATION.delete && c.moveNodeId) || c.operation === change_1.CHANGE_OPERATION.reference);
+    const dataTracked = (_a = (0, attributes_1.getBlockInlineTrackedData)(node)) === null || _a === void 0 ? void 0 : _a.filter((c) => (c.operation === change_1.CHANGE_OPERATION.delete && c.moveNodeId) || c.operation === change_1.CHANGE_OPERATION.reference);
     return (dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.length) ? dataTracked : null;
 };
 exports.keepPairedChanges = keepPairedChanges;

package/dist/cjs/{mutate/deleteText.js → tracking/lib/deleteTextIfInserted.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteTextIfInserted = deleteTextIfInserted;
 const prosemirror_model_1 = require("prosemirror-model");
-const nodeHelpers_1 = require("../compute/nodeHelpers");
+const attributes_1 = require("../../helpers/attributes");
 function deleteTextIfInserted(node, pos, newTr, schema, deleteAttrs, from, to) {
     const start = from ? Math.max(pos, from) : pos;
     const nodeEnd = pos + node.nodeSize;
@@ -13,13 +13,13 @@ function deleteTextIfInserted(node, pos, newTr, schema, deleteAttrs, from, to) {
     }
     else {
         const leftNode = newTr.doc.resolve(start).nodeBefore;
-        const leftMarks = (0, nodeHelpers_1.getMergeableMarkTrackedAttrs)(leftNode, deleteAttrs, schema);
+        const leftMarks = (0, attributes_1.getMergeableMarkTrackedAttrs)(leftNode, deleteAttrs, schema);
         const rightNode = newTr.doc.resolve(end).nodeAfter;
-        const rightMarks = (0, nodeHelpers_1.getMergeableMarkTrackedAttrs)(rightNode, deleteAttrs, schema);
+        const rightMarks = (0, attributes_1.getMergeableMarkTrackedAttrs)(rightNode, deleteAttrs, schema);
         const fromStartOfMark = start - (leftNode && leftMarks ? leftNode.nodeSize : 0);
         const toEndOfMark = end + (rightNode && rightMarks ? rightNode.nodeSize : 0);
         const createdAt = Math.min((leftMarks === null || leftMarks === void 0 ? void 0 : leftMarks.createdAt) || Number.MAX_VALUE, (rightMarks === null || rightMarks === void 0 ? void 0 : rightMarks.createdAt) || Number.MAX_VALUE, deleteAttrs.createdAt);
-        const dataTracked = (0, nodeHelpers_1.addTrackIdIfDoesntExist)(Object.assign(Object.assign(Object.assign(Object.assign({}, leftMarks), rightMarks), deleteAttrs), { createdAt }));
+        const dataTracked = (0, attributes_1.addTrackIdIfDoesntExist)(Object.assign(Object.assign(Object.assign(Object.assign({}, leftMarks), rightMarks), deleteAttrs), { createdAt }));
         newTr.addMark(fromStartOfMark, toEndOfMark, schema.marks.tracked_delete.create({
             dataTracked,
         }));

package/dist/cjs/{change-steps → tracking/lib}/matchInserted.js

@@ -1,4 +1,19 @@
 "use strict";
+/*!
+ * © 2023 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 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)
@@ -12,29 +27,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchInserted = matchInserted;
-function matchText(adjDeleted, insNode, offset, matchedDeleted, deleted) {
-    const { pos, from, to, node: delNode } = adjDeleted;
-    let j = offset, d = from - pos, maxSteps = to - Math.max(pos, from);
-    for (; maxSteps !== j && insNode.text[j] !== undefined && insNode.text[j] === delNode.text[d]; j += 1, d += 1) {
-        matchedDeleted += 1;
-    }
-    deleted = deleted.filter((d) => d !== adjDeleted);
-    if (maxSteps !== j) {
-        deleted.push({
-            pos,
-            from: from + j - offset,
-            to,
-            type: 'delete-text',
-            node: delNode,
-        });
-        return [matchedDeleted, deleted];
-    }
-    const nextTextDelete = deleted.find((d) => d.type === 'delete-text' && d.pos === to);
-    if (nextTextDelete) {
-        return matchText(nextTextDelete, insNode, j, matchedDeleted, deleted);
-    }
-    return [matchedDeleted, deleted];
-}
 function matchInserted(matchedDeleted, deleted, inserted) {
     var _a;
     let matched = [matchedDeleted, deleted];

package/dist/cjs/{mutate → tracking/lib}/mergeTrackedMarks.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeTrackedMarks = mergeTrackedMarks;
-const nodeHelpers_1 = require("../compute/nodeHelpers");
-const uuidv4_1 = require("../utils/uuidv4");
+const attributes_1 = require("../../helpers/attributes");
+const uuidv4_1 = require("../../utils/uuidv4");
 const assignId = (attrs, leftDataTracked, rightDataTracked) => {
     if (attrs.id === leftDataTracked.id || attrs.id === rightDataTracked.id) {
         return Object.assign(Object.assign({}, attrs), { id: (0, uuidv4_1.uuidv4)() });
@@ -19,7 +19,7 @@ function mergeTrackedMarks(pos, doc, newTr, schema) {
     }
     const leftDataTracked = leftMark.attrs.dataTracked;
     const rightDataTracked = rightMark.attrs.dataTracked;
-    if (!(0, nodeHelpers_1.shouldMergeTrackedAttributes)(leftDataTracked, rightDataTracked)) {
+    if (!(0, attributes_1.shouldMergeTrackedAttributes)(leftDataTracked, rightDataTracked)) {
         return;
     }
     const isLeftOlder = (leftDataTracked.createdAt || 0) < (rightDataTracked.createdAt || 0);

package/dist/cjs/tracking/lib/processStepsBeforeTracking.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processStepsBeforeTracking = processStepsBeforeTracking;
+const logger_1 = require("../../utils/logger");
+function processStepsBeforeTracking(tr, trContext, processors) {
+    let steps = [];
+    processors.forEach((p) => {
+        const res = p(tr, trContext);
+        if (res) {
+            steps = res;
+            if (steps.length < tr.steps.length) {
+                logger_1.log.warn('Bug! A processor function filtered steps incorrectly. Filtered out steps should be replaced with null and not popped out of the array. Length and order has to be preserved');
+            }
+        }
+    });
+    return steps;
+}

package/dist/cjs/{steps/utils.js → tracking/steps-trackers/qualifiers.js}

@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStructureSteps = exports.isLiftStep = exports.isWrapStep = exports.isSplitStep = void 0;
-exports.stepIsLift = stepIsLift;
-const prosemirror_transform_1 = require("prosemirror-transform");
-const actions_1 = require("../actions");
+exports.isDeletingPendingMovedNode = exports.isDirectPendingMoveDeletion = exports.isLiftStep = exports.isWrapStep = exports.isSplitStep = exports.isDeleteStep = void 0;
+exports.isLiftStepForGap = isLiftStepForGap;
+const ChangeSet_1 = require("../../ChangeSet");
+const change_1 = require("../../types/change");
+const isDeleteStep = (step) => step.from !== step.to && step.slice.content.size < step.to - step.from;
+exports.isDeleteStep = isDeleteStep;
 const isSplitStep = (step, selection, uiEvent) => {
     var _a, _b, _c, _d;
     const { from, to, slice } = step;
@@ -60,11 +62,36 @@ const isLiftStep = (step) => {
     return false;
 };
 exports.isLiftStep = isLiftStep;
-function stepIsLift(gap, node, to) {
+function isLiftStepForGap(gap, node, to) {
     return gap.start < gap.end && gap.insert === 0 && gap.end === to && !node.isText;
 }
-const isStructureSteps = (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.isStructureSteps = isStructureSteps;
+const isDirectPendingMoveDeletion = (step, doc, movingSteps) => {
+    if (step.from === step.to || step.slice.content.size > 0) {
+        return false;
+    }
+    if (movingSteps.has(step)) {
+        return false;
+    }
+    const node = doc.nodeAt(step.from);
+    if (!node) {
+        return false;
+    }
+    return ChangeSet_1.ChangeSet.isPendingChange(node.attrs.dataTracked, change_1.CHANGE_OPERATION.move);
+};
+exports.isDirectPendingMoveDeletion = isDirectPendingMoveDeletion;
+const isDeletingPendingMovedNode = (step, doc) => {
+    if (!step.slice || step.from === step.to || step.slice.content.size > 0) {
+        return undefined;
+    }
+    const node = doc.nodeAt(step.from);
+    if (!node) {
+        return undefined;
+    }
+    const trackedAttrs = node.attrs.dataTracked;
+    const found = trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.find((tracked) => tracked.operation === change_1.CHANGE_OPERATION.move && tracked.status === change_1.CHANGE_STATUS.pending);
+    if (found === null || found === void 0 ? void 0 : found.moveNodeId) {
+        return found.moveNodeId;
+    }
+    return undefined;
+};
+exports.isDeletingPendingMovedNode = isDeletingPendingMovedNode;

package/dist/cjs/{steps/trackAttrsChange.js → tracking/steps-trackers/trackAttrsChangeStep.js}

@@ -26,8 +26,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("../utils/logger");
-function trackAttrsChange(step, oldState, tr, newTr, attrs, currentStepDoc) {
+const logger_1 = require("../../utils/logger");
+function trackAttrsChangeStep(step, oldState, tr, newTr, attrs, currentStepDoc) {
     const newStep = step.invert(currentStepDoc);
     const stepResult = newTr.maybeStep(newStep);
     if (stepResult.failed) {
@@ -47,4 +47,4 @@ function trackAttrsChange(step, oldState, tr, newTr, attrs, currentStepDoc) {
     };
     return [changeStep];
 }
-exports.default = trackAttrsChange;
+exports.default = trackAttrsChangeStep;

package/dist/cjs/{steps → tracking/steps-trackers}/trackMarkSteps.js

@@ -5,9 +5,10 @@ exports.trackRemoveNodeMarkStep = trackRemoveNodeMarkStep;
 exports.trackAddMarkStep = trackAddMarkStep;
 exports.trackAddNodeMarkStep = trackAddNodeMarkStep;
 const prosemirror_transform_1 = require("prosemirror-transform");
-const change_1 = require("../types/change");
-const track_utils_1 = require("../utils/track-utils");
-const uuidv4_1 = require("../utils/uuidv4");
+const attributes_1 = require("../../helpers/attributes");
+const mark_1 = require("../../helpers/mark");
+const change_1 = require("../../types/change");
+const uuidv4_1 = require("../../utils/uuidv4");
 function markHasOp(mark, operation) {
     if (mark.attrs.dataTracked && Array.isArray(mark.attrs.dataTracked)) {
         const dtAttrs = mark.attrs.dataTracked;
@@ -15,7 +16,7 @@ function markHasOp(mark, operation) {
     }
 }
 function trackRemoveMarkStep(step, emptyAttrs, newTr, doc) {
-    if ((0, track_utils_1.isValidTrackableMark)(step.mark)) {
+    if ((0, mark_1.isValidTrackableMark)(step.mark)) {
         const markName = step.mark.type.name;
         const markSource = step.mark.type.schema.marks[step.mark.type.name];
         let sameMark = null;
@@ -41,7 +42,7 @@ function trackRemoveMarkStep(step, emptyAttrs, newTr, doc) {
                 sameMark = parentsSameMark;
             }
         }
-        const newDataTracked = (0, track_utils_1.createNewDeleteAttrs)(emptyAttrs);
+        const newDataTracked = (0, attributes_1.createNewDeleteAttrs)(emptyAttrs);
         const newMark = markSource.create({
             dataTracked: [Object.assign(Object.assign({}, newDataTracked), { id: (0, uuidv4_1.uuidv4)() })],
         });
@@ -65,7 +66,7 @@ function trackRemoveMarkStep(step, emptyAttrs, newTr, doc) {
     }
 }
 function trackRemoveNodeMarkStep(step, emptyAttrs, newTr, doc) {
-    if ((0, track_utils_1.isValidTrackableMark)(step.mark)) {
+    if ((0, mark_1.isValidTrackableMark)(step.mark)) {
         const markName = step.mark.type.name;
         const markSource = step.mark.type.schema.marks[markName];
         let sameMark = null;
@@ -78,7 +79,7 @@ function trackRemoveNodeMarkStep(step, emptyAttrs, newTr, doc) {
                 }
             });
         }
-        const newDataTracked = (0, track_utils_1.createNewDeleteAttrs)(emptyAttrs);
+        const newDataTracked = (0, attributes_1.createNewDeleteAttrs)(emptyAttrs);
         const newMark = markSource.create({
             dataTracked: [Object.assign(Object.assign({}, newDataTracked), { id: (0, uuidv4_1.uuidv4)() })],
         });
@@ -94,6 +95,8 @@ function trackRemoveNodeMarkStep(step, emptyAttrs, newTr, doc) {
             }
         }
         try {
+            const inverted = step.invert(doc);
+            newTr.step(inverted);
             newTr.step(newStep);
         }
         catch (e) {
@@ -102,10 +105,10 @@ function trackRemoveNodeMarkStep(step, emptyAttrs, newTr, doc) {
     }
 }
 function trackAddMarkStep(step, emptyAttrs, newTr, doc) {
-    if ((0, track_utils_1.isValidTrackableMark)(step.mark)) {
+    if ((0, mark_1.isValidTrackableMark)(step.mark)) {
         const markName = step.mark.type.name;
         const markSource = step.mark.type.schema.marks[markName];
-        const newDataTracked = (0, track_utils_1.createNewInsertAttrs)(emptyAttrs);
+        const newDataTracked = (0, attributes_1.createNewInsertAttrs)(emptyAttrs);
         const newMark = markSource.create({
             dataTracked: [Object.assign(Object.assign({}, newDataTracked), { id: (0, uuidv4_1.uuidv4)() })],
         });
@@ -121,8 +124,8 @@ function trackAddMarkStep(step, emptyAttrs, newTr, doc) {
     }
 }
 function trackAddNodeMarkStep(step, emptyAttrs, newTr, stepDoc) {
-    if ((0, track_utils_1.isValidTrackableMark)(step.mark)) {
-        const newDataTracked = (0, track_utils_1.createNewInsertAttrs)(emptyAttrs);
+    if ((0, mark_1.isValidTrackableMark)(step.mark)) {
+        const newDataTracked = (0, attributes_1.createNewInsertAttrs)(emptyAttrs);
         const markSource = step.mark.type.schema.marks[step.mark.type.name];
         const newMark = markSource.create({
             dataTracked: [Object.assign(Object.assign({}, newDataTracked), { id: (0, uuidv4_1.uuidv4)() })],

package/dist/cjs/{steps → tracking/steps-trackers}/trackReplaceAroundStep.js

@@ -1,46 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackReplaceAroundStep = trackReplaceAroundStep;
 const prosemirror_model_1 = require("prosemirror-model");
-const actions_1 = require("../actions");
-const setFragmentAsInserted_1 = require("../compute/setFragmentAsInserted");
-const deleteAndMergeSplitNodes_1 = require("../mutate/deleteAndMergeSplitNodes");
-const logger_1 = require("../utils/logger");
-const trackUtils = __importStar(require("../utils/track-utils"));
-const utils_1 = require("./utils");
+const actions_1 = require("../../actions");
+const attributes_1 = require("../../helpers/attributes");
+const fragment_1 = require("../../helpers/fragment");
+const logger_1 = require("../../utils/logger");
+const deleteAndMergeSplitNodes_1 = require("../lib/deleteAndMergeSplitNodes");
+const qualifiers_1 = require("./qualifiers");
 function preserveDataTrackedFromPreviousStep(newTr, step, newStep) {
     const prevDoc = newTr.docs[newTr.docs.length - 2];
     if (prevDoc && (step.slice.openEnd || step.slice.openStart)) {
@@ -66,18 +33,17 @@ function trackReplaceAroundStep(step, oldState, tr, newTr, attrs, currentStepDoc
     preserveDataTrackedFromPreviousStep(newTr, step, newStep);
     const gap = currentStepDoc.slice(gapFrom, gapTo);
     logger_1.log.info('RETAINED GAP CONTENT', gap);
-    let { sliceWasSplit, newSliceContent, steps: deleteSteps, } = (0, deleteAndMergeSplitNodes_1.deleteAndMergeSplitNodes)(from, to, { start: gapFrom, end: gapTo, slice: gap, insert }, newTr.doc, newTr, oldState.schema, attrs, slice);
+    let { sliceWasSplit, newSliceContent, steps: deleteSteps, } = (0, deleteAndMergeSplitNodes_1.deleteAndMergeSplitNodes)(from, to, { start: gapFrom, end: gapTo, slice: gap, insert }, newTr.doc, oldState.schema, attrs, slice);
     let fragment;
-    if ((0, utils_1.isWrapStep)(step)) {
-        fragment = (0, setFragmentAsInserted_1.setFragmentAsWrapChange)(newSliceContent, attrs, oldState.schema);
+    if ((0, qualifiers_1.isWrapStep)(step)) {
+        fragment = (0, fragment_1.setFragmentAsWrapChange)(newSliceContent, attrs, oldState.schema);
     }
     else {
-        fragment = (0, setFragmentAsInserted_1.setFragmentAsInserted)(newSliceContent, trackUtils.createNewInsertAttrs(attrs), oldState.schema);
+        fragment = (0, fragment_1.setFragmentAsInserted)(newSliceContent, (0, attributes_1.createNewInsertAttrs)(attrs), oldState.schema);
     }
     let steps = deleteSteps;
-    logger_1.log.info('TR: new steps after applying delete', [...newTr.steps]);
     logger_1.log.info('DELETE STEPS: ', deleteSteps);
-    let liftStep = (0, utils_1.isLiftStep)(step);
+    let liftStep = (0, qualifiers_1.isLiftStep)(step);
     if (liftStep) {
         logger_1.log.info('DETECTING INIT LIFT STEP: ', step);
         trContext.prevLiftStep = step;
@@ -107,7 +73,7 @@ function trackReplaceAroundStep(step, oldState, tr, newTr, attrs, currentStepDoc
                 ? insertedSlice.content.append(trContext.liftFragment)
                 : insertedSlice.content;
             if (tr.steps.indexOf(step) === 0) {
-                const fragmentTracked = (0, setFragmentAsInserted_1.setFragmentAsInserted)(trContext.liftFragment, trackUtils.createNewInsertAttrs(attrs), oldState.schema);
+                const fragmentTracked = (0, fragment_1.setFragmentAsInserted)(trContext.liftFragment, (0, attributes_1.createNewInsertAttrs)(attrs), oldState.schema);
                 steps.push({
                     type: 'insert-slice',
                     from: from,

package/dist/cjs/tracking/steps-trackers/trackReplaceStep.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trackReplaceStep = trackReplaceStep;
+const prosemirror_model_1 = require("prosemirror-model");
+const prosemirror_transform_1 = require("prosemirror-transform");
+const actions_1 = require("../../actions");
+const structureChange_1 = require("../../changeHelpers/structureChange");
+const attributes_1 = require("../../helpers/attributes");
+const fragment_1 = require("../../helpers/fragment");
+const logger_1 = require("../../utils/logger");
+const mapChangeSteps_1 = require("../change-step/mapChangeSteps");
+const deleteAndMergeSplitNodes_1 = require("../lib/deleteAndMergeSplitNodes");
+const qualifiers_1 = require("./qualifiers");
+function trackReplaceStep(i, oldState, newTr, attrsTemplate, tr, deletedNodeMapping, trContext) {
+    const step = tr.steps[i];
+    const moveID = trContext.stepsByGroupIDMap.get(step);
+    const invertedStep = step.invert(tr.docs[i]);
+    const newStep = new prosemirror_transform_1.ReplaceStep(deletedNodeMapping.map(invertedStep.from), deletedNodeMapping.map(invertedStep.to), invertedStep.slice);
+    const stepResult = newTr.maybeStep(newStep);
+    logger_1.log.info('###### ReplaceStep ######');
+    let selectionPos = 0;
+    const changeSteps = [];
+    if (stepResult.failed) {
+        logger_1.log.error(`invert ReplaceStep failed: "${stepResult.failed}"`);
+        return [changeSteps, undefined];
+    }
+    const attrs = Object.assign({}, attrsTemplate);
+    if (moveID) {
+        attrs.moveNodeId = moveID;
+    }
+    step.getMap().forEach((fromA, toA, fromB, toB) => {
+        var _a, _b, _c, _d;
+        logger_1.log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
+        const { slice } = step;
+        logger_1.log.info('TR: steps before applying delete', [...newTr.steps]);
+        const { sliceWasSplit, newSliceContent, steps: deleteSteps, } = (0, deleteAndMergeSplitNodes_1.deleteAndMergeSplitNodes)(fromA, toA, undefined, tr.docs[i], oldState.schema, attrs, slice);
+        changeSteps.push(...deleteSteps);
+        logger_1.log.info('TR: steps after applying delete', [...newTr.steps]);
+        logger_1.log.info('DELETE STEPS: ', [...changeSteps]);
+        const backSpacedText = sameThingBackSpaced(changeSteps, newSliceContent);
+        if (backSpacedText) {
+            changeSteps.splice(changeSteps.indexOf(backSpacedText));
+        }
+        if (!backSpacedText && newSliceContent.size > 0) {
+            logger_1.log.info('newSliceContent', newSliceContent);
+            let fragment = (0, fragment_1.setFragmentAsInserted)(newSliceContent, (0, attributes_1.createNewInsertAttrs)(attrs), oldState.schema);
+            if ((0, structureChange_1.isStructuralChange)(tr)) {
+                fragment = (0, structureChange_1.joinStructureChanges)(attrs, newSliceContent, fragment, tr, newTr);
+            }
+            else if ((0, qualifiers_1.isSplitStep)(step, oldState.selection, tr.getMeta('uiEvent'))) {
+                fragment = (0, fragment_1.setFragmentAsNodeSplit)(newTr.doc.resolve(step.from), newTr, fragment, attrs);
+            }
+            else if (moveID) {
+                const indentationType = (_a = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.indentationAction)) === null || _a === void 0 ? void 0 : _a.action;
+                fragment = (0, fragment_1.setFragmentAsMoveChange)(newSliceContent, (0, attributes_1.createNewMoveAttrs)(attrs, indentationType));
+            }
+            const openStart = slice.openStart !== slice.openEnd ? 0 : slice.openStart;
+            const openEnd = slice.openStart !== slice.openEnd ? 0 : slice.openEnd;
+            const textWasDeleted = !!changeSteps.length && !(fromA === fromB);
+            const isBlock = !!((_b = fragment.firstChild) === null || _b === void 0 ? void 0 : _b.isBlock);
+            changeSteps.push({
+                type: 'insert-slice',
+                from: textWasDeleted ? fromB : isBlock ? toA : fromA,
+                to: textWasDeleted ? fromB : isBlock ? toA : fromA,
+                sliceWasSplit,
+                slice: new prosemirror_model_1.Slice(fragment, openStart, openEnd),
+            });
+        }
+        else {
+            const isDeleteEvent = ((_c = window.event) === null || _c === void 0 ? void 0 : _c.code) === 'Delete';
+            const isDeleteContentForward = ((_d = window.event) === null || _d === void 0 ? void 0 : _d.inputType) === 'deleteContentForward';
+            selectionPos = isDeleteEvent || isDeleteContentForward ? toA : fromA;
+        }
+    });
+    selectionPos = deletedNodeMapping.map(selectionPos);
+    const doneSteps = (0, mapChangeSteps_1.mapChangeSteps)(changeSteps, deletedNodeMapping);
+    return [doneSteps, selectionPos];
+}
+function sameThingBackSpaced(changeSteps, newSliceContent) {
+    if (changeSteps.length == 2 && newSliceContent.size > 0) {
+        const correspondingDeletion = changeSteps.find((step) => step.type === 'delete-text' && step.node.text === newSliceContent.content[0].text);
+        return correspondingDeletion;
+    }
+    return undefined;
+}

package/dist/cjs/tracking/trackTransaction.js

@@ -0,0 +1,93 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trackTransaction = trackTransaction;
+const prosemirror_transform_1 = require("prosemirror-transform");
+const structureChange_1 = require("../changeHelpers/structureChange");
+const updateChangeAttrs_1 = require("../changeHelpers/updateChangeAttrs");
+const attributes_1 = require("../helpers/attributes");
+const logger_1 = require("../utils/logger");
+const uuidv4_1 = require("../utils/uuidv4");
+const diffChangeSteps_1 = require("./change-step/diffChangeSteps");
+const processChangeSteps_1 = require("./change-step/processChangeSteps");
+const fixAndHandleSelection_1 = require("./fixAndHandleSelection");
+const qualifiers_1 = require("./steps-trackers/qualifiers");
+const trackAttrsChangeStep_1 = __importDefault(require("./steps-trackers/trackAttrsChangeStep"));
+const trackMarkSteps_1 = require("./steps-trackers/trackMarkSteps");
+const trackReplaceAroundStep_1 = require("./steps-trackers/trackReplaceAroundStep");
+const trackReplaceStep_1 = require("./steps-trackers/trackReplaceStep");
+const transactionProcessing_1 = require("./transactionProcessing");
+function trackTransaction(tr, oldState, newTr, authorID, clearedSteps, trContext) {
+    var _a, _b, _c, _d, _e;
+    const emptyAttrs = (0, attributes_1.createNewPendingAttrs)(tr.time, authorID);
+    const deletedNodeMapping = new prosemirror_transform_1.Mapping();
+    trContext = Object.assign(Object.assign({}, trContext), { deletedNodeMapping });
+    let iterations = 0;
+    logger_1.log.info('ORIGINAL transaction', tr);
+    for (let i = clearedSteps.length - 1; i >= 0; i--) {
+        const step = clearedSteps[i];
+        if (!step) {
+            continue;
+        }
+        logger_1.log.info('transaction step', step);
+        iterations++;
+        if (!(0, transactionProcessing_1.iterationIsValid)(iterations, tr, newTr, step)) {
+            continue;
+        }
+        else if (step instanceof prosemirror_transform_1.ReplaceStep) {
+            const { slice } = step;
+            if (((_b = (_a = slice === null || slice === void 0 ? void 0 : slice.content) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.length) === 1 && (0, transactionProcessing_1.excludeFromTracking)(slice.content.content[0])) {
+                continue;
+            }
+            let thisStepMapping = tr.mapping.slice(i + 1, i + 1);
+            if ((0, qualifiers_1.isDeleteStep)(step) || (0, structureChange_1.isStructuralChange)(tr)) {
+                thisStepMapping = deletedNodeMapping;
+            }
+            let [steps, newSelectionPos] = (0, trackReplaceStep_1.trackReplaceStep)(i, oldState, newTr, emptyAttrs, tr, thisStepMapping, trContext);
+            if (steps.length === 1) {
+                const step = steps[0];
+                if ((0, transactionProcessing_1.excludeFromTracking)((step === null || step === void 0 ? void 0 : step.node) || ((_d = (_c = step === null || step === void 0 ? void 0 : step.slice) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.content[0]))) {
+                    continue;
+                }
+            }
+            logger_1.log.info('TRACK REPLACE CHANGES: ', [...steps]);
+            steps = (0, diffChangeSteps_1.diffChangeSteps)(steps);
+            logger_1.log.info('DIFFED STEPS: ', steps);
+            const [_, updatedSelectionPos] = (0, processChangeSteps_1.processChangeSteps)(steps, newTr, trContext.stepsByGroupIDMap.has(step)
+                ? Object.assign(Object.assign({}, emptyAttrs), { moveNodeId: trContext.stepsByGroupIDMap.get(step) }) : emptyAttrs, oldState.schema, deletedNodeMapping);
+            trContext.selectionPosFromInsertion = updatedSelectionPos || newSelectionPos || tr.selection.head;
+        }
+        else if (step instanceof prosemirror_transform_1.ReplaceAroundStep) {
+            let steps = (0, trackReplaceAroundStep_1.trackReplaceAroundStep)(step, oldState, tr, newTr, emptyAttrs, tr.docs[i], trContext);
+            steps = (0, diffChangeSteps_1.diffChangeSteps)(steps);
+            logger_1.log.info('DIFFED STEPS: ', steps);
+            (0, processChangeSteps_1.processChangeSteps)(steps, newTr, emptyAttrs, oldState.schema, deletedNodeMapping);
+        }
+        else if (step instanceof prosemirror_transform_1.AttrStep) {
+            const changeSteps = (0, trackAttrsChangeStep_1.default)(step, oldState, tr, newTr, emptyAttrs, tr.docs[i]);
+            (0, processChangeSteps_1.processChangeSteps)(changeSteps, newTr, emptyAttrs, oldState.schema, deletedNodeMapping);
+        }
+        else if (step instanceof prosemirror_transform_1.AddMarkStep) {
+            (0, trackMarkSteps_1.trackAddMarkStep)(step, emptyAttrs, newTr, tr.docs[i]);
+            const dataTracked = (_e = (0, attributes_1.getNodeTrackedData)(newTr.doc.nodeAt(step.from), oldState.schema)) === null || _e === void 0 ? void 0 : _e.pop();
+            if (dataTracked) {
+                (0, updateChangeAttrs_1.updateChangeAttrs)(newTr, { id: dataTracked.id, from: step.from, to: step.to, type: 'text-change', dataTracked }, Object.assign(Object.assign({}, dataTracked), { id: (0, uuidv4_1.uuidv4)() }), oldState.schema);
+            }
+        }
+        else if (step instanceof prosemirror_transform_1.RemoveMarkStep) {
+            (0, trackMarkSteps_1.trackRemoveMarkStep)(step, emptyAttrs, newTr, tr.docs[i]);
+        }
+        else if (step instanceof prosemirror_transform_1.RemoveNodeMarkStep) {
+            (0, trackMarkSteps_1.trackRemoveNodeMarkStep)(step, emptyAttrs, newTr, tr.docs[i]);
+        }
+        else if (step instanceof prosemirror_transform_1.AddNodeMarkStep) {
+            (0, trackMarkSteps_1.trackAddNodeMarkStep)(step, emptyAttrs, newTr, tr.docs[i]);
+        }
+    }
+    newTr = (0, transactionProcessing_1.passThroughMeta)(tr, newTr);
+    newTr = (0, fixAndHandleSelection_1.fixAndSetSelectionAfterTracking)(newTr, tr, deletedNodeMapping, trContext);
+    logger_1.log.info('NEW transaction', newTr);
+    return newTr;
+}