@manuscripts/track-changes-plugin 2.1.1 → 2.2.0

package/dist/cjs/{compute/setFragmentAsInserted.js → helpers/fragment.js}

@@ -1,55 +1,87 @@
 "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.setFragmentAsInserted = setFragmentAsInserted;
 exports.setFragmentAsWrapChange = setFragmentAsWrapChange;
 exports.setFragmentAsMoveChange = setFragmentAsMoveChange;
 exports.setFragmentAsNodeSplit = setFragmentAsNodeSplit;
+exports.cutFragment = cutFragment;
 const prosemirror_model_1 = require("prosemirror-model");
 const change_1 = require("../types/change");
 const logger_1 = require("../utils/logger");
-const trackUtils = __importStar(require("../utils/track-utils"));
 const uuidv4_1 = require("../utils/uuidv4");
-const nodeHelpers_1 = require("./nodeHelpers");
+const attributes_1 = require("./attributes");
+const mark_1 = require("./mark");
+function setFragmentAsInserted(inserted, insertAttrs, schema) {
+    const updatedInserted = loopContentAndMergeText(inserted, insertAttrs, schema);
+    return updatedInserted.length === 0 ? prosemirror_model_1.Fragment.empty : prosemirror_model_1.Fragment.fromArray(updatedInserted);
+}
+function setFragmentAsWrapChange(inserted, attrs, schema) {
+    const content = [];
+    inserted.forEach((node) => {
+        content.push(node.type.create(Object.assign(Object.assign({}, node.attrs), { dataTracked: [(0, attributes_1.addTrackIdIfDoesntExist)((0, attributes_1.createNewWrapAttrs)(attrs))] }), setFragmentAsInserted(node.content, (0, attributes_1.createNewInsertAttrs)(attrs), schema), node.marks));
+    });
+    return prosemirror_model_1.Fragment.from(content);
+}
+function setFragmentAsMoveChange(fragment, moveAttrs) {
+    const content = [];
+    fragment.forEach((node) => {
+        content.push(node.type.create(Object.assign(Object.assign({}, node.attrs), { dataTracked: [(0, attributes_1.addTrackIdIfDoesntExist)(moveAttrs)] }), node.content, node.marks));
+    });
+    return prosemirror_model_1.Fragment.from(content);
+}
+function setFragmentAsNodeSplit($pos, newTr, inserted, attrs) {
+    const lastChild = inserted.lastChild;
+    const referenceId = (0, uuidv4_1.uuidv4)();
+    const parentPos = $pos.before($pos.depth);
+    const parent = $pos.node($pos.depth);
+    const oldDataTracked = (0, attributes_1.getBlockInlineTrackedData)(parent) || [];
+    newTr.setNodeMarkup(parentPos, undefined, Object.assign(Object.assign({}, parent.attrs), { dataTracked: [
+            ...oldDataTracked.filter((c) => c.operation !== 'reference'),
+            Object.assign({}, (0, attributes_1.addTrackIdIfDoesntExist)((0, attributes_1.createNewReferenceAttrs)(Object.assign(Object.assign({}, attrs), { status: change_1.CHANGE_STATUS.pending }), referenceId))),
+        ] }));
+    const splitSource = oldDataTracked.find((c) => c.operation === 'reference');
+    const dataTracked = Object.assign(Object.assign({}, (0, attributes_1.createNewSplitAttrs)(Object.assign({}, attrs))), { id: referenceId });
+    if (lastChild.type.name === 'list_item') {
+        let firstChild = lastChild.content.firstChild;
+        firstChild = firstChild.type.create(Object.assign(Object.assign({}, lastChild.attrs), { dataTracked: splitSource ? [dataTracked, splitSource] : [dataTracked] }), firstChild.content);
+        inserted = inserted.replaceChild(inserted.childCount - 1, lastChild.type.create(lastChild.attrs, lastChild.content.cut(firstChild.nodeSize).addToStart(firstChild)));
+    }
+    else {
+        inserted = inserted.replaceChild(inserted.childCount - 1, lastChild.type.create(Object.assign(Object.assign({}, lastChild.attrs), { dataTracked: splitSource ? [dataTracked, splitSource] : [dataTracked] }), lastChild.content));
+    }
+    return inserted;
+}
+function cutFragment(matched, deleted, content) {
+    const newContent = [];
+    for (let i = 0; matched <= deleted && i < content.childCount; i += 1) {
+        const child = content.child(i);
+        if (!child.isText && child.content.size > 0) {
+            const cut = cutFragment(matched + 1, deleted, child.content);
+            matched = cut[0];
+            newContent.push(...cut[1].content);
+        }
+        else if (child.isText && matched + child.nodeSize > deleted) {
+            if (deleted - matched > 0) {
+                newContent.push(child.cut(deleted - matched));
+            }
+            else {
+                newContent.push(child);
+            }
+            matched = deleted + 1;
+        }
+        else {
+            matched += child.nodeSize;
+        }
+    }
+    return [matched, prosemirror_model_1.Fragment.fromArray(newContent)];
+}
 function markInlineNodeChange(node, newTrackAttrs, schema) {
     const filtered = node.marks.filter((m) => m.type !== schema.marks.tracked_insert && m.type !== schema.marks.tracked_delete);
     const mark = newTrackAttrs.operation === change_1.CHANGE_OPERATION.insert
         ? schema.marks.tracked_insert
         : schema.marks.tracked_delete;
     const createdMark = mark.create({
-        dataTracked: (0, nodeHelpers_1.addTrackIdIfDoesntExist)(newTrackAttrs),
+        dataTracked: (0, attributes_1.addTrackIdIfDoesntExist)(newTrackAttrs),
     });
     return node.mark(filtered.concat(createdMark));
 }
