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

package/dist/exporter/docx/footnotes.js

@@ -47,6 +47,33 @@ const DEFAULT_STYLE_FOOTNOTE_ANCHOR = `
     </w:style>
     `;
 export class DOCXExporterFootnotes {
+    doc;
+    docContent;
+    settings;
+    imageDB;
+    bibDB;
+    xml;
+    citations;
+    csl;
+    lists;
+    math;
+    tables;
+    rels;
+    pmBib;
+    fnPmJSON;
+    images;
+    augmentedCitations;
+    footnotes;
+    fnXML;
+    fnRels;
+    ctXML;
+    styleXML;
+    settingsXML;
+    filePath;
+    ctFilePath;
+    settingsFilePath;
+    styleFilePath;
+    richtext;
     constructor(doc, docContent, settings, imageDB, bibDB, xml, citations, csl, lists, math, tables, rels) {
         this.doc = doc;
         this.docContent = docContent;
@@ -62,12 +89,14 @@ export class DOCXExporterFootnotes {
         this.rels = rels;
         this.pmBib = false;
         this.fnPmJSON = false;
-        this.images = false;
-        this.augmentedCitations = false;
+        this.images = null;
+        this.augmentedCitations = null;
         this.footnotes = []; // footnotes
-        this.fnXML = false;
-        this.ctXML = false;
-        this.styleXML = false;
+        this.fnXML = null;
+        this.fnRels = null;
+        this.ctXML = null;
+        this.styleXML = null;
+        this.settingsXML = null;
         this.filePath = "word/footnotes.xml";
         this.ctFilePath = "[Content_Types].xml";
         this.settingsFilePath = "word/settings.xml";
@@ -76,7 +105,8 @@ export class DOCXExporterFootnotes {
     init() {
         this.findFootnotes();
         if (this.footnotes.length ||
-            (this.citations.citFm.citationType === "note" &&
+            (this.citations.citFm &&
+                this.citations.citFm.citationType === "note" &&
                 this.citations.citInfos.length)) {
             this.convertFootnotes();
             this.fnRels = new DOCXExporterRels(this.xml, "footnotes");
@@ -114,12 +144,15 @@ export class DOCXExporterFootnotes {
         });
     }
     addRelsToCt() {
+        if (!this.ctXML) {
+            return;
+        }
         const override = this.ctXML.query("Override", {
             PartName: `/${this.filePath}`
         });
         if (!override) {
             const types = this.ctXML.query("Types");
-            types.appendXML(`<Override PartName="/${this.filePath}" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"/>`);
+            types?.appendXML(`<Override PartName="/${this.filePath}" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"/>`);
         }
     }
     addStyles() {
@@ -133,13 +166,13 @@ export class DOCXExporterFootnotes {
     addStyle(styleName, xml) {
         if (!this.styleXML.query("w:style", { "w:styleId": styleName })) {
             const stylesEl = this.styleXML.query("w:styles");
-            stylesEl.appendXML(xml);
+            stylesEl?.appendXML(xml);
         }
     }
     findFootnotes() {
         descendantNodes(this.docContent).forEach(node => {
             if (node.type === "footnote") {
-                this.footnotes.push(node.attrs.footnote);
+                this.footnotes.push(node.attrs?.footnote);
             }
         });
     }
@@ -163,8 +196,9 @@ export class DOCXExporterFootnotes {
         this.rels.addFootnoteRel();
         return this.xml.getXml(this.filePath, DEFAULT_XML).then(xml => {
             const footnotesEl = xml.query("w:footnotes");
-            footnotesEl.appendXML(this.fnXML);
-            this.xml = xml;
+            footnotesEl?.appendXML(this.fnXML);
+            // Note: original code reassigned this.xml to the XMLElement here;
+            // that is not needed and conflicts with the XmlZip type.
         });
     }
     setSettings() {
@@ -172,7 +206,7 @@ export class DOCXExporterFootnotes {
             const footnotePr = settingsXML.query("w:footnotePr");
             if (!footnotePr) {
                 const settingsEl = settingsXML.query("w:settings");
-                settingsEl.appendXML(DEFAULT_SETTINGS_XML);
+                settingsEl?.appendXML(DEFAULT_SETTINGS_XML);
             }
             this.settingsXML = settingsXML;
             return Promise.resolve();

package/dist/exporter/docx/footnotes.js.map

@@ -1 +1 @@
-{"version":3,"file":"footnotes.js","sourceRoot":"","sources":["../../../src/exporter/docx/footnotes.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"footnotes.js","sourceRoot":"","sources":["../../../src/exporter/docx/footnotes.ts"],"names":[],"mappings":"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"}

package/dist/exporter/docx/images.d.ts

@@ -1,14 +1,25 @@
-export class DOCXExporterImages {
-    constructor(docContent: any, imageDB: any, xml: any, rels: any);
-    docContent: any;
-    imageDB: any;
-    xml: any;
-    rels: any;
-    images: {};
-    ctXML: boolean;
-    init(): any;
-    addImage(imgFileName: any, image: any): any;
-    addContentType(fileEnding: any): void;
-    exportImages(): Promise<any>;
+import type { FidusNode, ImageDB } from "../../types.js";
+import type { XMLElement } from "../tools/xml.js";
+import type { XmlZip } from "../tools/xml_zip.js";
+import type { DOCXExporterRels } from "./rels.js";
+interface ImageInfo {
+    id: number;
+    width: number;
+    height: number;
+    title?: string;
 }
+export declare class DOCXExporterImages {
+    docContent: FidusNode;
+    imageDB: ImageDB;
+    xml: XmlZip;
+    rels: DOCXExporterRels;
+    images: Record<string, ImageInfo>;
+    ctXML: XMLElement | null;
+    constructor(docContent: FidusNode, imageDB: ImageDB, xml: XmlZip, rels: DOCXExporterRels);
+    init(): Promise<void>;
+    addImage(imgFileName: string, image: Blob): number;
+    addContentType(fileEnding: string): void;
+    exportImages(): Promise<void>;
+}
+export {};
 //# sourceMappingURL=images.d.ts.map

package/dist/exporter/docx/images.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"images.d.ts","sourceRoot":"","sources":["../../../src/exporter/docx/images.js"],"names":[],"mappings":"AAIA;IACI,gEAQC;IAPG,gBAA4B;IAC5B,aAAsB;IACtB,SAAc;IACd,UAAgB;IAEhB,WAAgB;IAChB,eAAkB;IAGtB,YAKC;IAGD,4CAKC;IAGD,sCAOC;IAKD,6BAwDC;CACJ"}
+{"version":3,"file":"images.d.ts","sourceRoot":"","sources":["../../../src/exporter/docx/images.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,SAAS,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAA;AAGtD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAA;AAC/C,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,WAAW,CAAA;AAE/C,UAAU,SAAS;IACf,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,kBAAkB;IAC3B,UAAU,EAAE,SAAS,CAAA;IACrB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,gBAAgB,CAAA;IAEtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACjC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;gBAEZ,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB;IAUxF,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,GAAG,MAAM;IAQlD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAkBxC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CA0DhC"}

package/dist/exporter/docx/images.js

@@ -2,13 +2,19 @@ import { get } from "fwtoolkit";
 import { descendantNodes } from "../tools/doc_content.js";
 import { svg2png } from "../tools/svg.js";
 export class DOCXExporterImages {
+    docContent;
+    imageDB;
+    xml;
+    rels;
+    images;
+    ctXML;
     constructor(docContent, imageDB, xml, rels) {
         this.docContent = docContent;
         this.imageDB = imageDB;
         this.xml = xml;
         this.rels = rels;
         this.images = {};
-        this.ctXML = false;
+        this.ctXML = null;
     }
     init() {
         return this.xml.getXml("[Content_Types].xml").then(ctXML => {
@@ -19,13 +25,19 @@ export class DOCXExporterImages {
     // add an image to the list of files
     addImage(imgFileName, image) {
         const rId = this.rels.addImageRel(imgFileName);
-        this.addContentType(imgFileName.split(".").pop());
+        this.addContentType(imgFileName.split(".").pop() || "");
         this.xml.addExtraFile(`word/media/${imgFileName}`, image);
         return rId;
     }
     // add a global contenttype declaration for an image type (if needed)
     addContentType(fileEnding) {
+        if (!this.ctXML) {
+            return;
+        }
         const types = this.ctXML.query("Types");
+        if (!types) {
+            return;
+        }
         const contentDec = types.query("Default", { Extension: fileEnding });
         if (!contentDec) {
             const string = `<Default ContentType="image/${fileEnding}" Extension="${fileEnding}"/>`;
@@ -38,37 +50,40 @@ export class DOCXExporterImages {
     exportImages() {
         const usedImgs = [];
         descendantNodes(this.docContent).forEach(node => {
-            if (node.type === "image" && node.attrs.image !== false) {
-                if (!usedImgs.includes(node.attrs.image)) {
-                    usedImgs.push(node.attrs.image);
+            if (node.type === "image" && node.attrs?.image !== false) {
+                const imageId = node.attrs?.image;
+                if (imageId !== undefined && !usedImgs.includes(imageId)) {
+                    usedImgs.push(imageId);
                 }
             }
         });
         return new Promise(resolveExportImages => {
             const p = [];
             usedImgs.forEach(image => {
-                const imgDBEntry = this.imageDB.db[image];
+                const imgDBEntry = this.imageDB.db[String(image)];
+                if (!imgDBEntry || !imgDBEntry.image) {
+                    return;
+                }
                 p.push(get(imgDBEntry.image)
                     .then(response => response.blob())
-                    .then(blob => {
+                    .then(async (blob) => {
                     if (blob.type === "image/svg+xml") {
                         // DOCX doesn't support SVG. Convert to PNG.
-                        return svg2png(blob).then(({ blob: pngBlob, width, height }) => {
-                            const wImgId = this.addImage(imgDBEntry.image
-                                .split("/")
-                                .pop()
-                                .replace(/.svg$/g, ".png"), pngBlob);
-                            this.images[image] = {
-                                id: wImgId,
-                                width,
-                                height,
-                                title: imgDBEntry.title
-                            };
-                        });
+                        const { blob: pngBlob, width, height } = await svg2png(blob);
+                        const wImgId = this.addImage(imgDBEntry.image
+                            .split("/")
+                            .pop()
+                            .replace(/.svg$/g, ".png"), pngBlob);
+                        this.images[String(image)] = {
+                            id: wImgId,
+                            width,
+                            height,
+                            title: imgDBEntry.title
+                        };
                     }
                     else {
                         const wImgId = this.addImage(imgDBEntry.image.split("/").pop(), blob);
-                        this.images[image] = {
+                        this.images[String(image)] = {
                             id: wImgId,
                             width: imgDBEntry.width,
                             height: imgDBEntry.height,

package/dist/exporter/docx/images.js.map

@@ -1 +1 @@
-{"version":3,"file":"images.js","sourceRoot":"","sources":["../../../src/exporter/docx/images.js"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,WAAW,CAAA;AAC7B,OAAO,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAA;AAEvC,MAAM,OAAO,kBAAkB;IAC3B,YAAY,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI;QACtC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAA;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACvD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;YAClB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAA;QAC9B,CAAC,CAAC,CAAA;IACN,CAAC;IAED,oCAAoC;IACpC,QAAQ,CAAC,WAAW,EAAE,KAAK;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;QAC9C,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAA;QACjD,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,WAAW,EAAE,EAAE,KAAK,CAAC,CAAA;QACzD,OAAO,GAAG,CAAA;IACd,CAAC;IAED,qEAAqE;IACrE,cAAc,CAAC,UAAU;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACvC,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,EAAC,SAAS,EAAE,UAAU,EAAC,CAAC,CAAA;QAClE,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,MAAM,GAAG,+BAA+B,UAAU,gBAAgB,UAAU,KAAK,CAAA;YACvF,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAC3B,CAAC;IACL,CAAC;IAED,gEAAgE;IAChE,+EAA+E;IAC/E,mBAAmB;IACnB,YAAY;QACR,MAAM,QAAQ,GAAG,EAAE,CAAA;QACnB,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC5C,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBACtD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;oBACvC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBACnC,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC,EAAE;YACrC,MAAM,CAAC,GAAG,EAAE,CAAA;YACZ,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;gBACzC,CAAC,CAAC,IAAI,CACF,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;qBAChB,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;qBACjC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACT,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;wBAChC,4CAA4C;wBAC5C,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CACrB,CAAC,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAC,EAAE,EAAE;4BAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CACxB,UAAU,CAAC,KAAK;iCACX,KAAK,CAAC,GAAG,CAAC;iCACV,GAAG,EAAE;iCACL,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,EAC9B,OAAO,CACV,CAAA;4BACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG;gCACjB,EAAE,EAAE,MAAM;gCACV,KAAK;gCACL,MAAM;gCACN,KAAK,EAAE,UAAU,CAAC,KAAK;6BAC1B,CAAA;wBACL,CAAC,CACJ,CAAA;oBACL,CAAC;yBAAM,CAAC;wBACJ,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CACxB,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EACjC,IAAI,CACP,CAAA;wBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG;4BACjB,EAAE,EAAE,MAAM;4BACV,KAAK,EAAE,UAAU,CAAC,KAAK;4BACvB,MAAM,EAAE,UAAU,CAAC,MAAM;4BACzB,KAAK,EAAE,UAAU,CAAC,KAAK;yBAC1B,CAAA;oBACL,CAAC;gBACL,CAAC,CAAC,CACT,CAAA;YACL,CAAC,CAAC,CAAA;YAEF,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACrB,mBAAmB,EAAE,CAAA;YACzB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;CACJ"}
+{"version":3,"file":"images.js","sourceRoot":"","sources":["../../../src/exporter/docx/images.ts"],"names":[],"mappings":"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"}

package/dist/exporter/docx/index.d.ts

@@ -1,22 +1,16 @@
-export class DOCXExporter {
-    constructor(doc: any, templateUrl: any, bibDB: any, imageDB: any, csl: any);
-    doc: any;
-    templateUrl: any;
-    bibDB: any;
-    imageDB: any;
-    csl: any;
+import type { BibDB, CSL, ExportDoc, ImageDB } from "../../types.js";
+export declare class DOCXExporter {
+    doc: ExportDoc;
+    templateUrl: string;
+    bibDB: BibDB;
+    imageDB: ImageDB;
+    csl: CSL;
     docTitle: string;
     mimeType: string;
     docContent: any;
-    init(): Promise<any>;
-    download(blob: any): any;
-    getBaseMetadata(): {
-        authors: any;
-        contributors: any;
-        keywords: any;
-        title: any;
-        language: any;
-        citationStyle: any;
-    };
+    constructor(doc: ExportDoc, templateUrl: string, bibDB: BibDB, imageDB: ImageDB, csl: CSL);
+    init(): Promise<void>;
+    download(blob: Blob): void;
+    getBaseMetadata(): any;
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/exporter/docx/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exporter/docx/index.js"],"names":[],"mappings":"AA8BA;IACI,4EAaC;IAZG,SAAc;IACd,iBAA8B;IAC9B,WAAkB;IAClB,aAAsB;IACtB,SAAc;IAEd,iBAA6D;IAC7D,iBAC6E;IAC7E,gBAEC;IAGL,qBAuFC;IAED,yBAMC;IAED;;;;;;;MAwCC;CACJ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exporter/docx/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAa,OAAO,EAAC,MAAM,gBAAgB,CAAA;AA6B7E,qBAAa,YAAY;IACrB,GAAG,EAAE,SAAS,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,GAAG,CAAA;IAER,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,GAAG,CAAA;gBAGX,GAAG,EAAE,SAAS,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG;IAgBZ,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAyFrB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAQ1B,eAAe,IAAI,GAAG;CA8CzB"}

package/dist/exporter/docx/index.js

@@ -2,7 +2,7 @@ import download from "downloadjs";
 import { shortFileTitle } from "fwtoolkit";
 import { fixTables, removeHidden, textContent } from "../tools/doc_content.js";
 import { createSlug } from "../tools/file.js";
-import { XmlZip } from "../tools/xml_zip.js";
+import { XmlZip as XmlZipImpl } from "../tools/xml_zip.js";
 import { DOCXExporterCitations } from "./citations.js";
 import { DOCXExporterComments } from "./comments.js";
 import { DOCXExporterFootnotes } from "./footnotes.js";
@@ -25,19 +25,27 @@ TODO:
 * - Templating of tag/contributor output
 */
 export class DOCXExporter {
+    doc;
+    templateUrl;
+    bibDB;
+    imageDB;
+    csl;
+    docTitle;
+    mimeType;
+    docContent;
     constructor(doc, templateUrl, bibDB, imageDB, csl) {
         this.doc = doc;
         this.templateUrl = templateUrl;
         this.bibDB = bibDB;
         this.imageDB = imageDB;
         this.csl = csl;
-        this.docTitle = shortFileTitle(this.doc.title, this.doc.path);
+        this.docTitle = shortFileTitle(this.doc.title, this.doc.path || "");
         this.mimeType =
             "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
         this.docContent = moveFootnoteComments(fixTables(removeHidden(this.doc.content)));
     }
     init() {
-        const xml = new XmlZip(this.templateUrl, this.mimeType);
+        const xml = new XmlZipImpl(this.templateUrl, this.mimeType);
         const tables = new DOCXExporterTables(xml);
         const math = new DOCXExporterMath(xml);
         const render = new DOCXExporterRender(xml);
@@ -48,7 +56,7 @@ export class DOCXExporter {
         const citations = new DOCXExporterCitations(this.docContent, this.doc.settings, this.bibDB, this.csl, xml);
         const footnotes = new DOCXExporterFootnotes(this.doc, this.docContent, this.doc.settings, this.imageDB, this.bibDB, xml, citations, this.csl, lists, math, tables, rels);
         const richtext = new DOCXExporterRichtext(this.doc, this.doc.settings, lists, footnotes, math, tables, rels, citations, images);
-        const comments = new DOCXExporterComments(this.docContent, this.doc.comments, xml, rels, richtext);
+        const comments = new DOCXExporterComments(this.docContent, this.doc.comments || {}, xml, rels, richtext);
         return xml
             .init()
             .then(() => citations.init())
@@ -76,7 +84,7 @@ export class DOCXExporter {
             if (part.type === "contributors_part" &&
                 part.attrs.metadata &&
                 part.content) {
-                return contributors.concat(part.content.map(node => ({
+                return contributors.concat(part.content.map((node) => ({
                     ...node.attrs,
                     role: part.attrs.metadata
                 })));
@@ -86,13 +94,13 @@ export class DOCXExporter {
             }
         }, []);
         return {
-            authors: contributors.filter(c => c.role === "authors"),
+            authors: contributors.filter((c) => c.role === "authors"),
             contributors,
             keywords: this.docContent.content.reduce((keywords, part) => {
                 if (part.type === "tags_part" &&
                     part.attrs.metadata === "keywords" &&
                     part.content) {
-                    return keywords.concat(part.content.map(keywordNode => keywordNode.attrs.tag));
+                    return keywords.concat(part.content.map((keywordNode) => keywordNode.attrs.tag));
                 }
                 else {
                     return keywords;

package/dist/exporter/docx/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exporter/docx/index.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exporter/docx/index.ts"],"names":[],"mappings":"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"}

package/dist/exporter/docx/lists.d.ts

@@ -1,33 +1,38 @@
-export class DOCXExporterLists {
-    constructor(docContent: any, xml: any, rels: any);
-    docContent: any;
-    xml: any;
-    rels: any;
+import type { FidusNode } from "../../types.js";
+import type { XMLElement } from "../tools/xml.js";
+import type { XmlZip } from "../tools/xml_zip.js";
+import type { DOCXExporterRels } from "./rels.js";
+export declare class DOCXExporterLists {
+    docContent: FidusNode;
+    xml: XmlZip;
+    rels: DOCXExporterRels;
     useBulletList: boolean;
-    usedNumberedList: any[];
-    styleXML: boolean;
-    numberingXML: boolean;
+    usedNumberedList: number[];
+    styleXML: XMLElement | null;
+    numberingXML: XMLElement | null;
     abstractNumIdCounter: number;
     numIdCounter: number;
-    bulletType: boolean;
-    numberFormat: string;
-    numberedTypes: any[];
+    bulletType: number | false;
+    bulletAbstractType: number | undefined;
+    numberFormat: string | null;
+    numberedTypes: number[];
+    numberedAbstractType: number | undefined;
     styleFilePath: string;
     numberingFilePath: string;
     ctFilePath: string;
-    init(): Promise<void> | Promise<any[]>;
-    initCt(): any;
-    ctXML: any;
+    ctXML: XMLElement | null;
+    constructor(docContent: FidusNode, xml: XmlZip, rels: DOCXExporterRels);
+    init(): Promise<void> | Promise<undefined>;
+    initCt(): Promise<void>;
     addRelsToCt(): void;
     findLists(): void;
-    addNumberingXml(): any;
-    addListParagraphStyle(): any;
+    addNumberingXml(): Promise<void>;
+    addListParagraphStyle(): Promise<void>;
     addUsedListTypes(): void;
-    numberedAbstractType: number | undefined;
-    getBulletType(): boolean;
-    getNumberedType(): any;
-    addBulletNumType(numId: any, abstractNumId: any): void;
-    addNumberedNumType(numId: any, start: any): void;
-    addNumberedAbstractNumType(abstractNumId: any, start: any): void;
+    getBulletType(): number | false;
+    getNumberedType(): number | undefined;
+    addBulletNumType(numId: number, abstractNumId: number): void;
+    addNumberedNumType(numId: number, start: number): void;
+    addNumberedAbstractNumType(abstractNumId: number, start: number): void;
 }
 //# sourceMappingURL=lists.d.ts.map

package/dist/exporter/docx/lists.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lists.d.ts","sourceRoot":"","sources":["../../../src/exporter/docx/lists.js"],"names":[],"mappings":"AAoBA;IACI,kDAmBC;IAlBG,gBAA4B;IAC5B,SAAc;IACd,UAAgB;IAChB,uBAA0B;IAC1B,wBAA0B;IAC1B,kBAAqB;IACrB,sBAAyB;IACzB,6BAA6B;IAC7B,qBAAqB;IAIrB,oBAAuB;IACvB,qBAA6B;IAC7B,qBAAuB;IACvB,sBAAsC;IACtC,0BAA6C;IAC7C,mBAAuC;IAG3C,uCA0BC;IAED,cAMC;IAJO,WAAkB;IAM1B,oBAUC;IAED,kBAQC;IAED,uBASC;IAED,6BAWC;IAED,yBAqDC;IAPO,yCAAqD;IAS7D,yBAEC;IAED,uBAEC;IAED,uDAgCC;IAED,iDASC;IAED,iEA0BC;CACJ"}
+{"version":3,"file":"lists.d.ts","sourceRoot":"","sources":["../../../src/exporter/docx/lists.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAC7C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAA;AAC/C,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,WAAW,CAAA;AAoB/C,qBAAa,iBAAiB;IAC1B,UAAU,EAAE,SAAS,CAAA;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,gBAAgB,CAAA;IACtB,aAAa,EAAE,OAAO,CAAA;IACtB,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,QAAQ,EAAE,UAAU,GAAG,IAAI,CAAA;IAC3B,YAAY,EAAE,UAAU,GAAG,IAAI,CAAA;IAC/B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,YAAY,EAAE,MAAM,CAAA;IAIpB,UAAU,EAAE,MAAM,GAAG,KAAK,CAAA;IAC1B,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,aAAa,EAAE,MAAM,CAAA;IACrB,iBAAiB,EAAE,MAAM,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;gBAEZ,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB;IAmBtE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC;IAoB1C,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAQvB,WAAW,IAAI,IAAI;IAenB,SAAS,IAAI,IAAI;IAUjB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAatC,gBAAgB,IAAI,IAAI;IAgExB,aAAa,IAAI,MAAM,GAAG,KAAK;IAI/B,eAAe,IAAI,MAAM,GAAG,SAAS;IAIrC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAwC5D,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IActD,0BAA0B,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAiCzE"}