@fiduswriter/bibliography-manager 0.1.7 → 0.1.9

package/src/import/{bibliography_import.js → bibliography_import.ts}

@@ -1,7 +1,20 @@
 import {sniffFormat} from "bibliojson"
 import {addAlert, makeWorker} from "fwtoolkit"
+import type {BibDBCollection, BibDBEntry, IdTranslation} from "../types/biblio.js"
 
-const ERROR_MSG = {
+interface ImportMessage {
+    type: string
+    errorCode?: string
+    errorType?: string
+    key?: string
+    type_name?: string
+    field_name?: string
+    entry?: string
+    data?: Record<number, BibDBEntry>
+    done?: boolean
+}
+
+const ERROR_MSG: Record<string, string> = {
     no_entries: gettext(
         "No bibliography entries could be found in import file."
     ),
@@ -18,11 +31,17 @@ const ERROR_MSG = {
 }
 
 export class BibliographyImporter {
+    fileContents: string
+    bibDB: BibDBCollection
+    addToListCall: (ids: number[]) => void
+    callback: (() => void) | false | undefined
+    showAlerts: boolean
+
     constructor(
-        fileContents,
-        bibDB,
-        addToListCall,
-        callback,
+        fileContents: string,
+        bibDB: BibDBCollection,
+        addToListCall: (ids: number[]) => void,
+        callback: (() => void) | false | undefined,
         showAlerts = true
     ) {
         this.fileContents = fileContents
@@ -32,7 +51,7 @@ export class BibliographyImporter {
         this.showAlerts = showAlerts
     }
 
-    init() {
+    init(): void {
         // Detect the format of the input file
         const format = sniffFormat(this.fileContents)
 
@@ -50,19 +69,20 @@ export class BibliographyImporter {
         const importWorker = makeWorker(
             staticUrl("js/bibliography_import_worker.js")
         )
-        importWorker.onmessage = message => this.onMessage(message.data)
+        importWorker.onmessage = message => this.onMessage(message.data as ImportMessage)
         importWorker.postMessage({
             fileContents: this.fileContents,
             format: format
         })
     }
 
-    onMessage(message) {
-        let errorMsg, data
+    onMessage(message: ImportMessage): void {
+        let errorMsg: string | undefined
+        let data: Record<number, BibDBEntry> | undefined
         switch (message.type) {
             case "error":
             case "warning":
-                errorMsg = ERROR_MSG[message.errorCode]
+                errorMsg = ERROR_MSG[message.errorCode || ""]
                 if (!errorMsg) {
                     errorMsg = gettext(
                         "There was an issue with the bibliography import"
@@ -84,20 +104,26 @@ export class BibliographyImporter {
                     errorMsg += `, entry: ${message.entry}`
                 }
                 if (this.showAlerts) {
-                    addAlert(message.type, errorMsg)
+                    addAlert(message.type as "error" | "warning", errorMsg)
                 }
                 break
             case "data":
                 data = message.data
-                this.bibDB.saveBibEntries(data, true).then(idTranslations => {
-                    const newIds = idTranslations.map(idTrans => idTrans[1])
-                    this.addToListCall(newIds)
-                })
+                if (data) {
+                    this.bibDB.saveBibEntries(data, true).then(
+                        (idTranslations: IdTranslation[]) => {
+                            const newIds = idTranslations.map(
+                                idTrans => idTrans[1]
+                            )
+                            this.addToListCall(newIds)
+                        }
+                    )
+                }
                 break
             default:
                 break
         }
-        if (message.done && this.callback) {
+        if (message.done && this.callback && typeof this.callback === "function") {
             this.callback()
         }
     }

package/src/import/{dialog.js → dialog.ts}

@@ -1,18 +1,35 @@
-import {Dialog, activateWait, addAlert, deactivateWait} from "fwtoolkit"
+import {
+    Dialog,
+    activateWait,
+    addAlert,
+    deactivateWait
+} from "fwtoolkit"
+import type {DialogButtonSpec} from "fwtoolkit/dialog"
 import {importBibFileTemplate} from "./templates.js"
+import type {BibliographyApp, BibDBCollection} from "../types/biblio.js"
+
 /** First step of the bibliography file import. Creates a dialog box to specify upload file.
  * Supports multiple formats: BibTeX/BibLaTeX, CSL-JSON, RIS, EndNote, Citavi, NBIB, ODT/DOCX citations.
  */
 
 export class BibliographyFileImportDialog {
-    constructor(bibDB, addToListCall, app) {
+    bibDB: BibDBCollection
+    addToListCall: (ids: number[]) => void
+    tmpDB: boolean
+    app: BibliographyApp
+
+    constructor(
+        bibDB: BibDBCollection,
+        addToListCall: (ids: number[]) => void,
+        app: BibliographyApp
+    ) {
         this.bibDB = bibDB
         this.addToListCall = addToListCall
         this.tmpDB = false
         this.app = app
     }
 
-    init() {
+    init(): void {
         if (this.app.isOffline()) {
             addAlert(
                 "info",
@@ -22,16 +39,18 @@ export class BibliographyFileImportDialog {
             )
             return
         }
-        const buttons = [
+        const buttons: DialogButtonSpec[] = [
             {
                 text: gettext("Import"),
                 classes: "fw-dark submit-import",
                 click: () => {
-                    let bibFile = document.getElementById("bib-uploader").files
-                    if (0 === bibFile.length) {
+                    const bibFiles = (document.getElementById(
+                        "bib-uploader"
+                    ) as HTMLInputElement | null)?.files
+                    if (!bibFiles || 0 === bibFiles.length) {
                         return false
                     }
-                    bibFile = bibFile[0]
+                    const bibFile = bibFiles[0]
                     if (10485760 < bibFile.size) {
                         return false
                     }
@@ -51,7 +70,7 @@ export class BibliographyFileImportDialog {
                         import("./bibliography_import.js").then(
                             ({BibliographyImporter}) => {
                                 const importer = new BibliographyImporter(
-                                    event.target.result,
+                                    (event.target as FileReader).result as string,
                                     this.bibDB,
                                     this.addToListCall,
                                     () => deactivateWait()
@@ -62,6 +81,7 @@ export class BibliographyFileImportDialog {
                     }
                     reader.readAsText(bibFile)
                     dialog.close()
+                    return false
                 }
             },
             {
@@ -76,20 +96,24 @@ export class BibliographyFileImportDialog {
             buttons
         })
         dialog.open()
-        document
-            .getElementById("bib-uploader")
-            .addEventListener(
-                "change",
-                () =>
-                    (document.getElementById("import-bib-name").innerHTML =
-                        document
-                            .getElementById("bib-uploader")
-                            .value.replace(/C:\\fakepath\\/i, ""))
-            )
-        document
-            .getElementById("import-bib-btn")
-            .addEventListener("click", () =>
-                document.getElementById("bib-uploader").click()
-            )
+        const uploader = document.getElementById("bib-uploader")
+        if (uploader) {
+            uploader.addEventListener("change", () => {
+                const input = uploader as HTMLInputElement
+                const label = document.getElementById("import-bib-name")
+                if (label) {
+                    label.innerHTML = input.value.replace(/C:\\fakepath\\/i, "")
+                }
+            })
+        }
+        const importBtn = document.getElementById("import-bib-btn")
+        if (importBtn) {
+            importBtn.addEventListener("click", () => {
+                const input = document.getElementById("bib-uploader")
+                if (input) {
+                    input.click()
+                }
+            })
+        }
     }
 }

package/src/import/index.ts

@@ -0,0 +1,14 @@
+import {BibliographyFileImportDialog} from "./dialog.js"
+export {BibliographyFileImportDialog} from "./dialog.js"
+export {BibliographyImporter} from "./bibliography_import.js"
+
+import type {BibliographyApp, BibDBCollection} from "../types/biblio.js"
+
+export function importBibFile(
+    bibDB: BibDBCollection,
+    addToListCall: (ids: number[]) => void,
+    app: BibliographyApp
+): void {
+    const dialog = new BibliographyFileImportDialog(bibDB, addToListCall, app)
+    dialog.init()
+}

package/src/import/{templates.js → templates.ts}

@@ -1,5 +1,5 @@
 /** a template for the bibliography file import dialog */
-export const importBibFileTemplate = () =>
+export const importBibFileTemplate = (): string =>
     `<form id="import-bib-form" method="post" enctype="multipart/form-data" class="ajax-upload">
         <input type="file" id="bib-uploader" name="bib" required />
         <span id="import-bib-btn" class="fw-button fw-light fw-large">