@fiduswriter/editor 0.1.19 → 0.1.21

package/src/collab/{index.js → index.ts}

@@ -1,10 +1,29 @@
-import {removeCollaboratorSelection} from "../state_plugins/index.js"
+import type {EditorView} from "prosemirror-view"
+
+import {removeCollaboratorSelection} from "../state_plugins/collab_carets.js"
+import type {Editor} from "../types.js"
+
 import {ModCollabChat} from "./chat.js"
 import {ModCollabColors} from "./colors.js"
 import {ModCollabDoc} from "./doc.js"
 
+interface Participant {
+    id: number
+    session_id?: string
+    sessionIds?: string[]
+}
+
 export class ModCollab {
-    constructor(editor) {
+    editor: Editor
+    participants: Participant[]
+    pastParticipants: Participant[]
+    sessionIds: string[] | false
+    collaborativeMode: boolean
+    colors!: ModCollabColors
+    chat!: ModCollabChat
+    doc!: ModCollabDoc
+
+    constructor(editor: Editor) {
         editor.mod.collab = this
         this.editor = editor
         this.participants = []
@@ -17,17 +36,17 @@ export class ModCollab {
         new ModCollabColors(this)
     }
 
-    updateParticipantList(participantArray) {
-        const allSessionIds = [],
-            participantObj = {}
+    updateParticipantList(participantArray: Participant[]): void {
+        const allSessionIds: string[] = [],
+            participantObj: Record<number, Participant> = {}
 
         participantArray.forEach(participant => {
             const entry = participantObj[participant.id]
-            allSessionIds.push(participant.session_id)
+            allSessionIds.push(participant.session_id as string)
             if (entry) {
-                entry.sessionIds.push(participant.session_id)
+                entry.sessionIds?.push(participant.session_id as string)
             } else {
-                participant.sessionIds = [participant.session_id]
+                participant.sessionIds = [participant.session_id as string]
                 delete participant.session_id
                 participantObj[participant.id] = participant
             }
@@ -40,7 +59,9 @@ export class ModCollab {
                 // party. This is a good time to clean up the databases, removing
                 // unused images and bibliography items.
                 if (this.editor.mod.db) {
-                    this.editor.mod.db.clean()
+                    (
+                        this.editor.mod.db as unknown as {clean: () => void}
+                    ).clean()
                 }
             }
             this.sessionIds = []
@@ -53,14 +74,22 @@ export class ModCollab {
                     session_id
                 })
                 const fnTr = removeCollaboratorSelection(
-                    this.editor.mod.footnotes.fnEditor.view.state,
+                    (
+                        this.editor.mod.footnotes as {
+                            fnEditor: {view: EditorView}
+                        }
+                    ).fnEditor.view.state,
                     {session_id}
                 )
                 if (tr) {
                     this.editor.view.dispatch(tr)
                 }
                 if (fnTr) {
-                    this.editor.mod.footnotes.fnEditor.view.dispatch(fnTr)
+                    ;(
+                        this.editor.mod.footnotes as {
+                            fnEditor: {view: EditorView}
+                        }
+                    ).fnEditor.view.dispatch(fnTr)
                 }
             }
         })
@@ -73,8 +102,13 @@ export class ModCollab {
         this.participants.forEach(participant => {
             this.colors.ensureUserColor(participant.id)
         })
-        if (this.editor.menu.headerView) {
-            this.editor.menu.headerView.update()
+        if (
+            (this.editor.menu as unknown as {headerView?: {update: () => void}})
+                .headerView
+        ) {
+            ;(
+                this.editor.menu as unknown as {headerView: {update: () => void}}
+            ).headerView.update()
         }
         this.chat.showChat(participantArray)
     }

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

@@ -1,24 +1,34 @@
 import {ChangeSet} from "prosemirror-changeset"
 import {Mapping} from "prosemirror-transform"
+import type {Transaction} from "prosemirror-state"
+
+interface ChangeStep {
+    pos?: number
+    from?: number
+    to?: number
+    data: {step: number}
+}
 
 export class changeSet {
-    constructor(tr) {
+    tr: Transaction
+
+    constructor(tr: Transaction) {
         this.tr = tr
     }
 
-    trDoc(tr, index = 0) {
+    trDoc(tr: Transaction, index = 0): import("prosemirror-model").Node {
         return tr.docs.length > index ? tr.docs[index] : tr.doc
     }
 
-    findConflicts(tr1, tr2) {
-        const conflicts = []
+    findConflicts(tr1: Transaction, tr2: Transaction): Array<[number, string, number, string]> {
+        const conflicts: Array<[number, string, number, string]> = []
         const changes1 = this.findContentChanges(tr1)
         const changes2 = this.findContentChanges(tr2)
         changes1.deletedsteps.forEach(deleted => {
             changes2.insertedsteps.forEach(inserted => {
                 if (
-                    inserted.pos >= deleted.from &&
-                    inserted.pos <= deleted.to
+                    (inserted.pos as number) >= (deleted.from as number) &&
+                    (inserted.pos as number) <= (deleted.to as number)
                 ) {
                     conflicts.push([
                         deleted.data.step,
@@ -33,8 +43,8 @@ export class changeSet {
         changes2.deletedsteps.forEach(deleted => {
             changes1.insertedsteps.forEach(inserted => {
                 if (
-                    inserted.pos >= deleted.from &&
-                    inserted.pos <= deleted.to
+                    (inserted.pos as number) >= (deleted.from as number) &&
+                    (inserted.pos as number) <= (deleted.to as number)
                 ) {
                     conflicts.push([
                         inserted.data.step,
@@ -48,22 +58,25 @@ export class changeSet {
         return conflicts
     }
 
-    findContentChanges(tr) {
+    findContentChanges(tr: Transaction): {
+        insertedsteps: ChangeStep[]
+        deletedsteps: ChangeStep[]
+    } {
         const doc = this.trDoc(tr)
         let changes = ChangeSet.create(doc)
-        tr.steps.forEach((_step, index) => {
-            const doc = this.trDoc(tr, index + 1)
-            changes = changes.addSteps(doc, [tr.mapping.maps[index]], {
+        tr.steps.forEach((_step: import("prosemirror-transform").Step, index: number) => {
+            const stepDoc = this.trDoc(tr, index + 1)
+            changes = changes.addSteps(stepDoc, [tr.mapping.maps[index]], {
                 step: index
             })
         })
         const invertedMapping = new Mapping()
         invertedMapping.appendMappingInverted(tr.mapping)
 
-        const insertedsteps = [],
-            deletedsteps = [],
-            ins = [],
-            del = []
+        const insertedsteps: ChangeStep[] = [],
+            deletedsteps: ChangeStep[] = [],
+            ins: number[] = [],
+            del: number[] = []
         changes.changes.forEach(change => {
             change.inserted.forEach(inserted => {
                 if (!ins.includes(inserted.data.step)) {
@@ -88,13 +101,13 @@ export class changeSet {
         return {insertedsteps, deletedsteps}
     }
 
-    getChangeSet() {
+    getChangeSet(): ChangeSet {
         const tr = this.tr
         const doc = this.trDoc(tr)
         let changes = ChangeSet.create(doc)
-        tr.steps.forEach((_step, index) => {
-            const doc = this.trDoc(tr, index + 1)
-            changes = changes.addSteps(doc, [tr.mapping.maps[index]], {
+        tr.steps.forEach((_step: import("prosemirror-transform").Step, index: number) => {
+            const stepDoc = this.trDoc(tr, index + 1)
+            changes = changes.addSteps(stepDoc, [tr.mapping.maps[index]], {
                 step: index
             })
         })