@fiduswriter/document 0.1.0-alpha.4 → 0.1.0-alpha.5

package/src/exporter/odt/{math.js → math.ts}

@@ -1,12 +1,22 @@
+import type {XmlZip} from "../tools/xml_zip.js"
+import type {XMLElement} from "../tools/xml.js"
+
 export class ODTExporterMath {
-    constructor(xml) {
+    xml: XmlZip
+    objectCounter: number
+    manifestXml: XMLElement | false
+    domParser: DOMParser
+    mathLive: typeof import("mathlive") | null
+
+    constructor(xml: XmlZip) {
         this.xml = xml
         this.objectCounter = 1
         this.manifestXml = false
         this.domParser = new DOMParser()
+        this.mathLive = null
     }
 
-    init() {
+    init(): Promise<void> {
         return this.xml
             .getXml("META-INF/manifest.xml")
             .then(manifestXml => {
@@ -15,16 +25,26 @@ export class ODTExporterMath {
                 return Promise.resolve()
             })
             .then(() => import("mathlive"))
-            .then(MathLive => (this.mathLive = MathLive))
+            .then(MathLive => {
+                this.mathLive = MathLive
+            })
     }
 
-    checkObjectCounter() {
+    checkObjectCounter(): void {
+        if (!this.manifestXml) {
+            return
+        }
         const manifestEl = this.manifestXml.query("manifest:manifest")
+        if (!manifestEl) {
+            return
+        }
         const fileEntries = manifestEl.queryAll("manifest:file-entry")
 
         fileEntries.forEach(fileEntry => {
-            const fullPath = fileEntry.getAttribute("manifest:full-path")
-            const dir = fullPath.split("/")[0]
+            const fullPath = String(
+                fileEntry.getAttribute("manifest:full-path") || ""
+            )
+            const dir = fullPath.split("/")[0] || ""
             const dirParts = dir.split(" ")
             if (dirParts.length === 2 && dirParts[0] === "Object") {
                 const objectNumber = Number.parseInt(dirParts[1])
@@ -35,11 +55,21 @@ export class ODTExporterMath {
         })
     }
 
-    latexToMathML(latex) {
+    latexToMathML(latex: string): string {
+        if (!this.mathLive) {
+            throw new Error("MathLive not initialised")
+        }
         return this.mathLive.convertLatexToMathMl(latex)
     }
 
-    addMath(latex) {
+    addMath(latex: string): number {
+        if (!this.manifestXml) {
+            throw new Error("Manifest XML not loaded")
+        }
+        const manifestEl = this.manifestXml.query("manifest:manifest")
+        if (!manifestEl) {
+            throw new Error("No manifest:manifest element found")
+        }
         const objectNumber = this.objectCounter++
         this.xml.addExtraFile(
             `Object ${objectNumber}/content.xml`,
@@ -47,7 +77,6 @@ export class ODTExporterMath {
                 latex
             )}</math>`
         )
-        const manifestEl = this.manifestXml.query("manifest:manifest")
         const stringOne = `<manifest:file-entry manifest:full-path="Object ${objectNumber}/content.xml" manifest:media-type="text/xml"/>`
         manifestEl.appendXML(stringOne)
         const stringTwo = `<manifest:file-entry manifest:full-path="Object ${objectNumber}/" manifest:version="1.2" manifest:media-type="application/vnd.oasis.opendocument.formula"/>`

package/src/exporter/odt/{metadata.js → metadata.ts}

@@ -1,15 +1,26 @@
 import {escapeText} from "fwtoolkit"
 
+import type {CSL, ExportMetadata} from "../../types.js"
+import type {XMLElement} from "../tools/xml.js"
+import type {XmlZip} from "../tools/xml_zip.js"
+import type {ODTExporterStyles} from "./styles.js"
+
 export class ODTExporterMetadata {
-    constructor(xml, styles, metadata, csl = null) {
+    xml: XmlZip
+    styles: ODTExporterStyles
+    metadata: ExportMetadata
+    csl: CSL | null
+    metaXml: XMLElement | null
+
+    constructor(xml: XmlZip, styles: ODTExporterStyles, metadata: ExportMetadata, csl: CSL | null = null) {
         this.xml = xml
         this.styles = styles
         this.metadata = metadata
         this.csl = csl
-        this.metaXml = false
+        this.metaXml = null
     }
 
-    init() {
+    init(): Promise<void> {
         return this.xml.getXml("meta.xml").then(metaXml => {
             this.metaXml = metaXml
             this.addMetadata()
@@ -18,8 +29,8 @@ export class ODTExporterMetadata {
         })
     }
 
-    async hasBibliography() {
-        if (!this.csl || !this.metadata.citationStyle) {
+    async hasBibliography(): Promise<string> {
+        if (!this.csl || !this.metadata.citationStyle || !this.csl.getStyle) {
             return "0"
         }
         try {
@@ -34,8 +45,14 @@ export class ODTExporterMetadata {
         }
     }
 
-    addMetadata() {
+    addMetadata(): void {
+        if (!this.metaXml) {
+            return
+        }
         const metaEl = this.metaXml.query("office:meta")
+        if (!metaEl) {
+            return
+        }
 
         // Title
         const titleEl = this.metaXml.query("dc:title")
@@ -49,7 +66,7 @@ export class ODTExporterMetadata {
 
         // Authors
         const authors = this.metadata.authors.map(author => {
-            const nameParts = []
+            const nameParts: string[] = []
             if (author.firstname) {
                 nameParts.push(author.firstname)
             }
@@ -65,7 +82,7 @@ export class ODTExporterMetadata {
 
         const initialAuthor = authors.length
             ? escapeText(authors[0])
-            : gettext("Unknown")
+            : "Unknown"
         // TODO: We likely want to differentiate between first and last author.
         const lastAuthor = initialAuthor
 
@@ -88,7 +105,7 @@ export class ODTExporterMetadata {
         // Remove all existing keywords
         const keywordEls = this.metaXml.queryAll("meta:keywords")
         keywordEls.forEach(keywordEl =>
-            keywordEl.parentElement.removeChild(keywordEl)
+            keywordEl.parentElement!.removeChild(keywordEl)
         )
         // Add new keywords
         const keywords = this.metadata.keywords
@@ -101,20 +118,22 @@ export class ODTExporterMetadata {
         // language
         // LibreOffice seems to ignore the value set in metadata and instead uses
         // the one set in default styles. So we set both.
-        this.styles.setLanguage(this.metadata.language)
+        this.styles.setLanguage(this.metadata.language || "en-US")
         const languageEl = this.metaXml.query("dc:language")
         if (languageEl) {
-            languageEl.innerXML = this.metadata.language
+            languageEl.innerXML = this.metadata.language || "en-US"
         } else {
             metaEl.appendXML(
-                `<dc:language>${this.metadata.language}</dc:language>`
+                `<dc:language>${this.metadata.language || "en-US"}</dc:language>`
             )
         }
         // time
         const date = new Date()
         const dateString = date.toISOString().split(".")[0]
         const createdEl = metaEl.query("meta:creation-date")
-        createdEl.innerXML = dateString
+        if (createdEl) {
+            createdEl.innerXML = dateString
+        }
         const dateEl = this.metaXml.query("dc:date")
         if (dateEl) {
             dateEl.innerXML = `${dateString}.000000000`
@@ -123,24 +142,28 @@ export class ODTExporterMetadata {
         }
     }
 
-    async addZoteroPrefs() {
+    async addZoteroPrefs(): Promise<void> {
         // Add citation style property to meta.xml
-        if (!this.metadata.citationStyle) {
+        if (!this.metadata.citationStyle || !this.metaXml) {
             return Promise.resolve()
         }
 
         const metaEl = this.metaXml.query("office:meta")
+        if (!metaEl) {
+            return Promise.resolve()
+        }
 
         // Remove any existing ZOTERO_PREF_ properties
         const existingZoteroProps = this.metaXml
             .queryAll("meta:user-defined")
             .filter(
-                prop =>
-                    prop.getAttribute("meta:name") &&
-                    prop.getAttribute("meta:name").startsWith("ZOTERO_PREF_")
+                prop => {
+                    const name = String(prop.getAttribute("meta:name"))
+                    return name && name.startsWith("ZOTERO_PREF_")
+                }
             )
         existingZoteroProps.forEach(prop =>
-            prop.parentElement.removeChild(prop)
+            prop.parentElement!.removeChild(prop)
         )
 
         // Determine if the citation style has a bibliography
@@ -154,7 +177,7 @@ export class ODTExporterMetadata {
 
         // Split content into chunks of 378 characters (ODT limit)
         const chunkSize = 378
-        const chunks = []
+        const chunks: string[] = []
         for (let i = 0; i < dataContent.length; i += chunkSize) {
             chunks.push(dataContent.substring(i, i + chunkSize))
         }
@@ -169,25 +192,27 @@ export class ODTExporterMetadata {
         return Promise.resolve()
     }
 
-    addContributorMetadata() {
-        if (!this.metadata.contributors || !this.metadata.contributors.length) {
+    addContributorMetadata(): void {
+        if (!this.metadata.contributors || !this.metadata.contributors.length || !this.metaXml) {
             return
         }
 
         const metaEl = this.metaXml.query("office:meta")
+        if (!metaEl) {
+            return
+        }
 
         // Remove any existing fidus_contributor_ properties
         const existingContributorProps = this.metaXml
             .queryAll("meta:user-defined")
             .filter(
-                prop =>
-                    prop.getAttribute("meta:name") &&
-                    prop
-                        .getAttribute("meta:name")
-                        .startsWith("fidus_contributor_")
+                prop => {
+                    const name = String(prop.getAttribute("meta:name"))
+                    return name && name.startsWith("fidus_contributor_")
+                }
             )
         existingContributorProps.forEach(prop =>
-            prop.parentElement.removeChild(prop)
+            prop.parentElement!.removeChild(prop)
         )
 
         const contributors = this.metadata.contributors
@@ -200,7 +225,7 @@ export class ODTExporterMetadata {
         // Add metadata for each contributor
         contributors.forEach((contributor, index) => {
             const num = index + 1
-            const nameParts = []
+            const nameParts: string[] = []
             if (contributor.firstname) {
                 nameParts.push(contributor.firstname)
             }