@manuscripts/track-changes-plugin 0.4.3 → 0.4.4-LEAN-1839

package/dist/index.cjs

@@ -1140,27 +1140,6 @@ function trackReplaceAroundStep(step, oldState, newTr, attrs) {
     log.info('###### ReplaceAroundStep ######');
     // @ts-ignore
     const { from, to, gapFrom, gapTo, insert, slice, structure, } = step;
-    if (from === gapFrom && to === gapTo) {
-        log.info('WRAPPED IN SOMETHING');
-    }
-    else if (!slice.size || slice.content.content.length === 2) {
-        log.info('UNWRAPPED FROM SOMETHING');
-    }
-    else if (slice.size === 2 && gapFrom - from === 1 && to - gapTo === 1) {
-        log.info('REPLACED WRAPPING');
-    }
-    else {
-        log.info('????');
-    }
-    if (gapFrom - from > to - gapTo) {
-        log.info('DELETED BEFORE GAP FROM');
-    }
-    else if (gapFrom - from < to - gapTo) {
-        log.info('DELETED AFTER GAP TO');
-    }
-    else {
-        log.info('EQUAL REPLACE BETWEEN GAPS');
-    }
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     const newStep = step.invert(oldState.doc);
     const stepResult = newTr.maybeStep(newStep);
@@ -1639,6 +1618,7 @@ function diffChangeSteps(deleted, inserted) {
  * @returns
  */
 const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
+const isHighlightMarkerNode = (node) => node.type === node.type.schema.nodes.highlight_marker;
 /**
  * Inverts transactions to wrap their contents/operations with track data instead
  *
@@ -1668,6 +1648,7 @@ function trackTransaction(tr, oldState, newTr, authorID) {
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
     tr.steps.forEach((step) => {
+        var _a, _b;
         log.info('transaction step', step);
         iters += 1;
         if (iters > 20) {
@@ -1682,6 +1663,12 @@ function trackTransaction(tr, oldState, newTr, authorID) {
         }
         else if (step instanceof prosemirrorTransform.ReplaceStep) {
             let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs);
+            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 &&
+                isHighlightMarkerNode(slice.content.content[0])) {
+                // don't track highlight marker nodes
+                return;
+            }
             log.info('CHANGES: ', steps);
             // deleted and merged really...
             const deleted = steps.filter((s) => s.type !== 'insert-slice');

package/dist/index.js

@@ -1132,27 +1132,6 @@ function trackReplaceAroundStep(step, oldState, newTr, attrs) {
     log.info('###### ReplaceAroundStep ######');
     // @ts-ignore
     const { from, to, gapFrom, gapTo, insert, slice, structure, } = step;
-    if (from === gapFrom && to === gapTo) {
-        log.info('WRAPPED IN SOMETHING');
-    }
-    else if (!slice.size || slice.content.content.length === 2) {
-        log.info('UNWRAPPED FROM SOMETHING');
-    }
-    else if (slice.size === 2 && gapFrom - from === 1 && to - gapTo === 1) {
-        log.info('REPLACED WRAPPING');
-    }
-    else {
-        log.info('????');
-    }
-    if (gapFrom - from > to - gapTo) {
-        log.info('DELETED BEFORE GAP FROM');
-    }
-    else if (gapFrom - from < to - gapTo) {
-        log.info('DELETED AFTER GAP TO');
-    }
-    else {
-        log.info('EQUAL REPLACE BETWEEN GAPS');
-    }
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     const newStep = step.invert(oldState.doc);
     const stepResult = newTr.maybeStep(newStep);
@@ -1631,6 +1610,7 @@ function diffChangeSteps(deleted, inserted) {
  * @returns
  */
 const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
+const isHighlightMarkerNode = (node) => node.type === node.type.schema.nodes.highlight_marker;
 /**
  * Inverts transactions to wrap their contents/operations with track data instead
  *
@@ -1660,6 +1640,7 @@ function trackTransaction(tr, oldState, newTr, authorID) {
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
     tr.steps.forEach((step) => {
+        var _a, _b;
         log.info('transaction step', step);
         iters += 1;
         if (iters > 20) {
@@ -1674,6 +1655,12 @@ function trackTransaction(tr, oldState, newTr, authorID) {
         }
         else if (step instanceof ReplaceStep) {
             let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs);
+            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 &&
+                isHighlightMarkerNode(slice.content.content[0])) {
+                // don't track highlight marker nodes
+                return;
+            }
             log.info('CHANGES: ', steps);
             // deleted and merged really...
             const deleted = steps.filter((s) => s.type !== 'insert-slice');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "0.4.3",
+  "version": "0.4.4-LEAN-1839",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-quarterback/tree/main/quarterback-packages/track-changes-plugin",
@@ -11,7 +11,10 @@
   "exports": {
     "./package.json": "./package.json",
     "./src/styles.css": "./src/styles.css",
-    ".": "./dist/index.js"
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
   },
   "files": [
     "dist",