@fiduswriter/editor 0.1.19 → 0.1.21

package/src/collab/merge/{editor.js → editor.ts}

@@ -1,4 +1,5 @@
 import {BIBLIOGRAPHY_HEADERS} from "@fiduswriter/document/schema/i18n"
+import type {BibDB, ImageDB} from "@fiduswriter/document"
 import {
     Dialog,
     activateWait,
@@ -13,19 +14,24 @@ import {dropCursor} from "prosemirror-dropcursor"
 import {buildKeymap} from "prosemirror-example-setup"
 import {gapCursor} from "prosemirror-gapcursor"
 import {keymap} from "prosemirror-keymap"
+import type {Node, Schema} from "prosemirror-model"
 import {EditorState} from "prosemirror-state"
+import type {Transaction} from "prosemirror-state"
 import {
     AddMarkStep,
     Mapping,
     RemoveMarkStep,
     ReplaceAroundStep,
-    ReplaceStep
+    ReplaceStep,
+    Step
 } from "prosemirror-transform"
 import {EditorView} from "prosemirror-view"
+
 import {RenderCitations} from "../../citations/render.js"
 import {buildEditorKeymap} from "../../keymap.js"
 import {jumpHiddenNodesPlugin, searchPlugin} from "../../state_plugins/index.js"
 import {trackedTransaction} from "../../track/index.js"
+import type {Editor} from "../../types.js"
 import {changeSet} from "./changeset.js"
 import {FootnoteView} from "./footnotes.js"
 import {recreateTransform} from "./recreate_transform.js"
@@ -39,7 +45,34 @@ import {
 } from "./tools.js"
 
 export class MergeEditor {
-    constructor(editor, cpDoc, offlineDoc, onlineDoc, offlineTr, onlineTr, db) {
+    editor: Editor
+    schema: Schema
+    cpDoc: Node
+    offlineDoc: Node
+    onlineDoc: Node
+    offlineTr: Transaction
+    onlineTr: Transaction
+    mergeDialog: Dialog
+    warningDialog: Dialog | false
+    db: {bibliography: BibDB; images: ImageDB}
+    mergedDocMap: Mapping
+    mergeView1: EditorView
+    mergeView2: EditorView
+    mergeView3: EditorView
+    imageDataModified: Record<string, number>
+    offlineTrackedSteps: number[]
+    diffEditorPlugins: Array<[any, ((doc: Node) => any)?]>
+    offStepsNotTracked: Step[]
+
+    constructor(
+        editor: Editor,
+        cpDoc: Node,
+        offlineDoc: Node,
+        onlineDoc: Node,
+        offlineTr: Transaction,
+        onlineTr: Transaction,
+        db: {bibliography: BibDB; images: ImageDB}
+    ) {
         this.editor = editor
         this.schema = createDiffSchema(editor.schema)
         this.cpDoc = this.schema.nodeFromJSON(cpDoc.toJSON())
@@ -55,12 +88,13 @@ export class MergeEditor {
         this.db = db
         this.mergedDocMap = this.onlineTr.mapping // the maps of the middle editor, used for applying steps automatically
 
-        this.mergeView1 = false
-        this.mergeView2 = false
-        this.mergeView3 = false
+        this.mergeView1 = null as unknown as EditorView
+        this.mergeView2 = null as unknown as EditorView
+        this.mergeView3 = null as unknown as EditorView
         this.imageDataModified = {} // To hold data related to re-uploaded images.
 
         this.offlineTrackedSteps = []
+        this.offStepsNotTracked = []
 
         this.diffEditorPlugins = [
             [diffPlugin, () => ({merge: this})],
@@ -78,13 +112,15 @@ export class MergeEditor {
         ]
 
         // assign image DB & BibDB to be used in document schema.
-        this.schema.cached.bibDB = this.editor.mod.db.bibDB
-        this.schema.cached.imageDB = this.editor.mod.db.imageDB
+        const schemaCached = (this.schema as any).cached
+        schemaCached.bibDB = this.editor.mod.db!.bibDB
+        schemaCached.imageDB = this.editor.mod.db!.imageDB
         // Carry over the encrypted-image decryption handler.
-        this.schema.cached.decryptImage = this.editor.schema.cached.decryptImage
+        schemaCached.decryptImage = (this.editor.schema as any).cached
+            ?.decryptImage
     }
 
-    init() {
+    init(): void {
         /* Create the diff editors */
         ensureCSS([staticUrl("css/merge.css")])
         // Activate wait overlay
@@ -103,8 +139,12 @@ export class MergeEditor {
             this.offlineDoc
         )
 
-        const offlineChangeset = new changeSet(this.offlineTr).getChangeSet()
-        const onlineChangeset = new changeSet(this.onlineTr).getChangeSet()
+        const offlineChangeset = new changeSet(
+            this.offlineTr as unknown as Transaction
+        ).getChangeSet()
+        const onlineChangeset = new changeSet(
+            this.onlineTr as unknown as Transaction
+        ).getChangeSet()
 
         // Unhide All Sections in All the 3 views
         this.unHideSectionsinAllDoc()
@@ -151,7 +191,7 @@ export class MergeEditor {
         this.updateDB(this.offlineDoc, this.db) // Updating the editor DB is one-time operation.
     }
 
-    createMergeDialog(offlineTr, onlineDoc) {
+    createMergeDialog(offlineTr: Transaction, onlineDoc: Node): Dialog {
         const buttons = [
             {
                 text: gettext("Merge Complete"),
@@ -172,7 +212,7 @@ export class MergeEditor {
                                     classes: "fw-dark",
                                     click: () => {
                                         this.startMerge(offlineTr, onlineDoc)
-                                        this.warningDialog.close()
+                                        ;(this.warningDialog as Dialog).close()
                                     }
                                 }
                             ]
@@ -238,7 +278,7 @@ export class MergeEditor {
                                 mergeImage: `<img src="${staticUrl("img/accept_change.avif")}" class="merge-img">`
                             },
                             {hasImage: true}
-                        ],
+                        ] as any,
                         [
                             gettext(
                                 "I cannot accept a particular change. What do I do?"
@@ -272,7 +312,7 @@ export class MergeEditor {
                                 "What happens if I try to complete merge without resolving all the changes?"
                             ),
                             gettext(
-                                "You will receive a warning when you try to complete a merge without accepting or rejecting all the changes. You can still proceed to merge the document. If you do that, all the insertions and deletions in the merge editor in the middle will be accepted automatically, and all the insertions and deletions in the offline editor on the right will be ignored."
+                                "You will receive a warning when you try to complete a merge without accepting or rejecting all of the changes. You can still proceed to merge the document. If you do that, all the insertions and deletions in the merge editor in the middle will be accepted automatically, and all the insertions and deletions in the offline editor on the right will be ignored."
                             )
                         ]
                     ]
@@ -284,7 +324,7 @@ export class MergeEditor {
         return dialog
     }
 
-    checkResolution() {
+    checkResolution(): boolean {
         /* To Check if all the diffs are resolved */
         const offlineVersionDoc = this.mergeView3.state.doc,
             mergedVersionDoc = this.mergeView2.state.doc
@@ -310,6 +350,7 @@ export class MergeEditor {
                 if (node.attrs.diffdata && node.attrs.diffdata.length > 0) {
                     diffAttrPresent = true
                 }
+                return true
             }
         )
         mergedVersionDoc.nodesBetween(
@@ -319,6 +360,7 @@ export class MergeEditor {
                 if (node.attrs.diffdata && node.attrs.diffdata.length > 0) {
                     diffAttrPresent = true
                 }
+                return true
             }
         )
         if (
@@ -333,26 +375,32 @@ export class MergeEditor {
         return false
     }
 
-    markChangesinDiffEditor(changeset, view, insertionClass, tr) {
+    markChangesinDiffEditor(
+        changeset: {changes: readonly any[]},
+        view: EditorView,
+        insertionClass: string,
+        tr: Transaction
+    ): number[] {
         /* This marks all the changes in the diff editor */
         // Mark the insertions in insertion View & deletions in deletionView
         const insertionMarksTr = view.state.tr
-        let stepsTrackedByChangeset = []
+        let stepsTrackedByChangeset: number[] = []
         // Use the changeset to create the marks
         changeset.changes.forEach(change => {
             if (change.inserted.length > 0) {
-                let stepsInvolved = []
-                change.inserted.forEach(insertion =>
-                    stepsInvolved.push(Number.parseInt(insertion.data.step))
+                let stepsInvolved: number[] = []
+                change.inserted.forEach((insertion: {data: {step: number}}) =>
+                    stepsInvolved.push(Number.parseInt(String(insertion.data.step)))
                 )
                 const stepsSet = new Set(stepsInvolved)
                 stepsInvolved = Array.from(stepsSet)
 
                 // Add the footnote related steps because the changeset tracks change but misses some steps related to insertion of footnote node!
                 tr.steps.forEach((step, index) => {
+                    const stepAny = step as any
                     if (
-                        step.from >= change.fromB &&
-                        step.to <= change.toB &&
+                        stepAny.from >= change.fromB &&
+                        stepAny.to <= change.toB &&
                         step instanceof ReplaceStep &&
                         !stepsInvolved.includes(index)
                     ) {
@@ -367,8 +415,8 @@ export class MergeEditor {
                             stepsInvolved.push(index)
                         }
                     } else if (
-                        step.from >= change.fromB &&
-                        step.to <= change.toB &&
+                        stepAny.from >= change.fromB &&
+                        stepAny.to <= change.toB &&
                         step instanceof AddMarkStep &&
                         !stepsInvolved.includes(index)
                     ) {
@@ -425,8 +473,9 @@ export class MergeEditor {
 
         // Add all the footnote/mark/citation related steps that are not tracked by changeset.
         tr.steps.forEach((step, index) => {
-            const from = tr.mapping.slice(index).map(step.from)
-            const to = tr.mapping.slice(index).map(step.to, -1)
+            const stepAny = step as any
+            const from = tr.mapping.slice(index).map(stepAny.from)
+            const to = tr.mapping.slice(index).map(stepAny.to, -1)
             if (
                 step instanceof ReplaceStep &&
                 !stepsTrackedByChangeset.includes(index)
@@ -460,10 +509,7 @@ export class MergeEditor {
                     })
                     insertionMarksTr.addMark(from, to, insertionMark)
                     stepsTrackedByChangeset.push(index)
-                } else if (
-                    stepOne.slice &&
-                    stepOne.slice.content[0].type === "figure"
-                ) {
+                } else if (stepOne.slice.content[0].type === "figure") {
                     if (stepOne.from == stepOne.to) {
                         this.markBlockDiffs(
                             insertionMarksTr,
@@ -489,7 +535,7 @@ export class MergeEditor {
                 !stepsTrackedByChangeset.includes(index)
             ) {
                 const stepOne = step.toJSON(),
-                    stepsInvolved = []
+                    stepsInvolved: number[] = []
                 stepsInvolved.push(index)
                 if (
                     stepOne.mark &&
@@ -499,6 +545,7 @@ export class MergeEditor {
                 ) {
                     tr.steps.forEach((trStep, trIndex) => {
                         // Check for other format changes within this range.
+                        const trStepAny = trStep as any
                         if (
                             (trStep instanceof AddMarkStep ||
                                 trStep instanceof RemoveMarkStep) &&
@@ -506,10 +553,10 @@ export class MergeEditor {
                         ) {
                             const mapFrom = tr.mapping
                                 .slice(trIndex)
-                                .map(trStep.from)
+                                .map(trStepAny.from)
                             const mapTo = tr.mapping
                                 .slice(trIndex)
-                                .map(trStep.to)
+                                .map(trStepAny.to)
                             if (
                                 mapFrom >= from &&
                                 mapTo <= to &&
@@ -574,7 +621,7 @@ export class MergeEditor {
         return stepsTrackedByChangeset
     }
 
-    bindEditorView(elementId, doc) {
+    bindEditorView(elementId: string, doc: Node): EditorView {
         /* Binds the editor view */
         const plugins = this.diffEditorPlugins.map(plugin => {
             if (plugin[1]) {
@@ -583,10 +630,10 @@ export class MergeEditor {
                 return plugin[0]()
             }
         })
-        let editorView
+        let editorView: EditorView
         const mainEditor = this.editor
         if (elementId == "editor-diff-online") {
-            editorView = new EditorView(document.getElementById(elementId), {
+            editorView = new EditorView(document.getElementById(elementId)!, {
                 state: EditorState.create({
                     schema: this.schema,
                     doc: doc,
@@ -607,11 +654,8 @@ export class MergeEditor {
                                 this.mergeView2.state,
                                 this.editor.user,
                                 !this.mergeView2.state.doc.attrs.tracked &&
-                                    ![
-                                        "write-tracked",
-                                        "review-tracked"
-                                    ].includes(
-                                        this.editor.docInfo.access_rights
+                                    !["write-tracked", "review-tracked"].includes(
+                                        this.editor.docInfo.access_rights as string
                                     ),
                                 Date.now() - this.editor.clientTimeAdjustment
                             )
@@ -623,12 +667,17 @@ export class MergeEditor {
                 },
                 nodeViews: {
                     footnote(node, view, getPos) {
-                        return new FootnoteView(node, view, getPos, mainEditor)
+                        return new FootnoteView(
+                            node,
+                            view,
+                            getPos as () => number,
+                            mainEditor
+                        )
                     }
                 }
             })
         } else {
-            editorView = new EditorView(document.getElementById(elementId), {
+            editorView = new EditorView(document.getElementById(elementId)!, {
                 state: EditorState.create({
                     schema: this.schema,
                     doc: doc,
@@ -642,7 +691,12 @@ export class MergeEditor {
                 editable: () => false,
                 nodeViews: {
                     footnote(node, view, getPos) {
-                        return new FootnoteView(node, view, getPos, mainEditor)
+                        return new FootnoteView(
+                            node,
+                            view,
+                            getPos as () => number,
+                            mainEditor
+                        )
                     }
                 }
             })
@@ -650,22 +704,22 @@ export class MergeEditor {
         return editorView
     }
 
-    renderCitation(view, elementId) {
+    renderCitation(view: EditorView, elementId: string): void {
         const settings = view.state.doc.attrs,
             bibliographyHeader =
                 settings.bibliography_header[settings.language] ||
-                BIBLIOGRAPHY_HEADERS[settings.language]
+                (BIBLIOGRAPHY_HEADERS as Record<string, string>)[settings.language]
         const citRenderer = new RenderCitations(
-            document.getElementById(elementId),
+            document.getElementById(elementId)!,
             settings.citationstyle,
             bibliographyHeader,
-            this.editor.mod.db.bibDB,
+            this.editor.mod.db!.bibDB,
             this.editor.app.csl
         )
         citRenderer.init()
     }
 
-    startMerge(offlineTr, onlineDoc) {
+    startMerge(offlineTr: Transaction, onlineDoc: Node): void {
         try {
             /* start the merge process of moving changes to the editor */
             // Remove all diff related marks
@@ -692,7 +746,11 @@ export class MergeEditor {
                 ) {
                     this.mergedDocMap.appendMap(mappedMarkStep.getMap())
                     offlineRebaseMapping.appendMap(mappedMarkStep.getMap())
-                    offlineRebaseMapping.setMirror(
+                    ;(
+                        offlineRebaseMapping as unknown as {
+                            setMirror(a: number, b: number): void
+                        }
+                    ).setMirror(
                         offlineTr.steps.length - stepIndex - 1,
                         offlineTr.steps.length +
                             this.mergedDocMap.maps.length -
@@ -720,8 +778,8 @@ export class MergeEditor {
             )
 
             // Handle merge failure
-            this.editor.mod.collab.doc.merge.handleMergeFailure(
-                error,
+            ;(this.editor.mod.collab as any).doc.merge.handleMergeFailure(
+                error as Error,
                 offlineDoc,
                 onlineDoc,
                 this
@@ -729,26 +787,26 @@ export class MergeEditor {
         }
     }
 
-    unHideSections(view) {
+    unHideSections(view: EditorView): void {
         const unHideSectionTr = view.state.tr
         view.state.doc.forEach((child, offset, _index) => {
             if (child.attrs.optional) {
                 const attrs = Object.assign({}, child.attrs, {hidden: false})
-                unHideSectionTr.setNodeMarkup(offset, false, attrs)
+                unHideSectionTr.setNodeMarkup(offset, null, attrs)
             }
         })
         unHideSectionTr.setMeta("notrack", true).setMeta("mapAppended", true)
         view.dispatch(unHideSectionTr)
     }
 
-    unHideSectionsinAllDoc() {
+    unHideSectionsinAllDoc(): void {
         /* Unhide all the optional sections */
         this.unHideSections(this.mergeView1)
         this.unHideSections(this.mergeView2)
         this.unHideSections(this.mergeView3)
     }
 
-    applyChangesToMainEditor(onlineDoc, mergedDoc) {
+    applyChangesToMainEditor(onlineDoc: Node, mergedDoc: Node): void {
         /* Applies the change from diff editor to main editor */
         onlineDoc = this.editor.schema.nodeFromJSON(
             removeDiffFromJson(onlineDoc.toJSON())
@@ -756,15 +814,19 @@ export class MergeEditor {
         mergedDoc = this.editor.schema.nodeFromJSON(
             removeDiffFromJson(mergedDoc.toJSON())
         )
-        const tr = simplifyTransform(recreateTransform(onlineDoc, mergedDoc))
+        const tr = simplifyTransform(
+            recreateTransform(onlineDoc, mergedDoc) as unknown as Transaction
+        )
         const OnlineStepsLost = recreateTransform(
             onlineDoc,
             this.editor.view.state.doc
         )
-        const onlineStepsLostChangeset = new changeSet(OnlineStepsLost)
+        const onlineStepsLostChangeset = new changeSet(
+            OnlineStepsLost as unknown as Transaction
+        )
         const conflicts = onlineStepsLostChangeset.findConflicts(
             tr,
-            OnlineStepsLost
+            OnlineStepsLost as unknown as Transaction
         )
         if (conflicts.length > 0) {
             const editor = new MergeEditor(
@@ -773,14 +835,14 @@ export class MergeEditor {
                 tr.doc,
                 OnlineStepsLost.doc,
                 tr,
-                OnlineStepsLost,
+                OnlineStepsLost as unknown as Transaction,
                 this.db
             )
             editor.init()
         } else {
             const newTr = this.editor.view.state.tr
             const maps = new Mapping(
-                []
+                ([] as import("prosemirror-transform").StepMap[])
                     .concat(
                         tr.mapping.maps
                             .slice()
@@ -793,7 +855,11 @@ export class MergeEditor {
                 const mapped = step.map(maps.slice(tr.steps.length - index))
                 if (mapped && !newTr.maybeStep(mapped).failed) {
                     maps.appendMap(mapped.getMap())
-                    maps.setMirror(
+                    ;(
+                        maps as unknown as {
+                            setMirror(a: number, b: number): void
+                        }
+                    ).setMirror(
                         tr.steps.length - index - 1,
                         tr.steps.length +
                             OnlineStepsLost.steps.length +
@@ -805,16 +871,16 @@ export class MergeEditor {
             newTr.setMeta("remote", true)
 
             // Re-render the fn editor for all the users.
-            this.editor.mod.collab.doc.footnoteRender = true
+            ;(this.editor.mod.collab as any).doc.footnoteRender = true
 
             this.editor.view.dispatch(newTr)
-            this.editor.mod.footnotes.fnEditor.renderAllFootnotes()
+            ;(this.editor.mod.footnotes as any).fnEditor.renderAllFootnotes()
         }
     }
 
-    findNotTrackedSteps(tr, trackedSteps) {
+    findNotTrackedSteps(tr: Transaction, trackedSteps: number[]): Step[] {
         /* Find steps not tracked by PM, usually steps that cause change of attrs */
-        const nonTrackedSteps = []
+        const nonTrackedSteps: Step[] = []
         tr.steps.forEach((step, index) => {
             // mark steps other than replace steps as not tracked if not tracked by changeset
             // these steps should effectively only be the node attrs change steps.
@@ -830,7 +896,13 @@ export class MergeEditor {
         return nonTrackedSteps
     }
 
-    markBlockDiffs(tr, from, to, difftype, stepsInvolved) {
+    markBlockDiffs(
+        tr: Transaction,
+        from: number,
+        to: number,
+        difftype: string,
+        stepsInvolved: number[]
+    ): void {
         /* This Function is used to add diff data to Block Elements. */
         tr.doc.nodesBetween(from, to, (node, pos) => {
             if (
@@ -842,7 +914,12 @@ export class MergeEditor {
                 return false
             }
             if (node.attrs.diffdata) {
-                const diffdata = []
+                const diffdata: Array<{
+                    type: string
+                    from: number
+                    to: number
+                    steps: number[]
+                }> = []
                 diffdata.push({
                     type: difftype,
                     from: from,
@@ -856,20 +933,36 @@ export class MergeEditor {
                     node.marks
                 )
             }
+            return true
         })
     }
 
-    updateDB(offlineDoc, db) {
+    updateDB(
+        offlineDoc: Node,
+        db: {bibliography: BibDB; images: ImageDB}
+    ): void {
         /* Used to update the image,bib DB and update the doc in case if missing/lost images
         (update the image data with re-uploaded images) */
-        let usedImages = []
-        const usedBibs = []
-        const footnoteFind = (node, usedImages, usedBibs) => {
+        let usedImages: (number | string)[] = []
+        const usedBibs: (number | string)[] = []
+        const footnoteFind = (
+            node: {
+                name?: string
+                attrs?: {
+                    references?: {id: string | number}[]
+                    image?: number | string
+                    footnote?: any[]
+                }
+                content?: any[]
+            },
+            usedImages: (number | string)[],
+            usedBibs: (number | string)[]
+        ) => {
             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) {
                 node.content.forEach(subNode =>
@@ -879,54 +972,65 @@ export class MergeEditor {
         }
 
         // Looking at rebased doc so that it contains the merged document !!!
-        offlineDoc.descendants(node => {
+        offlineDoc.descendants((node: Node) => {
             if (node.type.name === "citation") {
-                node.attrs.references.forEach(ref =>
-                    usedBibs.push(Number.parseInt(ref.id))
+                node.attrs.references.forEach(
+                    (ref: {id: string | number}) => {
+                        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: unknown) =>
+                    footnoteFind(subNode as any, usedImages, usedBibs)
                 )
             }
         })
 
-        const oldBibDB = this.editor.mod.db.bibDB.db
-        this.editor.mod.db.bibDB.setDB(db.bibliography)
+        const oldBibDB = this.editor.mod.db!.bibDB.db
+        this.editor.mod.db!.bibDB.setDB(db.bibliography)
         usedBibs.forEach(id => {
-            if (!this.editor.mod.db.bibDB.db[id] && oldBibDB[id]) {
-                this.editor.mod.db.bibDB.updateReference(id, oldBibDB[id])
+            if (!this.editor.mod.db!.bibDB.db[id] && oldBibDB[id]) {
+                ;(this.editor.mod.db!.bibDB as any).updateReference(
+                    id,
+                    oldBibDB[id]
+                )
             }
         })
-        const oldImageDB = this.editor.mod.db.imageDB.db
+        const oldImageDB = this.editor.mod.db!.imageDB.db
         let imageUploadFailDialogShown = false
-        this.editor.mod.db.imageDB.setDB(db.images)
-        usedImages = new Set(usedImages)
-        usedImages = Array.from(usedImages)
-        usedImages.forEach(id => {
-            if (!this.editor.mod.db.imageDB.db[id] && oldImageDB[id]) {
+        this.editor.mod.db!.imageDB.setDB(db.images)
+        // Remove the Duplicated image ID's
+        usedImages = Array.from(new Set(usedImages))
+        ;(usedImages as unknown as number[]).forEach(id => {
+            if (!this.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.editor.app.imageDB.db).includes(String(id))
                 ) {
-                    this.editor.mod.db.imageDB.setImage(id, oldImageDB[id])
+                    ;(this.editor.mod.db!.imageDB as any).setImage(
+                        id as number,
+                        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.editor.mod.db.imageDB
+                    ;(this.editor.mod.db!.imageDB as any)
                         .reUploadImage(
-                            id,
-                            oldImageDB[id].image,
-                            oldImageDB[id].title,
+                            id as number,
+                            String(oldImageDB[id].image),
+                            String(oldImageDB[id].title),
                             oldImageDB[id].copyright
                         )
                         .then(
-                            ({id, newId}) => {
+                            ({id, newId}: {id: number; newId: number}) => {
                                 this.imageDataModified[id] = newId
                                 // Update the image node if there are any re uploaded images.
                                 this.mergeView1.state.doc.descendants(
-                                    (node, pos) => {
+                                    (node: Node, pos: number) => {
                                         if (
                                             node.type.name === "image" &&
                                             node.attrs.image == id
@@ -934,7 +1038,7 @@ export class MergeEditor {
                                             const attrs = Object.assign(
                                                 {},
                                                 node.attrs
-                                            )
+                                            ) as Record<string, any>
                                             attrs["image"] = newId
                                             const nodeType =
                                                 this.mergeView1.state.schema
@@ -956,7 +1060,7 @@ export class MergeEditor {
                                     }
                                 )
                                 this.mergeView3.state.doc.descendants(
-                                    (node, pos) => {
+                                    (node: Node, pos: number) => {
                                         if (
                                             node.type.name === "image" &&
                                             node.attrs.image == id
@@ -964,7 +1068,7 @@ export class MergeEditor {
                                             const attrs = Object.assign(
                                                 {},
                                                 node.attrs
-                                            )
+                                            ) as Record<string, any>
                                             attrs["image"] = newId
                                             const nodeType =
                                                 this.mergeView3.state.schema
@@ -986,10 +1090,10 @@ export class MergeEditor {
                                     }
                                 )
                             },
-                            id => {
+                            (id: number) => {
                                 // In case of failure make the id as false so the failed upload image is empty for the offline user too!
                                 this.mergeView1.state.doc.descendants(
-                                    (node, pos) => {
+                                    (node: Node, pos: number) => {
                                         if (
                                             node.type.name === "image" &&
                                             node.attrs.image == id
@@ -997,7 +1101,7 @@ export class MergeEditor {
                                             const attrs = Object.assign(
                                                 {},
                                                 node.attrs
-                                            )
+                                            ) as Record<string, unknown>
                                             attrs["image"] = false
                                             const nodeType =
                                                 this.mergeView1.state.schema
@@ -1019,7 +1123,7 @@ export class MergeEditor {
                                     }
                                 )
                                 this.mergeView3.state.doc.descendants(
-                                    (node, pos) => {
+                                    (node: Node, pos: number) => {
                                         if (
                                             node.type.name === "image" &&
                                             node.attrs.image == id
@@ -1027,7 +1131,7 @@ export class MergeEditor {
                                             const attrs = Object.assign(
                                                 {},
                                                 node.attrs
-                                            )
+                                            ) as Record<string, unknown>
                                             attrs["image"] = false
                                             const nodeType =
                                                 this.mergeView3.state.schema