@@ -61,8 +93,8 @@ function loopContentAndMergeText(content, newTrackAttrs, schema) {
         const prev = i > 0 ? updatedChildren[i - 1] : null;
         if ((prev === null || prev === void 0 ? void 0 : prev.isText) &&
             recursed.isText &&
-            (0, nodeHelpers_1.equalMarks)(prev, recursed) &&
-            ((_a = (0, nodeHelpers_1.getTextNodeTrackedMarkData)(prev, schema)) === null || _a === void 0 ? void 0 : _a.operation) === change_1.CHANGE_OPERATION.insert) {
+            (0, mark_1.equalMarks)(prev, recursed) &&
+            ((_a = (0, attributes_1.getTextNodeTrackedMarkData)(prev, schema)) === null || _a === void 0 ? void 0 : _a.operation) === change_1.CHANGE_OPERATION.insert) {
             updatedChildren.splice(i - 1, 1, schema.text('' + prev.text + recursed.text, prev.marks));
         }
         else {
@@ -77,50 +109,10 @@ function recurseNodeContent(node, newTrackAttrs, schema) {
     }
     else if (node.isBlock || node.isInline) {
         const updatedChildren = loopContentAndMergeText(node.content, newTrackAttrs, schema);
-        return node.type.create(Object.assign(Object.assign({}, node.attrs), { dataTracked: [(0, nodeHelpers_1.addTrackIdIfDoesntExist)(newTrackAttrs)] }), prosemirror_model_1.Fragment.fromArray(updatedChildren), node.marks);
+        return node.type.create(Object.assign(Object.assign({}, node.attrs), { dataTracked: [(0, attributes_1.addTrackIdIfDoesntExist)(newTrackAttrs)] }), prosemirror_model_1.Fragment.fromArray(updatedChildren), node.marks);
     }
     else {
         logger_1.log.error(`unhandled node type: "${node.type.name}"`, node);
         return node;
     }
 }
-function setFragmentAsInserted(inserted, insertAttrs, schema) {
-    const updatedInserted = loopContentAndMergeText(inserted, insertAttrs, schema);
-    return updatedInserted.length === 0 ? prosemirror_model_1.Fragment.empty : prosemirror_model_1.Fragment.fromArray(updatedInserted);
-}
-function setFragmentAsWrapChange(inserted, attrs, schema) {
-    const content = [];
-    inserted.forEach((node) => {
-        content.push(node.type.create(Object.assign(Object.assign({}, node.attrs), { dataTracked: [(0, nodeHelpers_1.addTrackIdIfDoesntExist)(trackUtils.createNewWrapAttrs(attrs))] }), setFragmentAsInserted(node.content, trackUtils.createNewInsertAttrs(attrs), schema), node.marks));
-    });
-    return prosemirror_model_1.Fragment.from(content);
-}
-function setFragmentAsMoveChange(fragment, moveAttrs) {
-    const content = [];
-    fragment.forEach((node) => {
-        content.push(node.type.create(Object.assign(Object.assign({}, node.attrs), { dataTracked: [(0, nodeHelpers_1.addTrackIdIfDoesntExist)(moveAttrs)] }), node.content, node.marks));
-    });
-    return prosemirror_model_1.Fragment.from(content);
-}
-function setFragmentAsNodeSplit($pos, newTr, inserted, attrs) {
-    const lastChild = inserted.lastChild;
-    const referenceId = (0, uuidv4_1.uuidv4)();
-    const parentPos = $pos.before($pos.depth);
-    const parent = $pos.node($pos.depth);
-    const oldDataTracked = (0, nodeHelpers_1.getBlockInlineTrackedData)(parent) || [];
-    newTr.setNodeMarkup(parentPos, undefined, Object.assign(Object.assign({}, parent.attrs), { dataTracked: [
-            ...oldDataTracked.filter((c) => c.operation !== 'reference'),
-            Object.assign({}, (0, nodeHelpers_1.addTrackIdIfDoesntExist)(trackUtils.createNewReferenceAttrs(Object.assign(Object.assign({}, attrs), { status: change_1.CHANGE_STATUS.pending }), referenceId))),
-        ] }));
-    const splitSource = oldDataTracked.find((c) => c.operation === 'reference');
-    const dataTracked = Object.assign(Object.assign({}, trackUtils.createNewSplitAttrs(Object.assign({}, attrs))), { id: referenceId });
-    if (lastChild.type.name === 'list_item') {
-        let firstChild = lastChild.content.firstChild;
-        firstChild = firstChild.type.create(Object.assign(Object.assign({}, lastChild.attrs), { dataTracked: splitSource ? [dataTracked, splitSource] : [dataTracked] }), firstChild.content);
-        inserted = inserted.replaceChild(inserted.childCount - 1, lastChild.type.create(lastChild.attrs, lastChild.content.cut(firstChild.nodeSize).addToStart(firstChild)));
-    }
-    else {
-        inserted = inserted.replaceChild(inserted.childCount - 1, lastChild.type.create(Object.assign(Object.assign({}, lastChild.attrs), { dataTracked: splitSource ? [dataTracked, splitSource] : [dataTracked] }), lastChild.content));
-    }
-    return inserted;
-}

package/dist/cjs/helpers/mark.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidTrackableMark = isValidTrackableMark;
+exports.equalMarks = equalMarks;
+function isValidTrackableMark(mark) {
+    var _a, _b;
+    const spec = mark.type.spec;
+    const name = mark.type.name;
+    if (!name.startsWith('tracked_') &&
+        ((_a = spec.attrs) === null || _a === void 0 ? void 0 : _a.dataTracked) &&
+        typeof ((_b = spec.attrs) === null || _b === void 0 ? void 0 : _b.dataTracked) === 'object') {
+        return true;
+    }
+    return false;
+}
+function equalMarks(n1, n2) {
+    return (n1.marks.length === n2.marks.length &&
+        n1.marks.every((mark) => n1.marks.find((m) => m.type === mark.type)));
+}

package/dist/cjs/plugin.js

@@ -14,14 +14,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackChangesPlugin = exports.trackChangesPluginKey = void 0;
 const prosemirror_state_1 = require("prosemirror-state");
 const actions_1 = require("./actions");
-const findChanges_1 = require("./changes/findChanges");
-const fixInconsistentChanges_1 = require("./changes/fixInconsistentChanges");
-const updateChangesStatus_1 = require("./changes/updateChangesStatus");
+const fixInconsistentChanges_1 = require("./changeHelpers/fixInconsistentChanges");
+const updateChangesStatus_1 = require("./changeHelpers/updateChangesStatus");
 const ChangeSet_1 = require("./ChangeSet");
-const trackTransaction_1 = require("./steps/trackTransaction");
+const findChanges_1 = require("./findChanges");
+const trackChanges_1 = require("./trackChanges");
+const transactionProcessing_1 = require("./tracking/transactionProcessing");
 const track_1 = require("./types/track");
 const logger_1 = require("./utils/logger");
-const track_utils_1 = require("./utils/track-utils");
 exports.trackChangesPluginKey = new prosemirror_state_1.PluginKey('track-changes');
 const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous', initialStatus: track_1.TrackChangesStatus.enabled }) => {
     const { userID, debug, skipTrsWithMetas = [] } = opts;
@@ -61,7 +61,7 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous', initialStatu
                     return Object.assign(Object.assign({}, pluginState), { changeSet: new ChangeSet_1.ChangeSet() });
                 }
                 let { changeSet } = pluginState, rest = __rest(pluginState, ["changeSet"]);
