@manuscripts/track-changes-plugin 1.7.5 → 1.7.6-LEAN-3407

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 (7) hide show
  1. package/dist/cjs/ChangeSet.js +4 -1
  2. package/dist/cjs/changes/applyChanges.js +1 -1
  3. package/dist/cjs/changes/fixInconsistentChanges.js +2 -1
  4. package/dist/es/ChangeSet.js +4 -1
  5. package/dist/es/changes/applyChanges.js +1 -1
  6. package/dist/es/changes/fixInconsistentChanges.js +2 -1
  7. package/package.json +2 -2
package/dist/cjs/ChangeSet.js CHANGED
@@ -30,7 +30,10 @@ class ChangeSet {
30
30
  });
31
31
  }
32
32
  get invalidChanges() {
33
- return __classPrivateFieldGet(this, _ChangeSet_changes, "f").filter((c) => !this.changes.find((cc) => c.id === cc.id));
33
+ const invalid = __classPrivateFieldGet(this, _ChangeSet_changes, "f").filter((c) => {
34
+ return !this.changes.includes(c);
35
+ });
36
+ return invalid;
34
37
  }
35
38
  get changeTree() {
36
39
  const rootNodes = [];
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, c2) => c1.dataTracked.updatedAt - c2.dataTracked.updatedAt);
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/changes/fixInconsistentChanges.js CHANGED
@@ -6,10 +6,11 @@ const uuidv4_1 = require("../utils/uuidv4");
6
6
  const updateChangeAttrs_1 = require("./updateChangeAttrs");
7
7
  function fixInconsistentChanges(changeSet, currentUserID, newTr, schema) {
8
8
  const iteratedIds = new Set();
9
+ const validIds = new Set(changeSet.changes.map((c) => c.id));
9
10
  let changed = false;
10
11
  changeSet.invalidChanges.forEach((c) => {
11
12
  const { id, authorID, operation, reviewedByID, status, createdAt, statusUpdateAt, updatedAt } = c.dataTracked;
12
- const newAttrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ((!id || iteratedIds.has(id) || id.length === 0) && { id: (0, uuidv4_1.uuidv4)() })), (!authorID && { authorID: currentUserID })), (!reviewedByID && { reviewedByID: null })), (!status && { status: change_1.CHANGE_STATUS.pending })), (!createdAt && { createdAt: Date.now() })), (!updatedAt && { updatedAt: Date.now() })), (!statusUpdateAt && { statusUpdateAt: 0 }));
13
+ const newAttrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ((!id || iteratedIds.has(id) || validIds.has(id) || id.length === 0) && { id: (0, uuidv4_1.uuidv4)() })), (!authorID && { authorID: currentUserID })), (!reviewedByID && { reviewedByID: null })), (!status && { status: change_1.CHANGE_STATUS.pending })), (!createdAt && { createdAt: Date.now() })), (!updatedAt && { updatedAt: Date.now() })), (!statusUpdateAt && { statusUpdateAt: 0 }));
13
14
  if (Object.keys(newAttrs).length > 0) {
14
15
  (0, updateChangeAttrs_1.updateChangeAttrs)(newTr, c, Object.assign(Object.assign({}, c.dataTracked), newAttrs), schema);
15
16
  changed = true;
package/dist/es/ChangeSet.js CHANGED
@@ -27,7 +27,10 @@ export class ChangeSet {
27
27
  });
28
28
  }
29
29
  get invalidChanges() {
30
- return __classPrivateFieldGet(this, _ChangeSet_changes, "f").filter((c) => !this.changes.find((cc) => c.id === cc.id));
30
+ const invalid = __classPrivateFieldGet(this, _ChangeSet_changes, "f").filter((c) => {
31
+ return !this.changes.includes(c);
32
+ });
33
+ return invalid;
31
34
  }
32
35
  get changeTree() {
33
36
  const rootNodes = [];
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, c2) => c1.dataTracked.updatedAt - c2.dataTracked.updatedAt);
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/changes/fixInconsistentChanges.js CHANGED
@@ -3,10 +3,11 @@ import { uuidv4 } from '../utils/uuidv4';
3
3
  import { updateChangeAttrs } from './updateChangeAttrs';
4
4
  export function fixInconsistentChanges(changeSet, currentUserID, newTr, schema) {
5
5
  const iteratedIds = new Set();
6
+ const validIds = new Set(changeSet.changes.map((c) => c.id));
6
7
  let changed = false;
7
8
  changeSet.invalidChanges.forEach((c) => {
8
9
  const { id, authorID, operation, reviewedByID, status, createdAt, statusUpdateAt, updatedAt } = c.dataTracked;
9
- const newAttrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ((!id || iteratedIds.has(id) || id.length === 0) && { id: uuidv4() })), (!authorID && { authorID: currentUserID })), (!reviewedByID && { reviewedByID: null })), (!status && { status: CHANGE_STATUS.pending })), (!createdAt && { createdAt: Date.now() })), (!updatedAt && { updatedAt: Date.now() })), (!statusUpdateAt && { statusUpdateAt: 0 }));
10
+ const newAttrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ((!id || iteratedIds.has(id) || validIds.has(id) || id.length === 0) && { id: uuidv4() })), (!authorID && { authorID: currentUserID })), (!reviewedByID && { reviewedByID: null })), (!status && { status: CHANGE_STATUS.pending })), (!createdAt && { createdAt: Date.now() })), (!updatedAt && { updatedAt: Date.now() })), (!statusUpdateAt && { statusUpdateAt: 0 }));
10
11
  if (Object.keys(newAttrs).length > 0) {
11
12
  updateChangeAttrs(newTr, c, Object.assign(Object.assign({}, c.dataTracked), newAttrs), schema);
12
13
  changed = true;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manuscripts/track-changes-plugin",
3
- "version": "1.7.5",
3
+ "version": "1.7.6-LEAN-3407",
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",