@manuscripts/track-changes-plugin 1.10.9-LEAN-2023.0 → 1.10.9

package/dist/cjs/changes/applyChanges.js

@@ -18,7 +18,13 @@ function getUpdatedDataTracked(dataTracked, changeId) {
 }
 exports.getUpdatedDataTracked = getUpdatedDataTracked;
 function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap = new prosemirror_transform_1.Mapping()) {
-    changes.sort((c1, c2) => c1.dataTracked.updatedAt - c2.dataTracked.updatedAt);
+    changes.sort((c1, c2) => {
+        if ((c1.type === 'node-change' && c1.node.type === schema.nodes.list) ||
+            (c2.type === 'node-change' && c2.node.type === schema.nodes.list)) {
+            return 1;
+        }
+        return c1.dataTracked.updatedAt - c2.dataTracked.updatedAt;
+    });
     changes.forEach((change) => {
         if (change.dataTracked.operation === change_1.CHANGE_OPERATION.move) {
             return;
@@ -38,7 +44,7 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
                 return (0, revertChange_1.revertSplitNodeChange)(tr, change, changeSet);
             }
             if (change.dataTracked.operation === change_1.CHANGE_OPERATION.wrap_with_node) {
-                return (0, revertChange_1.revertWrapNodeChange)(tr, change);
+                return (0, revertChange_1.revertWrapNodeChange)(tr, change, deleteMap);
             }
         }
         if (ChangeSet_1.ChangeSet.isTextChange(change) && noChangeNeeded) {

package/dist/cjs/changes/revertChange.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.revertWrapNodeChange = exports.revertSplitNodeChange = void 0;
+const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_transform_1 = require("prosemirror-transform");
 const nodeHelpers_1 = require("../compute/nodeHelpers");
 const applyChanges_1 = require("./applyChanges");
@@ -26,17 +27,18 @@ function revertSplitNodeChange(tr, change, changeSet) {
     }
 }
 exports.revertSplitNodeChange = revertSplitNodeChange;
-function revertWrapNodeChange(tr, change) {
+function revertWrapNodeChange(tr, change, deleteMap) {
     const from = tr.mapping.map(change.from);
     const to = tr.mapping.map(change.to);
     const node = tr.doc.nodeAt(from);
     if (node === null || node === void 0 ? void 0 : node.isInline) {
-        tr.replaceWith(from, to, node.content);
+        tr.step(new prosemirror_transform_1.ReplaceAroundStep(from, to, from + 1, to - 1, prosemirror_model_1.Slice.empty, 0));
+        deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
     }
     else {
         tr.doc.nodesBetween(from, to, (node, pos) => {
-            const $fromPos = tr.doc.resolve(pos);
-            const $toPos = tr.doc.resolve(pos + node.nodeSize - 1);
+            const $fromPos = tr.doc.resolve(tr.mapping.map(pos));
+            const $toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1));
             const nodeRange = $fromPos.blockRange($toPos);
             if (!nodeRange) {
                 return;
@@ -44,6 +46,7 @@ function revertWrapNodeChange(tr, change) {
             const targetLiftDepth = (0, prosemirror_transform_1.liftTarget)(nodeRange);
             if (targetLiftDepth || targetLiftDepth === 0) {
                 tr.lift(nodeRange, targetLiftDepth);
+                deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
             }
         });
     }

package/dist/cjs/steps/trackTransaction.js

@@ -117,7 +117,7 @@ function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
         newTr.setSelection(new prosemirror_state_1.TextSelection(newPos));
     }
     if (wasNodeSelection) {
-        logger_1.log.info('Getting into node select!');
+        console.log('%c Getting into node select! ', 'background: #222; color: #bada55');
         const mappedPos = newTr.mapping.map(tr.selection.from, -1);
         const sel = getSelectionStaticConstructor(tr.selection);
         newTr.setSelection(sel.create(newTr.doc, mappedPos));

package/dist/es/changes/applyChanges.js

@@ -14,7 +14,13 @@ export function getUpdatedDataTracked(dataTracked, changeId) {
     return newDataTracked.length ? newDataTracked : null;
 }
 export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap = new Mapping()) {
-    changes.sort((c1, c2) => c1.dataTracked.updatedAt - c2.dataTracked.updatedAt);
+    changes.sort((c1, c2) => {
+        if ((c1.type === 'node-change' && c1.node.type === schema.nodes.list) ||
+            (c2.type === 'node-change' && c2.node.type === schema.nodes.list)) {
+            return 1;
+        }
+        return c1.dataTracked.updatedAt - c2.dataTracked.updatedAt;
+    });
     changes.forEach((change) => {
         if (change.dataTracked.operation === CHANGE_OPERATION.move) {
             return;
@@ -34,7 +40,7 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, del
                 return revertSplitNodeChange(tr, change, changeSet);
             }
             if (change.dataTracked.operation === CHANGE_OPERATION.wrap_with_node) {
-                return revertWrapNodeChange(tr, change);
+                return revertWrapNodeChange(tr, change, deleteMap);
             }
         }
         if (ChangeSet.isTextChange(change) && noChangeNeeded) {

package/dist/es/changes/revertChange.js

@@ -1,4 +1,5 @@
-import { liftTarget } from 'prosemirror-transform';
+import { Slice } from 'prosemirror-model';
+import { liftTarget, ReplaceAroundStep } from 'prosemirror-transform';
 import { getBlockInlineTrackedData } from '../compute/nodeHelpers';
 import { getUpdatedDataTracked } from './applyChanges';
 export function revertSplitNodeChange(tr, change, changeSet) {
@@ -22,17 +23,18 @@ export function revertSplitNodeChange(tr, change, changeSet) {
         tr.setNodeMarkup(tr.mapping.map(deleteChange.from), undefined, getUpdatedDataTracked(node.attrs.dataTracked, deleteChange.id));
     }
 }
-export function revertWrapNodeChange(tr, change) {
+export function revertWrapNodeChange(tr, change, deleteMap) {
     const from = tr.mapping.map(change.from);
     const to = tr.mapping.map(change.to);
     const node = tr.doc.nodeAt(from);
     if (node === null || node === void 0 ? void 0 : node.isInline) {
-        tr.replaceWith(from, to, node.content);
+        tr.step(new ReplaceAroundStep(from, to, from + 1, to - 1, Slice.empty, 0));
+        deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
     }
     else {
         tr.doc.nodesBetween(from, to, (node, pos) => {
-            const $fromPos = tr.doc.resolve(pos);
-            const $toPos = tr.doc.resolve(pos + node.nodeSize - 1);
+            const $fromPos = tr.doc.resolve(tr.mapping.map(pos));
+            const $toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1));
             const nodeRange = $fromPos.blockRange($toPos);
             if (!nodeRange) {
                 return;
@@ -40,6 +42,7 @@ export function revertWrapNodeChange(tr, change) {
             const targetLiftDepth = liftTarget(nodeRange);
             if (targetLiftDepth || targetLiftDepth === 0) {
                 tr.lift(nodeRange, targetLiftDepth);
+                deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
             }
         });
     }

package/dist/es/steps/trackTransaction.js

@@ -111,7 +111,7 @@ export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
         newTr.setSelection(new TextSelection(newPos));
     }
     if (wasNodeSelection) {
-        log.info('Getting into node select!');
+        console.log('%c Getting into node select! ', 'background: #222; color: #bada55');
         const mappedPos = newTr.mapping.map(tr.selection.from, -1);
         const sel = getSelectionStaticConstructor(tr.selection);
         newTr.setSelection(sel.create(newTr.doc, mappedPos));

package/dist/types/changes/revertChange.d.ts

@@ -1,5 +1,6 @@
 import { Transaction } from 'prosemirror-state';
+import { Mapping } from 'prosemirror-transform';
 import { ChangeSet } from '../ChangeSet';
 import { IncompleteChange } from '../types/change';
 export declare function revertSplitNodeChange(tr: Transaction, change: IncompleteChange, changeSet: ChangeSet): void;
-export declare function revertWrapNodeChange(tr: Transaction, change: IncompleteChange): void;
+export declare function revertWrapNodeChange(tr: Transaction, change: IncompleteChange, deleteMap: Mapping): void;

package/dist/types/compute/splitSliceIntoMergedParts.d.ts

@@ -1,7 +1,7 @@
 import { Node as PMNode } from 'prosemirror-model';
 import { ExposedFragment, ExposedSlice } from '../types/pm';
 export declare function splitSliceIntoMergedParts(insertSlice: ExposedSlice, mergeEqualSides?: boolean): {
-    updatedSliceNodes: readonly PMNode[] & PMNode[];
+    updatedSliceNodes: PMNode[];
     firstMergedNode: {
         mergedNodeContent: ExposedFragment;
         unmergedContent: ExposedFragment | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.10.9-LEAN-2023.0",
+  "version": "1.10.9",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",
@@ -12,10 +12,10 @@
     "src/styles.css"
   ],
   "scripts": {
-    "build": "npm-run-all --parallel build:*",
+    "build": "npm-run-all --parallel 'build:* --project tsconfig.json'",
     "build:cjs": "tsc --outDir dist/cjs --module commonjs",
     "build:es": "tsc --outDir dist/es --declarationDir dist/types --declaration",
-    "dev": "npm-run-all --parallel 'build:* --watch'",
+    "dev": "npm-run-all --parallel 'build:* --project tsconfig.json --watch'",
     "test": "jest --runInBand",
     "test-rs": "jest -i test/diff/diff.test.ts",
     "format": "prettier --write \"*.+(js|json|yml|yaml|ts|md|graphql|mdx)\" src/ test/",
@@ -24,45 +24,49 @@
     "lint:fix": "eslint --fix --ext .js,.ts, ./src ./test",
     "prepare": "husky install"
   },
-  "dependencies": {
-    "debug": "4.4.1",
-    "prosemirror-commands": "1.7.1",
-    "prosemirror-history": "1.4.1",
-    "prosemirror-model": "1.25.0",
-    "prosemirror-state": "1.4.3",
-    "prosemirror-transform": "1.10.4",
-    "prosemirror-view": "1.40.0"
-  },
   "devDependencies": {
-    "@manuscripts/eslint-config": "0.5.1",
+    "@manuscripts/eslint-config": "^0.5.1",
     "@manuscripts/transform": "3.0.48",
-    "@types/debug": "4.1.12",
-    "@types/jest": "27.5.2",
-    "@types/node": "20.17.46",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
-    "eslint": "8.57.1",
-    "eslint-config-prettier": "8.10.0",
-    "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-jest": "27.9.0",
-    "eslint-plugin-jsx-a11y": "6.10.2",
-    "eslint-plugin-mdx": "2.3.4",
-    "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-promise": "6.6.0",
-    "eslint-plugin-react": "7.37.5",
-    "eslint-plugin-react-hooks": "4.6.2",
-    "eslint-plugin-simple-import-sort": "8.0.0",
-    "husky": "8.0.3",
-    "jest": "29.7.0",
-    "jest-environment-jsdom": "29.7.0",
-    "jsdom": "26.1.0",
-    "prosemirror-example-setup": "1.2.3",
-    "prosemirror-schema-list": "1.5.1",
-    "npm-run-all": "4.1.5",
-    "prettier": "2.8.8",
-    "ts-jest": "29.3.2",
-    "typescript": "4.9.5"
+    "@types/debug": "^4.1.7",
+    "@types/jest": "27.5.1",
+    "@types/node": "^18.7.18",
+    "@typescript-eslint/eslint-plugin": "^5.47.0",
+    "@typescript-eslint/parser": "^5.47.0",
+    "eslint": "^8.46.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-header": "^3.1.1",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^27.1.7",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
+    "eslint-plugin-mdx": "2.0.4",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-react": "^7.31.11",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-simple-import-sort": "^8.0.0",
+    "husky": "^8.0.1",
+    "jest": "27.5.1",
+    "jest-environment-jsdom": "27.5.1",
+    "jsdom": "^20.0.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^2.8.1",
+    "ts-jest": "27.1.4",
+    "tslib": "^2.4.0",
+    "typescript": "^4.8.3"
+  },
+  "dependencies": {
+    "debug": "^4.3.4",
+    "prosemirror-commands": "^1.5.0",
+    "prosemirror-example-setup": "^1.2.1",
+    "prosemirror-history": "^1.4.1",
+    "prosemirror-keymap": "^1.2.0",
+    "prosemirror-model": "^1.18.3",
+    "prosemirror-schema-list": "^1.2.2",
+    "prosemirror-state": "^1.4.2",
+    "prosemirror-transform": "^1.7.0",
+    "prosemirror-view": "^1.29.1"
+  },
+  "resolutions": {
+    "eslint-mdx": "2.0.5"
   }
 }