@manuscripts/track-changes-plugin 1.10.4 → 1.10.5-LEAN-4160.0

package/dist/cjs/ChangeSet.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _ChangeSet_instances, _ChangeSet_changes, _ChangeSet_isSameNodeChange, _ChangeSet_isNotPendingOrDeleted;
+var _ChangeSet_instances, _ChangeSet_changes, _ChangeSet_isSameNodeChange, _ChangeSet_isNotPendingOrDeleted, _ChangeSet_createMoveChange;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangeSet = void 0;
 const change_1 = require("./types/change");
@@ -79,6 +79,7 @@ class ChangeSet {
     get groupChanges() {
         const rootNodes = [];
         let currentInlineChange;
+        const compositeChangesMap = new Map();
         this.changeTree.map((change, index) => {
             if (this.canJoinAdjacentInlineChanges(change, index)) {
                 currentInlineChange = currentInlineChange ? [...currentInlineChange, change] : [change];
@@ -89,6 +90,16 @@ class ChangeSet {
                 currentInlineChange = undefined;
                 return;
             }
+            if (change.dataTracked.movedChangeId) {
+                const moveChange = compositeChangesMap.get(change.dataTracked.movedChangeId);
+                if (!moveChange) {
+                    compositeChangesMap.set(change.dataTracked.movedChangeId, __classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_createMoveChange).call(this, change));
+                }
+                else {
+                    rootNodes.push([Object.assign(Object.assign({}, moveChange), { children: [...moveChange.children, change] })]);
+                }
+                return;
+            }
             rootNodes.push([change]);
         });
         return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== change_1.CHANGE_OPERATION.reference).length);
@@ -198,6 +209,9 @@ class ChangeSet {
     static isReferenceChange(change) {
         return change.type === 'reference-change';
     }
+    static isMoveChange(change) {
+        return change.type === 'move-change';
+    }
 }
 exports.ChangeSet = ChangeSet;
 _ChangeSet_changes = new WeakMap(), _ChangeSet_instances = new WeakSet(), _ChangeSet_isSameNodeChange = function _ChangeSet_isSameNodeChange(currentChange, nextChange) {
@@ -205,4 +219,18 @@ _ChangeSet_changes = new WeakMap(), _ChangeSet_instances = new WeakSet(), _Chang
 }, _ChangeSet_isNotPendingOrDeleted = function _ChangeSet_isNotPendingOrDeleted(change) {
     return (change.dataTracked.operation !== change_1.CHANGE_OPERATION.delete &&
         change.dataTracked.status !== change_1.CHANGE_STATUS.pending);
+}, _ChangeSet_createMoveChange = function _ChangeSet_createMoveChange(change) {
+    if (!ChangeSet.isNodeChange(change)) {
+        throw new Error('Expected NodeChange for move operation');
+    }
+    const node = change.node;
+    return {
+        id: change.dataTracked.movedChangeId,
+        type: 'move-change',
+        from: change.from,
+        to: change.to,
+        dataTracked: Object.assign(Object.assign({}, change.dataTracked), { operation: change_1.CHANGE_OPERATION.move }),
+        node,
+        children: [change],
+    };
 };

package/dist/cjs/steps/trackReplaceStep.js

@@ -60,7 +60,6 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
             changeSteps.splice(changeSteps.indexOf(backSpacedText));
         }
         const textWasDeleted = !!changeSteps.length && !(fromA === fromB);