-                if ((0, actions_1.getAction)(tr, actions_1.TrackChangesAction.refreshChanges) || (0, track_utils_1.trFromHistory)(tr)) {
+                if ((0, actions_1.getAction)(tr, actions_1.TrackChangesAction.refreshChanges) || (0, transactionProcessing_1.trFromHistory)(tr)) {
                     changeSet = (0, findChanges_1.findChanges)(newState);
                 }
                 return Object.assign({ changeSet }, rest);
@@ -83,31 +83,22 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous', initialStatu
             let createdTr = newState.tr, docChanged = false;
             logger_1.log.info('TRS', trs);
             trs.forEach((tr) => {
-                const wasAppended = tr.getMeta('appendedTransaction');
-                const skipMetaUsed = skipTrsWithMetas.some((m) => tr.getMeta(m) || (wasAppended === null || wasAppended === void 0 ? void 0 : wasAppended.getMeta(m)));
                 const collabRebased = tr.getMeta('rebased');
                 if (collabRebased !== undefined) {
                     (0, actions_1.setAction)(createdTr, actions_1.TrackChangesAction.refreshChanges, true);
                     docChanged = true;
                     return;
                 }
-                const setChangeStatuses = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.setChangeStatuses);
-                const skipTrackUsed = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.skipTrack) ||
-                    (wasAppended && (0, actions_1.getAction)(wasAppended, actions_1.TrackChangesAction.skipTrack));
-                if (!setChangeStatuses &&
-                    tr.docChanged &&
-                    !skipMetaUsed &&
-                    !skipTrackUsed &&
-                    !(0, track_utils_1.trFromHistory)(tr) &&
-                    !(wasAppended && tr.getMeta('origin') === 'paragraphs')) {
-                    createdTr = (0, trackTransaction_1.trackTransaction)(tr, oldState, createdTr, userID, changeSet);
-                }
-                docChanged = docChanged || tr.docChanged;
-                if (setChangeStatuses) {
-                    const { status, ids } = setChangeStatuses;
+                const setsChangeStatus = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.setChangeStatuses);
+                if (setsChangeStatus) {
+                    const { status, ids } = setsChangeStatus;
                     (0, updateChangesStatus_1.updateChangesStatus)(createdTr, changeSet, ids, status, userID, oldState);
                     (0, actions_1.setAction)(createdTr, actions_1.TrackChangesAction.refreshChanges, true);
                 }
+                else {
+                    createdTr = (0, trackChanges_1.trackChanges)(tr, createdTr, oldState, userID, skipTrsWithMetas) || createdTr;
+                }
+                docChanged = docChanged || tr.docChanged;
             });
             const changed = pluginState.changeSet.hasInconsistentData &&
                 (0, fixInconsistentChanges_1.fixInconsistentChanges)(pluginState.changeSet, userID, createdTr, oldState.schema);

