@manuscripts/track-changes-plugin 1.10.8-LEAN-4160.0 → 1.10.8

package/dist/cjs/steps/trackTransaction.js

@@ -20,20 +20,6 @@ const trackReplaceAroundStep_1 = require("./trackReplaceAroundStep");
 const trackReplaceStep_1 = require("./trackReplaceStep");
 const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
 const isHighlightMarkerNode = (node) => node && node.type === node.type.schema.nodes.highlight_marker;
-function isSimplePendingMoveDeletion(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;
-    }
-    const trackedAttrs = node.attrs.dataTracked;
-    return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === change_1.CHANGE_OPERATION.move && t.status === change_1.CHANGE_STATUS.pending));
-}
 function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
     var _a, _b, _c, _d, _e;
     const emptyAttrs = {
@@ -51,35 +37,8 @@ function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
     logger_1.log.info('ORIGINAL transaction', tr);
     let trContext = {};
     const movingStepsAssociated = (0, track_utils_1.HasMoveOperations)(tr);
-    tr.steps.forEach((step) => {
-        var _a;
-        if (step instanceof prosemirror_transform_1.ReplaceStep) {
-            const doc = tr.docs[tr.steps.indexOf(step)];
-            if (isSimplePendingMoveDeletion(step, doc, movingStepsAssociated)) {
-                const node = doc.nodeAt(step.from);
-                (_a = node === null || node === void 0 ? void 0 : node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.forEach((tracked) => {
-                    if (tracked.operation === change_1.CHANGE_OPERATION.move && tracked.status === change_1.CHANGE_STATUS.pending) {
-                        newTr.setNodeMarkup(step.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: node.attrs.dataTracked.map((t) => t.id === tracked.id ? Object.assign(Object.assign({}, t), { status: change_1.CHANGE_STATUS.rejected }) : t) }));
-                    }
-                });
-            }
-        }
-    });
-    const cleanSteps = [];
-    for (let i = 0; i < tr.steps.length; i++) {
-        const step = tr.steps[i];
-        const moveID = movingStepsAssociated.get(step);
-        const prevMoveID = (0, track_utils_1.isDeletingPendingMovedNode)(step, tr.docs[i]);
-        if (moveID && prevMoveID) {
-            movingStepsAssociated.forEach((replaceStepMoveID, replaceStep) => {
-                if (replaceStep !== step && moveID === replaceStepMoveID) {
-                    movingStepsAssociated.set(replaceStep, prevMoveID);
-                }
-            });
-            continue;
-        }
-        cleanSteps.push(step);
-    }
+    (0, track_utils_1.handleDirectPendingMoveDeletions)(tr, newTr, movingStepsAssociated);
+    const cleanSteps = (0, track_utils_1.filterMeaninglessMoveSteps)(tr, movingStepsAssociated);
     for (let i = cleanSteps.length - 1; i >= 0; i--) {
         const step = tr.steps[i];
         logger_1.log.info('transaction step', step);

package/dist/cjs/utils/track-utils.js

@@ -11,7 +11,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDeletingPendingMovedNode = exports.HasMoveOperations = exports.trFromHistory = exports.stepIsLift = exports.isLiftStep = exports.isWrapStep = exports.isSplitStep = exports.createNewUpdateAttrs = exports.createNewMoveAttrs = exports.createNewDeleteAttrs = exports.createNewReferenceAttrs = exports.createNewSplitAttrs = exports.createNewWrapAttrs = exports.createNewInsertAttrs = void 0;
+exports.filterMeaninglessMoveSteps = exports.handleDirectPendingMoveDeletions = exports.isDirectPendingMoveDeletion = exports.isDeletingPendingMovedNode = exports.HasMoveOperations = exports.trFromHistory = exports.stepIsLift = exports.isLiftStep = exports.isWrapStep = exports.isSplitStep = exports.createNewUpdateAttrs = exports.createNewMoveAttrs = exports.createNewDeleteAttrs = exports.createNewReferenceAttrs = exports.createNewSplitAttrs = exports.createNewWrapAttrs = exports.createNewInsertAttrs = void 0;
+const prosemirror_transform_1 = require("prosemirror-transform");
 const change_1 = require("../types/change");
 const uuidv4_1 = require("./uuidv4");
 function createNewInsertAttrs(attrs) {
@@ -157,3 +158,51 @@ const isDeletingPendingMovedNode = (step, doc) => {
     return undefined;
 };
 exports.isDeletingPendingMovedNode = isDeletingPendingMovedNode;
+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;
+    }
+    const trackedAttrs = node.attrs.dataTracked;
+    return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === change_1.CHANGE_OPERATION.move && t.status === change_1.CHANGE_STATUS.pending));
+};
+exports.isDirectPendingMoveDeletion = isDirectPendingMoveDeletion;
+const handleDirectPendingMoveDeletions = (tr, newTr, movingSteps) => {
+    tr.steps.forEach((step) => {
+        if (step instanceof prosemirror_transform_1.ReplaceStep) {
+            const doc = tr.docs[tr.steps.indexOf(step)];
+            if ((0, exports.isDirectPendingMoveDeletion)(step, doc, movingSteps)) {
+                const node = doc.nodeAt(step.from);
+                if (node === null || node === void 0 ? void 0 : node.attrs.dataTracked) {
+                    newTr.setNodeMarkup(step.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: node.attrs.dataTracked.filter((t) => !(t.operation === change_1.CHANGE_OPERATION.move && t.status === change_1.CHANGE_STATUS.pending)) }));
+                }
+            }
+        }
+    });
+};
+exports.handleDirectPendingMoveDeletions = handleDirectPendingMoveDeletions;
+const filterMeaninglessMoveSteps = (tr, movingSteps) => {
+    const cleanSteps = [];
+    for (let i = 0; i < tr.steps.length; i++) {
+        const step = tr.steps[i];
+        const moveID = movingSteps.get(step);
+        const prevMoveID = (0, exports.isDeletingPendingMovedNode)(step, tr.docs[i]);
+        if (moveID && prevMoveID) {
+            movingSteps.forEach((replaceStepMoveID, replaceStep) => {
+                if (replaceStep !== step && moveID === replaceStepMoveID) {
+                    movingSteps.set(replaceStep, prevMoveID);
+                }
+            });
+            continue;
+        }
+        cleanSteps.push(step);
+    }
+    return cleanSteps;
+};
+exports.filterMeaninglessMoveSteps = filterMeaninglessMoveSteps;

