@fiduswriter/editor 0.1.20 → 0.1.22

package/dist/collab/merge/footnotes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"footnotes.d.ts","sourceRoot":"","sources":["../../../src/collab/merge/footnotes.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAElD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAA;AAG1C,qBAAa,YAAY;IACrB,IAAI,EAAE,IAAI,CAAA;IACV,SAAS,EAAE,UAAU,CAAA;IACrB,MAAM,EAAE,MAAM,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,WAAW,CAAA;IAChB,SAAS,EAAE,UAAU,GAAG,IAAI,CAAA;IAC5B,iBAAiB,EAAE,OAAO,CAAA;gBAGtB,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,MAAM,EACpB,MAAM,EAAE,MAAM;IAiBlB,UAAU,IAAI,IAAI;IAOlB,YAAY,IAAI,IAAI;IAOpB,IAAI,IAAI,IAAI;IAuCZ,KAAK,IAAI,IAAI;IAYb,gBAAgB,IAAI,IAAI;IAmBxB,aAAa,CAAC,EAAE,EAAE,WAAW,GAAG,IAAI;IAiBpC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAK3B,OAAO,IAAI,IAAI;IAOf,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAMhC,cAAc,IAAI,OAAO;CAG5B;AAED,eAAO,MAAM,gBAAgB,GAAI,iBAAiB,WAAW,KAAG,WA+B/D,CAAA"}

package/dist/collab/merge/footnotes.js