package/dist/cjs/trackChanges.js

@@ -0,0 +1,47 @@
+"use strict";
+/*!
+ * © 2025 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trackChanges = trackChanges;
+const actions_1 = require("./actions");
+const processStepsBeforeTracking_1 = require("./tracking/lib/processStepsBeforeTracking");
+const trackTransaction_1 = require("./tracking/trackTransaction");
+const transactionProcessing_1 = require("./tracking/transactionProcessing");
+function trackChanges(tr, createdTr, oldState, userID, skipTrsWithMetas) {
+    var _a;
+    const wasAppended = tr.getMeta('appendedTransaction');
+    const skipMetaUsed = skipTrsWithMetas.some((m) => tr.getMeta(m) || (wasAppended === null || wasAppended === void 0 ? void 0 : wasAppended.getMeta(m)));
+    const skipTrackUsed = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.skipTrack) ||
+        (wasAppended && (0, actions_1.getAction)(wasAppended, actions_1.TrackChangesAction.skipTrack));
+    if (tr.docChanged &&
+        !skipMetaUsed &&
+        !skipTrackUsed &&
+        !(0, transactionProcessing_1.trFromHistory)(tr) &&
+        !(wasAppended && tr.getMeta('origin') === 'paragraphs')) {
+        const action = (_a = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.indentationAction)) === null || _a === void 0 ? void 0 : _a.action;
+        const trContext = {
+            action,
+            stepsByGroupIDMap: new Map(),
+        };
+        const clearedSteps = (0, processStepsBeforeTracking_1.processStepsBeforeTracking)(tr, trContext, [
+            transactionProcessing_1.getMoveOperationsSteps,
+            transactionProcessing_1.getIndentationOperationSteps,
+            transactionProcessing_1.filterMeaninglessMoveSteps,
+        ]);
+        (0, transactionProcessing_1.changeMovedToInsertsOnSourceDeletion)(tr, createdTr, trContext);
+        return (0, trackTransaction_1.trackTransaction)(tr, oldState, createdTr, userID, clearedSteps, trContext);
+    }
+}

package/dist/cjs/{change-steps → tracking/change-step}/diffChangeSteps.js

@@ -1,34 +1,29 @@
 "use strict";
+/*!
+ * © 2025 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.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.diffChangeSteps = diffChangeSteps;
 const prosemirror_model_1 = require("prosemirror-model");
-const logger_1 = require("../utils/logger");
-const matchInserted_1 = require("./matchInserted");
-function cutFragment(matched, deleted, content) {
-    const newContent = [];
-    for (let i = 0; matched <= deleted && i < content.childCount; i += 1) {
-        const child = content.child(i);
-        if (!child.isText && child.content.size > 0) {
-            const cut = cutFragment(matched + 1, deleted, child.content);
-            matched = cut[0];
-            newContent.push(...cut[1].content);
-        }
-        else if (child.isText && matched + child.nodeSize > deleted) {
-            if (deleted - matched > 0) {
-                newContent.push(child.cut(deleted - matched));
-            }
-            else {
-                newContent.push(child);
-            }
-            matched = deleted + 1;
-        }
-        else {
-            matched += child.nodeSize;
-        }
-    }
-    return [matched, prosemirror_model_1.Fragment.fromArray(newContent)];
-}
-function diffChangeSteps(deleted, inserted) {
+const fragment_1 = require("../../helpers/fragment");
+const logger_1 = require("../../utils/logger");
+const matchInserted_1 = require("../lib/matchInserted");
+function diffChangeSteps(steps) {
+    const deleted = steps.filter((s) => s.type !== 'insert-slice');
+    const inserted = steps.filter((s) => s.type === 'insert-slice');
+    logger_1.log.info('INSERT STEPS: ', inserted);
     const updated = [];
     let updatedDeleted = [...deleted];
     inserted.forEach((ins) => {
@@ -52,7 +47,7 @@ function diffChangeSteps(deleted, inserted) {
             return;
         }
         updatedDeleted = updatedDel;
-        const [_, newInserted] = cutFragment(0, matchedDeleted - deleteStart, ins.slice.content);
+        const [_, newInserted] = (0, fragment_1.cutFragment)(0, matchedDeleted - deleteStart, ins.slice.content);
         if (newInserted.size > 0) {
             updated.push(Object.assign(Object.assign({}, ins), { slice: new prosemirror_model_1.Slice(newInserted, ins.slice.openStart, ins.slice.openEnd) }));
         }

package/dist/cjs/{utils/mapChangeStep.js → tracking/change-step/mapChangeSteps.js}

@@ -1,6 +1,6 @@
 "use strict";
 /*!
- * © 2023 Atypon Systems LLC
+ * © 2025 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.

package/dist/cjs/{change-steps → tracking/change-step}/processChangeSteps.js

@@ -1,37 +1,4 @@
 "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;
-    };
-})();
 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)
@@ -46,17 +13,16 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processChangeSteps = processChangeSteps;
 const prosemirror_transform_1 = require("prosemirror-transform");
-const nodeHelpers_1 = require("../compute/nodeHelpers");
-const deleteNode_1 = require("../mutate/deleteNode");
-const deleteText_1 = require("../mutate/deleteText");
-const mergeTrackedMarks_1 = require("../mutate/mergeTrackedMarks");
-const change_1 = require("../types/change");
-const logger_1 = require("../utils/logger");
-const trackUtils = __importStar(require("../utils/track-utils"));
-function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema, deletedNodeMapping) {
+const attributes_1 = require("../../helpers/attributes");
+const change_1 = require("../../types/change");
+const logger_1 = require("../../utils/logger");
+const deleteNode_1 = require("../lib/deleteNode");
+const deleteTextIfInserted_1 = require("../lib/deleteTextIfInserted");
+const mergeTrackedMarks_1 = require("../lib/mergeTrackedMarks");
+function processChangeSteps(changes, newTr, emptyAttrs, schema, deletedNodeMapping) {
     const mapping = new prosemirror_transform_1.Mapping();
-    const deleteAttrs = trackUtils.createNewDeleteAttrs(emptyAttrs);
-    let selectionPos = startPos;
+    const deleteAttrs = (0, attributes_1.createNewDeleteAttrs)(emptyAttrs);
+    let selectionPos = undefined;
     let deletesCounter = 0;
     let isInserted = false;
     let prevDelete;
@@ -66,7 +32,7 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema, delete
             case 'delete-node': {
                 deletesCounter++;
                 const prevDeletedNodeInserted = isInserted;
-                const trackedData = (0, nodeHelpers_1.getBlockInlineTrackedData)(c.node);
+                const trackedData = (0, attributes_1.getBlockInlineTrackedData)(c.node);
                 const inserted = trackedData === null || trackedData === void 0 ? void 0 : trackedData.find((d) => d.operation === change_1.CHANGE_OPERATION.insert || d.operation === change_1.CHANGE_OPERATION.wrap_with_node);
                 const structure = trackedData === null || trackedData === void 0 ? void 0 : trackedData.find((c) => c.operation === change_1.CHANGE_OPERATION.structure &&
                     deleteAttrs.moveNodeId &&
@@ -111,7 +77,7 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema, delete
                     logger_1.log.error(`processChangeSteps: no text node found for text-change`, c);
                     return;
                 }
-                const where = (0, deleteText_1.deleteTextIfInserted)(node, mapping.map(c.pos), newTr, schema, deleteAttrs, mapping.map(c.from), mapping.map(c.to));
+                const where = (0, deleteTextIfInserted_1.deleteTextIfInserted)(node, mapping.map(c.pos), newTr, schema, deleteAttrs, mapping.map(c.from), mapping.map(c.to));
                 const textNewestStep = newTr.steps[newTr.steps.length - 1];
                 if (node.marks.find((m) => m.type === schema.marks.tracked_insert)) {
                     deletedNodeMapping.appendMap(textNewestStep.getMap());
@@ -126,7 +92,7 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema, delete
             case 'merge-fragment': {
                 let insertPos = mapping.map(c.mergePos);
                 if (c.node.isText) {
-                    insertPos = (0, deleteText_1.deleteTextIfInserted)(c.node, mapping.map(c.pos), newTr, schema, deleteAttrs, mapping.map(c.from), mapping.map(c.to));
+                    insertPos = (0, deleteTextIfInserted_1.deleteTextIfInserted)(c.node, mapping.map(c.pos), newTr, schema, deleteAttrs, mapping.map(c.from), mapping.map(c.to));
                     const newestStep = newTr.steps[newTr.steps.length - 1];
                     if (c.node.marks.find((m) => m.type === schema.marks.tracked_insert)) {
                         deletedNodeMapping.appendMap(newestStep.getMap());
@@ -155,7 +121,7 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema, delete
                 break;
             }
             case 'update-node-attrs': {
-                const oldDataTracked = (0, nodeHelpers_1.getBlockInlineTrackedData)(c.node) || [];
+                const oldDataTracked = (0, attributes_1.getBlockInlineTrackedData)(c.node) || [];
                 const oldUpdate = oldDataTracked.reverse().find((d) => {
                     if (d.operation === change_1.CHANGE_OPERATION.set_node_attributes && d.status === change_1.CHANGE_STATUS.pending) {
                         return true;
@@ -166,7 +132,7 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema, delete
                 const oldAttrs = restAttrs;
                 const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
                 const newUpdate = oldUpdate && oldUpdate.status !== change_1.CHANGE_STATUS.rejected
-                    ? Object.assign(Object.assign({}, oldUpdate), { updatedAt: emptyAttrs.updatedAt }) : (0, nodeHelpers_1.addTrackIdIfDoesntExist)(trackUtils.createNewUpdateAttrs(emptyAttrs, c.node.attrs));
+                    ? Object.assign(Object.assign({}, oldUpdate), { updatedAt: emptyAttrs.updatedAt }) : (0, attributes_1.addTrackIdIfDoesntExist)((0, attributes_1.createNewUpdateAttrs)(emptyAttrs, c.node.attrs));
                 if ((JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) ||
                     c.node.type === c.node.type.schema.nodes.citation) &&
                     !oldDataTracked.find((d) => (d.operation === change_1.CHANGE_OPERATION.insert || d.operation === change_1.CHANGE_OPERATION.wrap_with_node) &&

package/dist/cjs/tracking/fixAndHandleSelection.js

@@ -0,0 +1,54 @@
+"use strict";
+/*!
+ * © 2025 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSelectionStaticConstructor = void 0;
+exports.fixAndSetSelectionAfterTracking = fixAndSetSelectionAfterTracking;
+const prosemirror_state_1 = require("prosemirror-state");
+const prosemirror_transform_1 = require("prosemirror-transform");
+const structureChange_1 = require("../changeHelpers/structureChange");
+const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
+exports.getSelectionStaticConstructor = getSelectionStaticConstructor;
+function fixAndSetSelectionAfterTracking(newTr, oldTr, deletedNodeMapping, trContext) {
+    const wasNodeSelection = oldTr.selection instanceof prosemirror_state_1.NodeSelection;
+    if (!wasNodeSelection && !oldTr.selectionSet && trContext.selectionPosFromInsertion) {
+        const sel = (0, exports.getSelectionStaticConstructor)(oldTr.selection);
+        const near = sel.near(newTr.doc.resolve(trContext.selectionPosFromInsertion), -1);
+        newTr.setSelection(near);
+    }
+    if (oldTr.selectionSet && oldTr.selection instanceof prosemirror_state_1.TextSelection) {
+        let from = oldTr.selection.from;
+        if ((0, structureChange_1.isStructuralChange)(oldTr)) {
+            const selectionMapping = new prosemirror_transform_1.Mapping();
+            oldTr.steps.map((step) => {
+                const isDeleteStep = step instanceof prosemirror_transform_1.ReplaceStep && step.from !== step.to && step.slice.size === 0;
+                if (isDeleteStep) {
+                    selectionMapping.appendMap(step.getMap().invert());
+                }
+            });
+            selectionMapping.appendMapping(deletedNodeMapping);
+            from = selectionMapping.map(oldTr.selection.from);
+        }
+        const newPos = newTr.doc.resolve(from);
+        newTr.setSelection(new prosemirror_state_1.TextSelection(newPos));
+    }
+    if (wasNodeSelection) {
+        const mappedPos = newTr.mapping.map(oldTr.selection.from, -1);
+        const sel = (0, exports.getSelectionStaticConstructor)(oldTr.selection);
+        newTr.setSelection(sel.create(newTr.doc, mappedPos));
+    }
+    return newTr;
+}

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

@@ -1,45 +1,12 @@
 "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.deleteAndMergeSplitNodes = deleteAndMergeSplitNodes;
 const prosemirror_model_1 = require("prosemirror-model");
-const setFragmentAsInserted_1 = require("../compute/setFragmentAsInserted");
-const splitSliceIntoMergedParts_1 = require("../compute/splitSliceIntoMergedParts");
-const utils_1 = require("../steps/utils");
-const trackUtils = __importStar(require("../utils/track-utils"));
-function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackAttrs, insertSlice) {
+const attributes_1 = require("../../helpers/attributes");
+const fragment_1 = require("../../helpers/fragment");
+const qualifiers_1 = require("../steps-trackers/qualifiers");
+const splitSliceIntoMergedParts_1 = require("./splitSliceIntoMergedParts");
+function deleteAndMergeSplitNodes(from, to, gap, startDoc, schema, trackAttrs, insertSlice) {
     const steps = [];
     if (from === to) {
         return {
@@ -70,7 +37,7 @@ function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackA
                 const mergeEndNode = startTokenDeleted && openEnd > 0 && depth === openEnd && mergeContent;
                 const mergeEndNodeNotEmpty = mergeEndNode && mergeContent.size;
                 if (mergeEndNode && !mergeEndNodeNotEmpty && gap) {
-                    if ((0, utils_1.stepIsLift)(gap, node, to)) {
+                    if ((0, qualifiers_1.isLiftStepForGap)(gap, node, to)) {
                         gap.slice.content.forEach((node, offset) => {
                             steps.push({
                                 type: 'delete-node',
@@ -89,7 +56,7 @@ function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackA
                         from,
                         to,
                         node,
-                        fragment: (0, setFragmentAsInserted_1.setFragmentAsInserted)(mergeContent, trackUtils.createNewInsertAttrs(trackAttrs), schema),
+                        fragment: (0, fragment_1.setFragmentAsInserted)(mergeContent, (0, attributes_1.createNewInsertAttrs)(trackAttrs), schema),
                     });
                 }
                 else if (node.isText) {