@fiduswriter/editor 0.1.47 → 0.1.50

package/src/no_collab_save/index.ts

@@ -1,4 +1,4 @@
-import {addAlert, postJson} from "fwtoolkit"
+import {addAlert} from "fwtoolkit"
 import {receiveTransaction} from "prosemirror-collab"
 import {recreateTransform} from "../collab/merge/recreate_transform.js"
 import type {Editor} from "../types.js"
@@ -10,7 +10,7 @@ import type {Node} from "prosemirror-model"
  */
 export class NoCollabSave {
     editor: Editor
-    saveInterval: ReturnType<typeof setInterval> | null
+    saveInterval: number | null
     savePromise: Promise<void> | null
     _beforeUnloadHandler: (() => void) | null
     _lastSaveTime: number
@@ -126,20 +126,19 @@ export class NoCollabSave {
         }
 
         try {
-            const {json, status} = (await postJson(
-                "/api/document/save/",
+            const {json, status} = await this.editor.app.apiConnectors.document.saveDocument(
                 payload,
-                {},
                 {keepalive}
-            )) as {json: Record<string, unknown>; status: number}
+            )
             if (status === 409) {
                 if (!keepalive) {
                     await this._handleVersionConflict()
                 }
                 return
             }
-            if (json.version !== undefined) {
-                this.editor.docInfo.version = json.version as number
+            const saveData = json as {version?: number}
+            if (saveData.version !== undefined) {
+                this.editor.docInfo.version = saveData.version
             }
             this.editor.docInfo.updated = new Date()
             this.editor.docInfo.confirmedDoc = this.editor.view.state.doc
@@ -167,15 +166,15 @@ export class NoCollabSave {
             payload.token = this.editor.docInfo.token
         }
         try {
-            const {json} = (await postJson(
-                "/api/document/get_doc_data/",
-                payload
-            )) as {json: Record<string, unknown>}
+            const {json} = await this.editor.app.apiConnectors.document.getDocumentData(
+                payload as {id: number; token?: string}
+            )
+            const data = json as {
+                doc: Record<string, unknown>
+                time: string
+            }
             const serverDoc = this.editor.schema.nodeFromJSON(
-                (json.doc as Record<string, unknown>).content as Record<
-                    string,
-                    unknown
-                >
+                (data.doc.content as Record<string, unknown>) || {}
             )
             const currentDoc = this.editor.view.state.doc
             const confirmedDoc = this.editor.docInfo.confirmedDoc as Node
@@ -203,18 +202,17 @@ export class NoCollabSave {
 
             // Update metadata from server
             ;(this.editor.mod.db?.bibDB as {setDB(value: unknown): void}).setDB(
-                (json.doc as Record<string, unknown>).bibliography
+                data.doc.bibliography
             )
             ;(this.editor.mod.db?.imageDB as {setDB(value: unknown): void}).setDB(
-                (json.doc as Record<string, unknown>).images
+                data.doc.images
             )
             ;(this.editor.mod.comments as any).store.loadComments(
-                (json.doc as Record<string, unknown>).comments
+                data.doc.comments
             )
-            this.editor.docInfo.version = (json.doc as Record<string, unknown>)
-                .v as number
+            this.editor.docInfo.version = data.doc.v as number
             this.editor.docInfo.confirmedDoc = this.editor.view.state.doc
-            this.editor.docInfo.updated = new Date(json.time as string)
+            this.editor.docInfo.updated = new Date(data.time)
             ;(this.editor.mod.footnotes as any).fnEditor.renderAllFootnotes()
 
             // Retry save with the merged document

package/src/state_plugins/inline_reference/dropup.ts

@@ -156,8 +156,8 @@ export function buildBibliographyList(editor: Editor): BibliographyEntry[] {
     if (editor.mod?.db?.bibDB?.db) {
         addEntries(editor.mod.db.bibDB.db as Record<number, any>, "doc")
     }
-    if ((editor.app as any).bibDB?.db) {
-        addEntries((editor.app as any).bibDB.db as Record<number, any>, "user")
+    if (editor.app.bibDB?.db) {
+        addEntries(editor.app.bibDB.db as Record<string, any>, "user")
     }
 
     return entries

package/src/state_plugins/settings.ts

@@ -243,7 +243,7 @@ export const settingsPlugin = (options: SettingsOptions) => {
                     )
                     setDocTitle(
                         view.state.doc.firstChild?.textContent || "",
-                        options.editor.app as any
+                        options.editor.app
                     )
                 }
             }

package/src/types.ts

@@ -14,13 +14,15 @@ import type {EditorView} from "prosemirror-view"
 import type {
     BibDB,
     BibDBEntries,
+    BibDBEntry,
     CommentData,
     CSL,
     ImageDB,
     ImageDBEntries
 } from "@fiduswriter/document"
+import type {ImageApi} from "@fiduswriter/image-manager"
 
-export type {BibDB, BibDBEntries, CommentData, CSL, ImageDB, ImageDBEntries}
+export type {BibDB, BibDBEntries, BibDBEntry, CommentData, CSL, ImageDB, ImageDBEntries}
 
 /** Image database interface used by the editor (document and user DBs). */
 export interface EditorImageDB extends ImageDB {
@@ -28,16 +30,104 @@ export interface EditorImageDB extends ImageDB {
     setImage(id: number, imageData: Record<string, unknown>): void
 }
 
+/** Bibliography database interface used by the editor. */
+export interface EditorBibDB {
+    db: Record<string, BibDBEntry>
+}
+
+/** API connector for document-level operations used by the editor. */
+export interface EditorDocumentApi {
+    createDocument(
+        data: Record<string, unknown>
+    ): Promise<{json: unknown; status: number}>
+    getWebSocketBase(
+        data: {id: number; token?: string}
+    ): Promise<{json: unknown; status: number}>
+    getDocumentStyles(
+        data: {id: number; token?: string}
+    ): Promise<{json: unknown; status: number}>
+    getDocumentData(
+        data: {id: number; token?: string; v?: number}
+    ): Promise<{json: unknown; status: number}>
+    saveDocument(
+        data: Record<string, unknown>,
+        options?: {keepalive?: boolean}
+    ): Promise<{json: unknown; status: number}>
+    commentNotify(data: Record<string, unknown>): Promise<unknown>
+    requestAccess(
+        data: {document_id: number; rights: string}
+    ): Promise<{json: unknown; status: number}>
+    validateShareToken(
+        token: string
+    ): Promise<{json: unknown; status: number}>
+    listShareTokens(document_id: number): Promise<{json: unknown; status: number}>
+    createShareToken(
+        data: Record<string, unknown>
+    ): Promise<{json: unknown; status: number}>
+    revokeShareToken(token_id: number): Promise<{json: unknown; status: number}>
+    getAccessRights(
+        data: {document_ids: number[]}
+    ): Promise<{json: unknown; status: number}>
+    saveAccessRights(data: {
+        document_ids: number[]
+        access_rights: unknown[]
+    }): Promise<unknown>
+    saveE2EEImage(
+        data: Record<string, unknown>,
+        files?: Record<string, unknown>
+    ): Promise<{json: unknown; status: number}>
+    deleteE2EEImage(data: {doc_id: number; image_id: number}): Promise<unknown>
+    uploadRevision(
+        data: {note: string; document_id: number},
+        files: Record<string, unknown>
+    ): Promise<unknown>
+    getTemplateForDoc(
+        id: number | string,
+        token: string | false
+    ): Promise<{json: unknown; status: number}>
+}
+
+/** API connector for contact operations used by the editor. */
+export interface EditorContactsApi {
+    add(data: {user_string: string}): Promise<{json: unknown; status: number}>
+}
+
+/** API connector for document import/copy operations used by the editor. */
+export interface EditorDocumentImportApi {
+    createDoc(
+        data: Record<string, unknown>,
+        files?: Record<string, unknown>
+    ): Promise<{json: unknown; status: number}>
+    saveImage(
+        data: Record<string, unknown>,
+        files: Record<string, unknown>
+    ): Promise<{json: unknown; status: number}>
+    saveE2EEImage(
+        data: Record<string, unknown>,
+        files: Record<string, unknown>
+    ): Promise<{json: unknown; status: number}>
+    saveDocument(
+        data: Record<string, unknown>
+    ): Promise<{json: unknown; status: number}>
+}
+
 /** Minimal app interface — only the fields the Editor actually uses. */
 export interface EditorApp {
     routes: Record<string, {app: string; [key: string]: unknown}>
     goTo: (url: string) => void
     settings: {APPS: string[]; [key: string]: unknown}
     menuPlugins?: Array<[string, Record<string, {new (...args: unknown[]): {init(): void}}>]>
-    name?: string
+    name: string
     isOffline(): boolean
     csl: CSL
+    bibDB?: EditorBibDB
     imageDB: EditorImageDB
+    apiConnectors: {
+        document: EditorDocumentApi
+        documentImport: EditorDocumentImportApi
+        image: ImageApi
+        contacts: EditorContactsApi
+    }
 }
 
 /** Document access role constants. */