@@ -4,6 +4,13 @@ import { EditorState } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 import { trackedTransaction } from "../../track/index.js";
 export class FootnoteView {
+    node;
+    outerView;
+    getPos;
+    editor;
+    dom;
+    innerView;
+    updatedMainEditor;
     constructor(node, view, getPos, editor) {
         // We'll need these later
         this.node = node;
@@ -59,7 +66,7 @@ export class FootnoteView {
             handleDOMEvents: {
                 mousedown: () => {
                     if (this.outerView.hasFocus()) {
-                        this.innerView.focus();
+                        this.innerView?.focus();
                     }
                 }
             }
@@ -78,7 +85,7 @@ export class FootnoteView {
     }
     updateMainEditor() {
         const outerTr = this.outerView.state.tr;
-        const footnoteContent = this.innerView.state.doc
+        const footnoteContent = this.innerView?.state.doc
             .child(0)
             .toJSON().content;
         const pos = this.getPos();
@@ -95,7 +102,7 @@ export class FootnoteView {
         }
     }
     dispatchInner(tr) {
-        const trackedTr = trackedTransaction(tr, this.innerView.state, this.editor.user, !this.outerView.state.doc.attrs.tracked &&
+        const trackedTr = trackedTransaction(tr, this.innerView?.state, this.editor.user, !this.outerView.state.doc.attrs.tracked &&
             !["write-tracked", "review-tracked"].includes(this.editor.docInfo.access_rights), Date.now() - this.editor.clientTimeAdjustment);
         const { state } = this.innerView.state.applyTransaction(trackedTr);
         this.innerView.updateState(state);
@@ -111,13 +118,15 @@ export class FootnoteView {
         }
     }
     stopEvent(event) {
-        return this.innerView && this.innerView.dom.contains(event.target);
+        return this.innerView
+            ? this.innerView.dom.contains(event.target)
+            : false;
     }
     ignoreMutation() {
         return true;
     }
 }
-export const readOnlyFnEditor = footnoteElement => {
+export const readOnlyFnEditor = (footnoteElement) => {
     // This function creates a read only footnote editor for the purpose of showing the
     // footnote nodes which are drawn as part of deletion decoration.
     const newFnElement = document.createElement("div");

package/dist/collab/merge/footnotes.js.map

@@ -1 +1 @@
-{"version":3,"file":"footnotes.js","sourceRoot":"","sources":["../../../src/collab/merge/footnotes.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"footnotes.js","sourceRoot":"","sources":["../../../src/collab/merge/footnotes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,wCAAwC,CAAA;AAC/D,OAAO,EAAC,YAAY,EAAC,MAAM,gDAAgD,CAAA;AAC3E,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAK3C,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAA;AAEvD,MAAM,OAAO,YAAY;IACrB,IAAI,CAAM;IACV,SAAS,CAAY;IACrB,MAAM,CAAc;IACpB,MAAM,CAAQ;IACd,GAAG,CAAa;IAChB,SAAS,CAAmB;IAC5B,iBAAiB,CAAS;IAE1B,YACI,IAAU,EACV,IAAgB,EAChB,MAAoB,EACpB,MAAc;QAEd,yBAAyB;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QAEpB,2DAA2D;QAC3D,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;QACxC,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,eAAe,CAAA;QACpC,+CAA+C;QAC/C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACrB,4BAA4B;QAC5B,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAA;IAClC,CAAC;IAED,UAAU;QACN,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;QAClD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,EAAE,CAAA;QACf,CAAC;IACL,CAAC;IAED,YAAY;QACR,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAA;QACrD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,EAAE,CAAA;QAChB,CAAC;IACL,CAAC;IAED,IAAI;QACA,qCAAqC;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;QACnE,OAAO,CAAC,SAAS,GAAG,kBAAkB,CAAA;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CACjC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CACxC,CAAA;QACD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QACzC,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,OAAO,CAAA;QAC/B,CAAC;QAED,MAAM,GAAG,GAAG,QAAQ,CAAC,YAAY,CAAC;YAC9B,IAAI,EAAE,KAAK;YACX,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,mBAAmB;oBACzB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ;iBACpC;aACJ;SACJ,CAAC,CAAA;QAEF,sCAAsC;QACtC,IAAI,CAAC,SAAS,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE;YACrC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC;gBACtB,GAAG,EAAE,GAAG;aACX,CAAC;YACF,mBAAmB,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;YAClD,eAAe,EAAE;gBACb,SAAS,EAAE,GAAG,EAAE;oBACZ,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC;wBAC5B,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAA;oBAC3B,CAAC;gBACL,CAAC;aACJ;SACJ,CAAC,CAAA;IACN,CAAC;IAED,KAAK;QACD,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5C,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC3B,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAA;YACxB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YACrB,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,EAAE,CAAA;YACzB,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAA;QAClC,CAAC;IACL,CAAC;IAED,gBAAgB;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAA;QACvC,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG;aAC5C,KAAK,CAAC,CAAC,CAAC;aACR,MAAM,EAAE,CAAC,OAAO,CAAA;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;QACzB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpC,IAAI,IAAI,EAAE,CAAC;YACP,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE;gBAClC,QAAQ,EAAE,eAAe;aAC5B,CAAC,CAAA;QACN,CAAC;QACD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAA;YACrC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAA;YAC7B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QACpC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,EAAe;QACzB,MAAM,SAAS,GAAG,kBAAkB,CAChC,EAAE,EACF,IAAI,CAAC,SAAS,EAAE,KAAoB,EACpC,IAAI,CAAC,MAAM,CAAC,IAAI,EAChB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO;YACnC,CAAC,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CACzC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAuB,CAC9C,EACL,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAChD,CAAA;QACD,MAAM,EAAC,KAAK,EAAC,GAAI,IAAI,CAAC,SAAwB,CAAC,KAAK,CAAC,gBAAgB,CACjE,SAAS,CACZ,CACA;QAAC,IAAI,CAAC,SAAwB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IACtD,CAAC;IAED,MAAM,CAAC,IAAU;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,OAAO,IAAI,CAAA;IACf,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,GAAG,IAA6B,CAAA;QAC9C,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,EAAE,CAAA;QAChB,CAAC;IACL,CAAC;IAED,SAAS,CAAC,KAAY;QAClB,OAAO,IAAI,CAAC,SAAS;YACjB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAyB,CAAC;YAC9D,CAAC,CAAC,KAAK,CAAA;IACf,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,eAA4B,EAAe,EAAE;IAC1E,mFAAmF;IACnF,iEAAiE;IACjE,MAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IAClD,YAAY,CAAC,SAAS,GAAG,eAAe,CAAA;IACxC,YAAY,CAAC,OAAO,CAAC,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,QAAkB,CAAA;IAC1E,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;IACvE,OAAO,CAAC,SAAS,GAAG,kBAAkB,CAAA;IACtC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IACrC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAA;IAE9B,6BAA6B;IAC7B,MAAM,GAAG,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC9B,IAAI,EAAE,KAAK;QACX,OAAO,EAAE;YACL;gBACI,IAAI,EAAE,mBAAmB;gBACzB,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,QAAkB,CAAC;aACpE;SACJ;KACJ,CAAC,CAAA;IAEF,6CAA6C;IAC7C,IAAI,UAAU,CAAC,OAAO,EAAE;QACpB,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC;YACtB,GAAG,EAAE,GAAG;SACX,CAAC;QACF,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK;KACxB,CAAC,CAAA;IAEF,OAAO,YAAY,CAAA;AACvB,CAAC,CAAA"}

package/dist/collab/merge/index.d.ts

@@ -0,0 +1,32 @@
+import type { Node } from "prosemirror-model";
+import { type Selection } from "prosemirror-state";
+import { Transform } from "prosemirror-transform";
+import type { BibDB, ExportDoc, ImageDB } from "@fiduswriter/document";
+import { MergeEditor } from "./editor.js";
+import { ModCollab } from "../index.js";
+interface MergeMessage {
+    ds?: unknown[];
+    cid?: number;
+}
+interface MergeData {
+    doc: {
+        v: number;
+        content: Record<string, unknown>;
+        comments: Record<string, unknown>;
+        bibliography: BibDB;
+        images: ImageDB;
+    };
+    m?: MergeMessage[];
+}
+export declare class Merge {
+    mod: ModCollab;
+    trackOfflineLimit: number;
+    remoteTrackOfflineLimit: number;
+    constructor(mod: ModCollab);
+    adjustDocument(data: MergeData): void;
+    autoMerge(unconfirmedTr: Transform, lostTr: Transform, data: MergeData, selection: Selection): void;
+    getDocData(offlineDoc: Node): ExportDoc;
+    handleMergeFailure(error: Error, offlineDoc: Node, _onlineDoc: Node, mergeEditor?: MergeEditor | false): void;
+}
+export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/collab/merge/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/collab/merge/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAc,KAAK,SAAS,EAAmB,MAAM,mBAAmB,CAAA;AAC/E,OAAO,EAAyB,SAAS,EAAC,MAAM,uBAAuB,CAAA;AACvE,OAAO,KAAK,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,uBAAuB,CAAA;AASpE,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAA;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AAIrC,UAAU,YAAY;IAClB,EAAE,CAAC,EAAE,OAAO,EAAE,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;CACf;AAED,UAAU,SAAS;IACf,GAAG,EAAE;QACD,CAAC,EAAE,MAAM,CAAA;QACT,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAChC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACjC,YAAY,EAAE,KAAK,CAAA;QACnB,MAAM,EAAE,OAAO,CAAA;KAClB,CAAA;IACD,CAAC,CAAC,EAAE,YAAY,EAAE,CAAA;CACrB;AAED,qBAAa,KAAK;IACd,GAAG,EAAE,SAAS,CAAA;IACd,iBAAiB,EAAE,MAAM,CAAA;IACzB,uBAAuB,EAAE,MAAM,CAAA;gBAEnB,GAAG,EAAE,SAAS;IAM1B,cAAc,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+JrC,SAAS,CACL,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,GACrB,IAAI;IAgMP,UAAU,CAAC,UAAU,EAAE,IAAI,GAAG,SAAS;IAuBvC,kBAAkB,CACd,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,IAAI,EAChB,UAAU,EAAE,IAAI,EAChB,WAAW,GAAE,WAAW,GAAG,KAAa,GACzC,IAAI;CAiDV"}

package/dist/collab/merge/index.js

@@ -1,9 +1,9 @@
+import { EditorState } from "prosemirror-state";
+import { Mapping, Step, Transform } from "prosemirror-transform";
 import { getSettings } from "@fiduswriter/document/schema/convert";
 import { Dialog, addAlert, showSystemMessage } from "fwtoolkit";
 import { receiveTransaction, sendableSteps } from "prosemirror-collab";
-import { EditorState } from "prosemirror-state";
-import { Mapping, Step, Transform } from "prosemirror-transform";
-import { WRITE_ROLES } from "../..//index.js";
+import { WRITE_ROLES } from "../../index.js";
 import { ExportFidusFile } from "../../exporter/native/index.js";
 import { acceptAllNoInsertions, trackedTransaction } from "../../track/index.js";
 import { changeSet } from "./changeset.js";
@@ -11,6 +11,9 @@ import { MergeEditor } from "./editor.js";
 import { recreateTransform } from "./recreate_transform.js";
 import { simplifyTransform } from "./tools.js";
 export class Merge {
+    mod;
+    trackOfflineLimit;
+    remoteTrackOfflineLimit;
     constructor(mod) {
         this.mod = mod;
         this.trackOfflineLimit = 50; // Limit of local changes while offline for tracking to kick in when multiple users edit
@@ -36,8 +39,8 @@ export class Merge {
                 .reverse()
                 .forEach((step, index) => rollbackTr.step(step.invert(unconfirmedTr.docs[unconfirmedTr.docs.length - index - 1])));
             // We reset to there being no local changes to send.
-            this.mod.editor.view.dispatch(receiveTransaction(this.mod.editor.view.state, unconfirmedTr.steps, unconfirmedTr.steps.map(_step => this.mod.editor.client_id)));
-            this.mod.editor.view.dispatch(receiveTransaction(this.mod.editor.view.state, rollbackTr.steps, rollbackTr.steps.map(_step => "remote")).setMeta("remote", true));
+            this.mod.editor.view.dispatch(receiveTransaction(this.mod.editor.view.state, unconfirmedTr.steps, unconfirmedTr.steps.map(() => this.mod.editor.client_id)));
+            this.mod.editor.view.dispatch(receiveTransaction(this.mod.editor.view.state, rollbackTr.steps, rollbackTr.steps.map(() => "remote")).setMeta("remote", true));
             const toDoc = this.mod.editor.schema.nodeFromJSON(data.doc.content);
             // Apply the online Transaction
             let lostTr;
@@ -57,17 +60,14 @@ export class Merge {
             else {
                 lostTr = recreateTransform(this.mod.editor.view.state.doc, toDoc);
             }
-            this.mod.editor.view.dispatch(receiveTransaction(this.mod.editor.view.state, lostTr.steps, lostTr.steps.map(_step => "remote")).setMeta("remote", true));
+            this.mod.editor.view.dispatch(receiveTransaction(this.mod.editor.view.state, lostTr.steps, lostTr.steps.map(() => "remote")).setMeta("remote", true));
             // We split the complex steps that delete and insert into simple steps so that finding conflicts is more pronounced.
             const modifiedLostTr = simplifyTransform(lostTr);
             const lostChangeSet = new changeSet(modifiedLostTr);
             const conflicts = lostChangeSet.findConflicts(unconfirmedTr, modifiedLostTr);
             // Set the version
             this.mod.editor.docInfo.version = data.doc.v;
-            // Before starting the merge process update the fn editor to be in sync
-            // with main editor
             this.mod.editor.mod.footnotes.fnEditor.renderAllFootnotes();
-            // Load all the newly added comments from online users.
             this.mod.editor.mod.comments.store.loadComments(data.doc.comments);
             // If no conflicts arises auto-merge the document
             let editor;
@@ -145,9 +145,9 @@ export class Merge {
         const usedBibs = [];
         const footnoteFind = (node, usedImages, usedBibs) => {
             if (node.name === "citation") {
-                node.attrs.references.forEach(ref => usedBibs.push(Number.parseInt(ref.id)));
+                node.attrs?.references?.forEach(ref => usedBibs.push(Number.parseInt(String(ref.id))));
             }
-            else if (node.name === "image" && node.attrs.image) {
+            else if (node.name === "image" && node.attrs?.image) {
                 usedImages.push(node.attrs.image);
             }
             else if (node.content) {
@@ -156,38 +156,46 @@ export class Merge {
         };
         rebasedTr.doc.descendants(node => {
             if (node.type.name === "citation") {
-                node.attrs.references.forEach(ref => usedBibs.push(Number.parseInt(ref.id)));
+                node.attrs.references.forEach((ref) => {
+                    usedBibs.push(Number.parseInt(String(ref.id)));
+                });
             }
             else if (node.type.name === "image" && node.attrs.image) {
                 usedImages.push(node.attrs.image);
             }
-            else if (node.type.name === "footnote" && node.attrs.footnote) {
-                node.attrs.footnote.forEach(subNode => footnoteFind(subNode, usedImages, usedBibs));
+            else if (node.type.name === "footnote" &&
+                node.attrs.footnote) {
+                node.attrs.footnote.forEach((subNode) => footnoteFind(subNode, usedImages, usedBibs));
             }
         });
         const oldBibDB = this.mod.editor.mod.db.bibDB.db;
         this.mod.editor.mod.db.bibDB.setDB(data.doc.bibliography);
         usedBibs.forEach(id => {
-            if (!this.mod.editor.mod.db.bibDB.db[id] && oldBibDB[id]) {
+            if (!this.mod.editor.mod.db.bibDB.db[id] &&
+                oldBibDB[id]) {
+                ;
                 this.mod.editor.mod.db.bibDB.updateReference(id, oldBibDB[id]);
             }
         });
         const oldImageDB = this.mod.editor.mod.db.imageDB.db;
         this.mod.editor.mod.db.imageDB.setDB(data.doc.images);
         // Remove the Duplicated image ID's
-        usedImages = new Set(usedImages);
-        usedImages = Array.from(usedImages);
+        const uniqueImages = new Set(usedImages);
+        usedImages = Array.from(uniqueImages);
         usedImages.forEach(id => {
-            if (!this.mod.editor.mod.db.imageDB.db[id] && oldImageDB[id]) {
+            if (!this.mod.editor.mod.db.imageDB.db[id] &&
+                oldImageDB[id]) {
                 // If the image was uploaded by the offline user we know that he may not have deleted it so we can resend it normally
-                if (Object.keys(this.mod.editor.app.imageDB.db).includes(id)) {
+                if (Object.keys(this.mod.editor.app.imageDB.db).includes(String(id))) {
+                    ;
                     this.mod.editor.mod.db.imageDB.setImage(id, oldImageDB[id]);
                 }
                 else {
                     // If the image was uploaded by someone else , to set the image we have to reupload it again as there is backend check to associate who can add an image with the image owner.
+                    ;
                     this.mod.editor.mod.db.imageDB
-                        .reUploadImage(id, oldImageDB[id].image, oldImageDB[id].title, oldImageDB[id].copyright)
-                        .then(() => { }, id => {
+                        .reUploadImage(id, String(oldImageDB[id].image), String(oldImageDB[id].title), oldImageDB[id].copyright)
+                        .then(() => { }, (id) => {
                         const transaction = this.mod.editor.view.state.tr;
                         this.mod.editor.view.state.doc.descendants((node, pos) => {
                             if (node.type.name === "image" &&
@@ -211,22 +219,24 @@ export class Merge {
         if (tracked) {
             showSystemMessage(gettext("The document was modified substantially by other users while you were offline. We have merged your changes in as tracked changes. You should verify that your edits still make sense."));
         }
+        ;
         this.mod.editor.mod.footnotes.fnEditor.renderAllFootnotes();
     }
     getDocData(offlineDoc) {
         const pmArticle = acceptAllNoInsertions(offlineDoc).firstChild;
         let title = "";
-        pmArticle.firstChild.forEach(child => {
+        pmArticle?.firstChild?.forEach(child => {
             if (!child.marks.find(mark => mark.type.name === "deletion")) {
                 title += child.textContent;
             }
         });
         return {
-            content: pmArticle.toJSON(),
+            content: (pmArticle?.toJSON() || { type: "article" }),
             settings: getSettings(pmArticle),
             title: title,
-            version: this.mod.editor.docInfo.version,
-            comments: this.mod.editor.mod.comments.store.comments,
+            version: String(this.mod.editor.docInfo.version),
+            comments: this.mod.editor.mod.comments.store
+                .comments,
             id: this.mod.editor.docInfo.id,
             updated: this.mod.editor.docInfo.updated
         };
@@ -238,7 +248,9 @@ export class Merge {
         if (mergeEditor && document.querySelector("#editor-merge-view")) {
             mergeEditor.mergeDialog.close();
             // Close merge resolution warning if open
-            if (document.querySelector("#merge-res-warning")) {
+            if (document.querySelector("#merge-res-warning") &&
+                mergeEditor.warningDialog) {
+                ;
                 mergeEditor.warningDialog.close();
             }
         }

package/dist/collab/merge/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/collab/merge/index.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/collab/merge/index.ts"],"names":[],"mappings":"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"}

package/dist/collab/merge/recreate_transform.d.ts

@@ -0,0 +1,4 @@
+import type { Node } from "prosemirror-model";
+import { Transform } from "prosemirror-transform";
+export declare function recreateTransform(fromDoc: Node, toDoc: Node, complexSteps?: boolean, wordDiffs?: boolean): Transform;
+//# sourceMappingURL=recreate_transform.d.ts.map

package/dist/collab/merge/recreate_transform.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recreate_transform.d.ts","sourceRoot":"","sources":["../../../src/collab/merge/recreate_transform.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,IAAI,EAAgB,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAc,SAAS,EAAC,MAAM,uBAAuB,CAAA;AAiV5D,wBAAgB,iBAAiB,CAC7B,OAAO,EAAE,IAAI,EACb,KAAK,EAAE,IAAI,EACX,YAAY,UAAO,EACnB,SAAS,UAAO,GACjB,SAAS,CAQX"}

package/dist/collab/merge/recreate_transform.js

@@ -27,6 +27,15 @@ function getReplaceStep(fromDoc, toDoc) {
     return new ReplaceStep(start, endB, toDoc.slice(start, endA));
 }
 class RecreateTransform {
+    fromDoc;
+    toDoc;
+    complexSteps;
+    wordDiffs;
+    schema;
+    tr;
+    currentJSON;
+    finalJSON;
+    ops;
     constructor(fromDoc, toDoc, complexSteps, wordDiffs) {
         this.fromDoc = fromDoc;
         this.toDoc = toDoc;
@@ -34,6 +43,9 @@ class RecreateTransform {
         this.wordDiffs = wordDiffs; // Whether to make text diffs cover entire words
         this.schema = fromDoc.type.schema;
         this.tr = new Transform(fromDoc);
+        this.currentJSON = null;
+        this.finalJSON = null;
+        this.ops = [];
     }
     init() {
         if (this.complexSteps) {
@@ -69,14 +81,14 @@ class RecreateTransform {
                     toDoc = this.schema.nodeFromJSON(afterStepJSON);
                     toDoc.check();
                 }
-                catch (error) {
+                catch (_error) {
                     toDoc = false;
                     if (this.ops.length) {
                         op = this.ops.shift();
                         ops.push(op);
                     }
                     else {
-                        throw error;
+                        throw _error;
                     }
                 }
             }
@@ -126,7 +138,9 @@ class RecreateTransform {
                         this.tr.addMark(from, to, nodeMark);
                     }
                 });
+                return undefined;
             });
+            return undefined;
         });
     }
     marklessDoc(doc) {
@@ -196,10 +210,13 @@ class RecreateTransform {
             : diffChars(currentText, finalText);
         while (textDiffs.length) {
             const diff = textDiffs.shift();
+            if (!diff) {
+                continue;
+            }
             if (diff.added) {
                 if (textDiffs[0]?.removed) {
                     const nextDiff = textDiffs.shift();
-                    this.tr.replaceWith(offset, offset + nextDiff.value.length, this.schema
+                    this.tr.replaceWith(offset, offset + (nextDiff?.value.length || 0), this.schema
                         .nodeFromJSON({ type: "text", text: diff.value })
                         .mark(marks));
                 }
@@ -214,9 +231,12 @@ class RecreateTransform {
                 if (textDiffs[0]?.added) {
                     const nextDiff = textDiffs.shift();
                     this.tr.replaceWith(offset, offset + diff.value.length, this.schema
-                        .nodeFromJSON({ type: "text", text: nextDiff.value })
+                        .nodeFromJSON({
+                        type: "text",
+                        text: nextDiff?.value || ""
+                    })
                         .mark(marks));
-                    offset += nextDiff.value.length;
+                    offset += nextDiff?.value.length || 0;
                 }
                 else {
                     this.tr.delete(offset, offset + diff.value.length);

package/dist/collab/merge/recreate_transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"recreate_transform.js","sourceRoot":"","sources":["../../../src/collab/merge/recreate_transform.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"recreate_transform.js","sourceRoot":"","sources":["../../../src/collab/merge/recreate_transform.ts"],"names":[],"mappings":"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"}

package/dist/collab/merge/schema.d.ts

@@ -0,0 +1,4 @@
+import { Schema } from "prosemirror-model";
+export declare function parseDiff(str: string | undefined): unknown[];
+export declare const createDiffSchema: (docSchema: Schema) => Schema;
+//# sourceMappingURL=schema.d.ts.map

package/dist/collab/merge/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/collab/merge/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;AAGxC,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,EAAE,CAc5D;AAED,eAAO,MAAM,gBAAgB,GAAI,WAAW,MAAM,KAAG,MAuIpD,CAAA"}

package/dist/collab/merge/schema.js

@@ -13,23 +13,26 @@ export function parseDiff(str) {
     if (!Array.isArray(tracks)) {
         return [];
     }
+    return tracks;
 }
-export const createDiffSchema = docSchema => {
+export const createDiffSchema = (docSchema) => {
     let specNodes = docSchema.spec.nodes;
-    specNodes.forEach(nodeTypeName => {
+    specNodes.forEach((nodeTypeName) => {
         const nodeType = specNodes.get(nodeTypeName);
-        if (nodeType.group !== "block") {
+        if (nodeType.spec.group !== "block") {
             return;
         }
-        const attrs = nodeType.attrs;
-        specNodes = specNodes.update(nodeTypeName, Object.assign({}, nodeType, {
+        const attrs = nodeType.spec.attrs;
+        specNodes = specNodes.update(nodeTypeName, Object.assign({}, nodeType.spec, {
             attrs: Object.assign({ diffdata: { default: [] } }, attrs),
-            toDOM: node => {
-                let dom = nodeType.toDOM(node);
+            toDOM: (node) => {
+                let dom = nodeType.spec.toDOM?.(node);
                 if (node.attrs.diffdata && node.attrs.diffdata.length) {
                     if (dom[1].class) {
                         dom[1].class =
-                            dom[1].class + " " + node.attrs.diffdata[0].type;
+                            dom[1].class +
+                                " " +
+                                node.attrs.diffdata[0].type;
                     }
                     else {
                         dom[1]["class"] = node.attrs.diffdata[0].type;
@@ -44,10 +47,12 @@ export const createDiffSchema = docSchema => {
                 }
                 return dom;
             },
-            parseDOM: nodeType.parseDOM.map(tag => ({
+            parseDOM: nodeType.spec.parseDOM?.map(tag => ({
                 tag: tag.tag,
-                getAttrs: dom => {
-                    const attrs = tag.getAttrs(dom);
+                getAttrs: (dom) => {
+                    const attrs = tag.getAttrs
+                        ? tag.getAttrs(dom)
+                        : {};
                     return Object.assign({
                         diffdata: parseDiff(dom.dataset.diffdata)
                     }, attrs);
@@ -69,7 +74,9 @@ export const createDiffSchema = docSchema => {
             to: {
                 default: ""
             },
-            markOnly: false
+            markOnly: {
+                default: false
+            }
         },
         inclusive: false,
         parseDOM: [
@@ -83,16 +90,16 @@ export const createDiffSchema = docSchema => {
                 }
             }
         ],
-        toDOM(node) {
+        toDOM(mark) {
             return [
                 "span",
                 {
-                    class: `diff ${node.attrs.diff}`,
-                    "data-diff": node.attrs.diff,
-                    "data-steps": node.attrs.steps,
-                    "data-from": node.attrs.from,
-                    "data-to": node.attrs.to,
-                    "data-markOnly": node.attrs.markOnly
+                    class: `diff ${mark.attrs.diff}`,
+                    "data-diff": mark.attrs.diff,
+                    "data-steps": mark.attrs.steps,
+                    "data-from": mark.attrs.from,
+                    "data-to": mark.attrs.to,
+                    "data-markOnly": mark.attrs.markOnly
                 }
             ];
         }
@@ -105,13 +112,15 @@ export const createDiffSchema = docSchema => {
     // Since editable false PM Editor treats anchor tag as a normal a tag
     // and redirects
     const linkMarkSpec = spec.marks.get("link");
-    spec.marks = spec.marks.update("link", Object.assign({}, linkMarkSpec, {
-        toDOM: node => {
-            const dom = linkMarkSpec.toDOM(node);
-            dom[0] = "span";
-            return dom;
-        }
-    }));
+    if (linkMarkSpec) {
+        spec.marks = spec.marks.update("link", Object.assign({}, linkMarkSpec, {
+            toDOM: (mark, inline) => {
+                const dom = linkMarkSpec.toDOM(mark, inline);
+                dom[0] = "span";
+                return dom;
+            }
+        }));
+    }
     return new Schema(spec);
 };
 //# sourceMappingURL=schema.js.map