package/dist/es/steps/trackTransaction.js

@@ -4,30 +4,16 @@ import { diffChangeSteps } from '../change-steps/diffChangeSteps';
 import { processChangeSteps } from '../change-steps/processChangeSteps';
 import { updateChangeAttrs } from '../changes/updateChangeAttrs';
 import { getNodeTrackedData } from '../compute/nodeHelpers';
-import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
+import { CHANGE_STATUS } from '../types/change';
 import { log } from '../utils/logger';
 import { mapChangeSteps } from '../utils/mapChangeStep';
-import { HasMoveOperations, isDeletingPendingMovedNode } from '../utils/track-utils';
+import { filterMeaninglessMoveSteps, handleDirectPendingMoveDeletions, HasMoveOperations, } from '../utils/track-utils';
 import { uuidv4 } from '../utils/uuidv4';
 import trackAttrsChange from './trackAttrsChange';
 import { trackReplaceAroundStep } from './trackReplaceAroundStep';
 import { trackReplaceStep } from './trackReplaceStep';
 const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
 const isHighlightMarkerNode = (node) => node && node.type === node.type.schema.nodes.highlight_marker;
-function isSimplePendingMoveDeletion(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;
-    }
-    const trackedAttrs = node.attrs.dataTracked;
-    return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === CHANGE_OPERATION.move && t.status === CHANGE_STATUS.pending));
-}
 export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
     var _a, _b, _c, _d, _e;
     const emptyAttrs = {
@@ -45,35 +31,8 @@ export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
     log.info('ORIGINAL transaction', tr);
     let trContext = {};
     const movingStepsAssociated = HasMoveOperations(tr);
-    tr.steps.forEach((step) => {
-        var _a;
-        if (step instanceof ReplaceStep) {
-            const doc = tr.docs[tr.steps.indexOf(step)];
-            if (isSimplePendingMoveDeletion(step, doc, movingStepsAssociated)) {
-                const node = doc.nodeAt(step.from);
-                (_a = node === null || node === void 0 ? void 0 : node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.forEach((tracked) => {
-                    if (tracked.operation === CHANGE_OPERATION.move && tracked.status === CHANGE_STATUS.pending) {
-                        newTr.setNodeMarkup(step.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: node.attrs.dataTracked.map((t) => t.id === tracked.id ? Object.assign(Object.assign({}, t), { status: CHANGE_STATUS.rejected }) : t) }));
-                    }
-                });
-            }
-        }
-    });
-    const cleanSteps = [];
-    for (let i = 0; i < tr.steps.length; i++) {
-        const step = tr.steps[i];
-        const moveID = movingStepsAssociated.get(step);
-        const prevMoveID = isDeletingPendingMovedNode(step, tr.docs[i]);
-        if (moveID && prevMoveID) {
-            movingStepsAssociated.forEach((replaceStepMoveID, replaceStep) => {
-                if (replaceStep !== step && moveID === replaceStepMoveID) {
-                    movingStepsAssociated.set(replaceStep, prevMoveID);
-                }
-            });
-            continue;
-        }
-        cleanSteps.push(step);
-    }
+    handleDirectPendingMoveDeletions(tr, newTr, movingStepsAssociated);
+    const cleanSteps = filterMeaninglessMoveSteps(tr, movingStepsAssociated);
     for (let i = cleanSteps.length - 1; i >= 0; i--) {
         const step = tr.steps[i];
         log.info('transaction step', step);

package/dist/es/utils/track-utils.js

@@ -9,6 +9,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+import { ReplaceStep } from 'prosemirror-transform';
 import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
 import { uuidv4 } from './uuidv4';
 export function createNewInsertAttrs(attrs) {
@@ -140,3 +141,48 @@ export const isDeletingPendingMovedNode = (step, doc) => {
     }
     return undefined;
 };
+export 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;
+    }
+    const trackedAttrs = node.attrs.dataTracked;
+    return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === CHANGE_OPERATION.move && t.status === CHANGE_STATUS.pending));
+};
+export const handleDirectPendingMoveDeletions = (tr, newTr, movingSteps) => {
+    tr.steps.forEach((step) => {
+        if (step instanceof ReplaceStep) {
+            const doc = tr.docs[tr.steps.indexOf(step)];
+            if (isDirectPendingMoveDeletion(step, doc, movingSteps)) {
+                const node = doc.nodeAt(step.from);
+                if (node === null || node === void 0 ? void 0 : node.attrs.dataTracked) {
+                    newTr.setNodeMarkup(step.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: node.attrs.dataTracked.filter((t) => !(t.operation === CHANGE_OPERATION.move && t.status === CHANGE_STATUS.pending)) }));
+                }
+            }
+        }
+    });
+};
+export const filterMeaninglessMoveSteps = (tr, movingSteps) => {
+    const cleanSteps = [];
+    for (let i = 0; i < tr.steps.length; i++) {
+        const step = tr.steps[i];
+        const moveID = movingSteps.get(step);
+        const prevMoveID = isDeletingPendingMovedNode(step, tr.docs[i]);
+        if (moveID && prevMoveID) {
+            movingSteps.forEach((replaceStepMoveID, replaceStep) => {
+                if (replaceStep !== step && moveID === replaceStepMoveID) {
+                    movingSteps.set(replaceStep, prevMoveID);
+                }
+            });
+            continue;
+        }
+        cleanSteps.push(step);
+    }
+    return cleanSteps;
+};

