@manuscripts/track-changes-plugin 1.7.4 → 1.7.5-LEAN-3373-0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/cjs/changes/applyChanges.js +1 -1
  2. package/dist/cjs/mutate/deleteNode.js +1 -3
  3. package/dist/es/changes/applyChanges.js +1 -1
  4. package/dist/es/mutate/deleteNode.js +1 -3
  5. package/package.json +2 -2
package/dist/cjs/changes/applyChanges.js CHANGED
@@ -23,7 +23,6 @@ function getUpdatedDataTracked(dataTracked, changeId) {
23
23
  if (!dataTracked) {
24
24
  return null;
25
25
  }
26
- console.log(dataTracked);
27
26
  const newDataTracked = dataTracked.filter((c) => c.id !== changeId);
28
27
  return newDataTracked.length ? newDataTracked : null;
29
28
  }
@@ -33,6 +32,7 @@ function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new prose
33
32
  const arr = attrsChangesLog.get(nodeId) || attrsChangesLog.set(nodeId, []).get(nodeId);
34
33
  arr.push(changeId);
35
34
  }
35
+ changes.sort((c1) => (c1.type === 'node-attr-change' ? -1 : 0));
36
36
  changes.forEach((change) => {
37
37
  const { pos: from, deleted } = deleteMap.mapResult(change.from), node = tr.doc.nodeAt(from), noChangeNeeded = deleted || !ChangeSet_1.ChangeSet.shouldDeleteChange(change);
38
38
  if (!node) {
package/dist/cjs/mutate/deleteNode.js CHANGED
@@ -21,7 +21,6 @@ exports.deleteNode = deleteNode;
21
21
  function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
22
22
  const dataTracked = (0, nodeHelpers_1.getBlockInlineTrackedData)(node);
23
23
  const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.insert && d.status === change_1.CHANGE_STATUS.pending);
24
- const deleted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.delete);
25
24
  const updated = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.set_node_attributes);
26
25
  if (inserted && inserted.authorID === deleteAttrs.authorID) {
27
26
  return deleteNode(node, pos, newTr);
@@ -34,8 +33,7 @@ function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
34
33
  });
35
34
  return;
36
35
  }
37
- const newDeleted = deleted
38
- ? Object.assign(Object.assign({}, deleted), { updatedAt: deleteAttrs.updatedAt }) : (0, nodeHelpers_1.addTrackIdIfDoesntExist)(deleteAttrs);
36
+ const newDeleted = (0, nodeHelpers_1.addTrackIdIfDoesntExist)(deleteAttrs);
39
37
  newTr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: updated ? [newDeleted, updated] : [newDeleted] }), node.marks);
40
38
  }
41
39
  exports.deleteOrSetNodeDeleted = deleteOrSetNodeDeleted;
package/dist/es/changes/applyChanges.js CHANGED
@@ -20,7 +20,6 @@ function getUpdatedDataTracked(dataTracked, changeId) {
20
20
  if (!dataTracked) {
21
21
  return null;
22
22
  }
23
- console.log(dataTracked);
24
23
  const newDataTracked = dataTracked.filter((c) => c.id !== changeId);
25
24
  return newDataTracked.length ? newDataTracked : null;
26
25
  }
@@ -30,6 +29,7 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = ne
30
29
  const arr = attrsChangesLog.get(nodeId) || attrsChangesLog.set(nodeId, []).get(nodeId);
31
30
  arr.push(changeId);
32
31
  }
32
+ changes.sort((c1) => (c1.type === 'node-attr-change' ? -1 : 0));
33
33
  changes.forEach((change) => {
34
34
  const { pos: from, deleted } = deleteMap.mapResult(change.from), node = tr.doc.nodeAt(from), noChangeNeeded = deleted || !ChangeSet.shouldDeleteChange(change);
35
35
  if (!node) {
package/dist/es/mutate/deleteNode.js CHANGED
@@ -17,7 +17,6 @@ export function deleteNode(node, pos, tr) {
17
17
  export function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
18
18
  const dataTracked = getBlockInlineTrackedData(node);
19
19
  const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.insert && d.status === CHANGE_STATUS.pending);
20
- const deleted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.delete);
21
20
  const updated = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.set_node_attributes);
22
21
  if (inserted && inserted.authorID === deleteAttrs.authorID) {
23
22
  return deleteNode(node, pos, newTr);
@@ -30,7 +29,6 @@ export function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
30
29
  });
31
30
  return;
32
31
  }
33
- const newDeleted = deleted
34
- ? Object.assign(Object.assign({}, deleted), { updatedAt: deleteAttrs.updatedAt }) : addTrackIdIfDoesntExist(deleteAttrs);
32
+ const newDeleted = addTrackIdIfDoesntExist(deleteAttrs);
35
33
  newTr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: updated ? [newDeleted, updated] : [newDeleted] }), node.marks);
36
34
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manuscripts/track-changes-plugin",
3
- "version": "1.7.4",
3
+ "version": "1.7.5-LEAN-3373-0",
4
4
  "author": "Atypon Systems LLC",
5
5
  "license": "Apache-2.0",
6
6
  "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",
@@ -26,7 +26,7 @@
26
26
  },
27
27
  "devDependencies": {
28
28
  "@manuscripts/eslint-config": "^0.5.1",
29
- "@manuscripts/transform": "^1.5.1",
29
+ "@manuscripts/transform": "2.1.1",
30
30
  "@types/debug": "^4.1.7",
31
31
  "@types/jest": "27.5.1",
32
32
  "@types/node": "^18.7.18",