-        console.log(textWasDeleted);
         if (!backSpacedText && newSliceContent.size > 0) {
             logger_1.log.info('newSliceContent', newSliceContent);
             let fragment = (0, setFragmentAsInserted_1.setFragmentAsInserted)(newSliceContent, trackUtils.createNewInsertAttrs(attrs), oldState.schema);

package/dist/cjs/steps/trackTransaction.js

@@ -35,6 +35,9 @@ function trackTransaction(tr, oldState, newTr, authorID) {
     let iters = 0;
     logger_1.log.info('ORIGINAL transaction', tr);
     let trContext = {};
+    if (tr.getMeta('NodeMove')) {
+        emptyAttrs.movedChangeId = (0, uuidv4_1.uuidv4)();
+    }
     for (let i = tr.steps.length - 1; i >= 0; i--) {
         const step = tr.steps[i];
         logger_1.log.info('transaction step', step);

package/dist/cjs/types/change.js

@@ -24,6 +24,7 @@ var CHANGE_OPERATION;
     CHANGE_OPERATION["wrap_with_node"] = "wrap_with_node";
     CHANGE_OPERATION["node_split"] = "node_split";
     CHANGE_OPERATION["reference"] = "reference";
+    CHANGE_OPERATION["move"] = "move";
 })(CHANGE_OPERATION = exports.CHANGE_OPERATION || (exports.CHANGE_OPERATION = {}));
 var CHANGE_STATUS;
 (function (CHANGE_STATUS) {

package/dist/es/ChangeSet.js

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _ChangeSet_instances, _ChangeSet_changes, _ChangeSet_isSameNodeChange, _ChangeSet_isNotPendingOrDeleted;
+var _ChangeSet_instances, _ChangeSet_changes, _ChangeSet_isSameNodeChange, _ChangeSet_isNotPendingOrDeleted, _ChangeSet_createMoveChange;
 import { CHANGE_OPERATION, CHANGE_STATUS, } from './types/change';
 import { log } from './utils/logger';
 export class ChangeSet {
@@ -76,6 +76,7 @@ export class ChangeSet {
     get groupChanges() {
         const rootNodes = [];
         let currentInlineChange;
+        const compositeChangesMap = new Map();
         this.changeTree.map((change, index) => {
             if (this.canJoinAdjacentInlineChanges(change, index)) {
                 currentInlineChange = currentInlineChange ? [...currentInlineChange, change] : [change];
@@ -86,6 +87,16 @@ export class ChangeSet {
                 currentInlineChange = undefined;
                 return;
             }
+            if (change.dataTracked.movedChangeId) {
+                const moveChange = compositeChangesMap.get(change.dataTracked.movedChangeId);
+                if (!moveChange) {
+                    compositeChangesMap.set(change.dataTracked.movedChangeId, __classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_createMoveChange).call(this, change));
+                }
+                else {
+                    rootNodes.push([Object.assign(Object.assign({}, moveChange), { children: [...moveChange.children, change] })]);
+                }
+                return;
+            }
             rootNodes.push([change]);
         });
         return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== CHANGE_OPERATION.reference).length);
@@ -195,10 +206,27 @@ export class ChangeSet {
     static isReferenceChange(change) {
         return change.type === 'reference-change';
     }
+    static isMoveChange(change) {
+        return change.type === 'move-change';
+    }
 }
 _ChangeSet_changes = new WeakMap(), _ChangeSet_instances = new WeakSet(), _ChangeSet_isSameNodeChange = function _ChangeSet_isSameNodeChange(currentChange, nextChange) {
     return currentChange.from === nextChange.from && currentChange.to === nextChange.to;
 }, _ChangeSet_isNotPendingOrDeleted = function _ChangeSet_isNotPendingOrDeleted(change) {
     return (change.dataTracked.operation !== CHANGE_OPERATION.delete &&
         change.dataTracked.status !== CHANGE_STATUS.pending);
+}, _ChangeSet_createMoveChange = function _ChangeSet_createMoveChange(change) {
+    if (!ChangeSet.isNodeChange(change)) {
+        throw new Error('Expected NodeChange for move operation');
+    }
+    const node = change.node;
+    return {
+        id: change.dataTracked.movedChangeId,
+        type: 'move-change',
+        from: change.from,
+        to: change.to,
+        dataTracked: Object.assign(Object.assign({}, change.dataTracked), { operation: CHANGE_OPERATION.move }),
+        node,
+        children: [change],
+    };
 };

package/dist/es/steps/trackReplaceStep.js

@@ -34,7 +34,6 @@ export function trackReplaceStep(step, oldState, newTr, attrs, stepResult, curre
             changeSteps.splice(changeSteps.indexOf(backSpacedText));
         }
         const textWasDeleted = !!changeSteps.length && !(fromA === fromB);
-        console.log(textWasDeleted);
         if (!backSpacedText && newSliceContent.size > 0) {
             log.info('newSliceContent', newSliceContent);
             let fragment = setFragmentAsInserted(newSliceContent, trackUtils.createNewInsertAttrs(attrs), oldState.schema);

package/dist/es/steps/trackTransaction.js

@@ -29,6 +29,9 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
     let trContext = {};
+    if (tr.getMeta('NodeMove')) {
+        emptyAttrs.movedChangeId = uuidv4();
+    }
     for (let i = tr.steps.length - 1; i >= 0; i--) {
         const step = tr.steps[i];
         log.info('transaction step', step);

package/dist/es/types/change.js

@@ -21,6 +21,7 @@ export var CHANGE_OPERATION;
     CHANGE_OPERATION["wrap_with_node"] = "wrap_with_node";
     CHANGE_OPERATION["node_split"] = "node_split";
     CHANGE_OPERATION["reference"] = "reference";
+    CHANGE_OPERATION["move"] = "move";
 })(CHANGE_OPERATION || (CHANGE_OPERATION = {}));
 export var CHANGE_STATUS;
 (function (CHANGE_STATUS) {

package/dist/types/ChangeSet.d.ts

@@ -1,4 +1,4 @@
-import { IncompleteChange, NodeAttrChange, NodeChange, ReferenceChange, TextChange, TrackedAttrs, TrackedChange } from './types/change';
+import { IncompleteChange, MoveChange, NodeAttrChange, NodeChange, ReferenceChange, TextChange, TrackedAttrs, TrackedChange } from './types/change';
 export declare class ChangeSet {
     #private;
     constructor(changes?: (TrackedChange | IncompleteChange)[]);
@@ -30,4 +30,5 @@ export declare class ChangeSet {
     static isNodeChange(change: TrackedChange): change is NodeChange;
     static isNodeAttrChange(change: TrackedChange): change is NodeAttrChange;
     static isReferenceChange(change: TrackedChange): change is ReferenceChange;
+    static isMoveChange(change: TrackedChange): change is MoveChange;
 }

package/dist/types/types/change.d.ts

@@ -20,7 +20,8 @@ export declare enum CHANGE_OPERATION {
     set_node_attributes = "set_attrs",
     wrap_with_node = "wrap_with_node",
     node_split = "node_split",
-    reference = "reference"
+    reference = "reference",
+    move = "move"
 }
 export declare enum CHANGE_STATUS {
     accepted = "accepted",
@@ -36,6 +37,7 @@ type InsertDeleteAttrs = {
     statusUpdateAt: number;
     createdAt: number;
     updatedAt: number;
+    movedChangeId?: string;
 };
 export type UpdateAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
     operation: CHANGE_OPERATION.set_node_attributes;
@@ -51,7 +53,10 @@ export type ReferenceAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
     operation: CHANGE_OPERATION.reference;
     referenceId: string;
 };
-export type TrackedAttrs = InsertDeleteAttrs | UpdateAttrs | WrapAttrs | NodeSplitAttrs | ReferenceAttrs;
+export type NodeMoveAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
+    operation: CHANGE_OPERATION.move;
+};
+export type TrackedAttrs = InsertDeleteAttrs | UpdateAttrs | WrapAttrs | NodeSplitAttrs | ReferenceAttrs | NodeMoveAttrs;
 type Change = {
     id: string;
     from: number;
@@ -85,7 +90,12 @@ export type ReferenceChange = Change & {
 export type MarkChange = Change & {
     type: 'mark-change';
 };
-export type TrackedChange = TextChange | NodeChange | NodeAttrChange | WrapChange | ReferenceChange | MarkChange;
+export type MoveChange = Change & {
+    type: 'move-change';
+    node: Node;
+    children: TrackedChange[];
+};
+export type TrackedChange = TextChange | NodeChange | NodeAttrChange | WrapChange | ReferenceChange | MoveChange | MarkChange;
 export type PartialChange<T extends TrackedChange> = Omit<T, 'dataTracked'> & {
     dataTracked: Partial<TrackedAttrs>;
 };

package/package.json

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