package/dist/types/utils/track-utils.d.ts

@@ -1,6 +1,6 @@
 import { Node as PMNode, Slice } from 'prosemirror-model';
 import { Selection, Transaction } from 'prosemirror-state';
-import { ReplaceAroundStep, ReplaceStep } from 'prosemirror-transform';
+import { ReplaceAroundStep, ReplaceStep, Step } from 'prosemirror-transform';
 import { NewDeleteAttrs, NewEmptyAttrs, NewInsertAttrs, NewReferenceAttrs, NewSplitNodeAttrs, NewUpdateAttrs } from '../types/track';
 export declare function createNewInsertAttrs(attrs: NewEmptyAttrs): NewInsertAttrs;
 export declare function createNewWrapAttrs(attrs: NewEmptyAttrs): NewInsertAttrs;
@@ -21,3 +21,6 @@ export declare function stepIsLift(gap: {
 export declare const trFromHistory: (tr: Transaction) => string | undefined;
 export declare const HasMoveOperations: (tr: Transaction) => Map<ReplaceStep, string>;
 export declare const isDeletingPendingMovedNode: (step: ReplaceStep, doc: PMNode) => string | undefined;
+export declare const isDirectPendingMoveDeletion: (step: ReplaceStep, doc: PMNode, movingSteps: Map<ReplaceStep, string>) => boolean;
+export declare const handleDirectPendingMoveDeletions: (tr: Transaction, newTr: Transaction, movingSteps: Map<ReplaceStep, string>) => void;
+export declare const filterMeaninglessMoveSteps: (tr: Transaction, movingSteps: Map<ReplaceStep, string>) => Step[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.10.8-LEAN-4160.0",
+  "version": "1.10.8",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",