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

package/dist/importer/odt/convert.js

@@ -3,7 +3,29 @@ import { xmlDOM } from "../../exporter/tools/xml.js";
 import { randomCommentId, randomFigureId, randomHeadingId, randomListId, randomTableId } from "../../schema/common/index.js";
 import { parseTracks } from "../../schema/common/track.js";
 import { isOdtBibliographyReferenceMark, isOdtBibliographySection, isOdtCitationMark, parseOdtBibliographyMark, parseOdtReferenceMark } from "./citations.js";
+import { gettext } from "fwtoolkit";
+function attr(node, name) {
+    if (node && typeof node === "object" && "getAttribute" in node) {
+        return String(node.getAttribute(name) || "");
+    }
+    return "";
+}
 export class OdtConvert {
+    importId;
+    template;
+    bibliography;
+    bibDB;
+    images;
+    styles;
+    contentDoc;
+    stylesDoc;
+    metaDoc;
+    manifestDoc;
+    tracks;
+    comments;
+    currentCommentIds;
+    currentTracks;
+    referenceableObjects;
     constructor(contentXml, stylesXml, metaXml, manifestXml, importId, template, bibliography, bibDb) {
         this.importId = importId;
         this.template = template;
@@ -38,6 +60,9 @@ export class OdtConvert {
         };
     }
     parseTrackedChanges() {
+        if (!this.contentDoc) {
+            return;
+        }
         const trackedChangesEl = this.contentDoc.query("text:tracked-changes");
         if (!trackedChangesEl) {
             return;
@@ -53,8 +78,8 @@ export class OdtConvert {
         // and is more easily converted.
         const deletions = {};
         const changedRegions = trackedChangesEl.queryAll("text:changed-region");
-        changedRegions.forEach(region => {
-            const id = region.getAttribute("text:id");
+        changedRegions.forEach((region) => {
+            const id = attr(region, "text:id");
             const insertion = region.query("text:insertion");
             const deletion = region.query("text:deletion");
             if (!insertion && !deletion) {
@@ -67,7 +92,7 @@ export class OdtConvert {
                     type: insertion ? "insertion" : "deletion",
                     user: 1,
                     username: changeInfo.query("dc:creator")?.textContent || "",
-                    date: parseInt(new Date(changeInfo.query("dc:date")?.textContent || "").getTime() / 60000)
+                    date: Math.floor(new Date(changeInfo.query("dc:date")?.textContent || "").getTime() / 60000)
                 };
                 if (insertion) {
                     track.approved = false;
@@ -75,14 +100,14 @@ export class OdtConvert {
                 this.tracks[id] = track;
                 if (deletion) {
                     // Store deletion content for later use
-                    deletions[id] = deletion.children.filter(child => child.tagName !== "office:change-info");
+                    deletions[id] = deletion.children.filter((child) => child.tagName !== "office:change-info");
                 }
             }
         });
         // Then find and replace all deletion change markers
         const changeMarkers = this.contentDoc.queryAll("text:change");
-        changeMarkers.forEach(marker => {
-            const changeId = marker.getAttribute("text:change-id");
+        changeMarkers.forEach((marker) => {
+            const changeId = attr(marker, "text:change-id");
             const deletion = deletions[changeId];
             if (deletion) {
                 if (deletion.length > 0) {
@@ -92,7 +117,7 @@ export class OdtConvert {
                     marker.parentElement.insertXMLAt(`<text:change-end text:change-id="${changeId}"/>`, markerIndex + 2);
                     if (deletion.length === 1) {
                         // Single block - just insert the content
-                        deletion[0].children.forEach(content => {
+                        deletion[0].children.forEach((content) => {
                             marker.parentElement.insertBefore(content, marker);
                         });
                     }
@@ -100,11 +125,11 @@ export class OdtConvert {
                         // Multiple blocks - need to split the paragraph/headline
                         const parentElement = marker.parentElement;
                         parentElement.splitAtChildElement(marker, deletion[0].children
-                            ?.map(node => node.toString())
+                            ?.map((node) => node.toString())
                             .join("") || "", // First block content to be added to current node
                         deletion
                             .slice(1, -1)
-                            .map(node => node.toString())
+                            .map((node) => node.toString())
                             .join(""), // Middle blocks
                         deletion[deletion.length - 1].toString() // Last block
                         );
@@ -120,37 +145,35 @@ export class OdtConvert {
             return;
         }
         const styleNodes = this.stylesDoc.queryAll("style:style");
-        styleNodes.forEach(node => {
-            const styleName = node.getAttribute("style:name");
+        styleNodes.forEach((node) => {
+            const styleName = attr(node, "style:name");
             this.styles[styleName] = this.parseStyle(node);
         });
         const contentStyleNodes = this.contentDoc.queryAll("style:style");
-        contentStyleNodes.forEach(node => {
-            const styleName = node.getAttribute("style:name");
+        contentStyleNodes.forEach((node) => {
+            const styleName = attr(node, "style:name");
             this.styles[styleName] = this.parseStyle(node);
         });
     }
     parseStyle(styleNode) {
         const properties = {
             // Basic style information
-            parentStyleName: styleNode.getAttribute("style:parent-style-name"),
-            isSection: styleNode.getAttribute("style:family") === "section" ||
+            parentStyleName: attr(styleNode, "style:parent-style-name"),
+            isSection: attr(styleNode, "style:family") === "section" ||
                 Boolean(styleNode.query("style:section-properties")),
-            title: styleNode.getAttribute("style:display-name"),
+            title: attr(styleNode, "style:display-name"),
             // Family and name info
-            family: styleNode.getAttribute("style:family"),
-            name: styleNode.getAttribute("style:name"),
+            family: attr(styleNode, "style:family"),
+            name: attr(styleNode, "style:name"),
             // Heading related
-            isHeading: styleNode.getAttribute("style:family") === "paragraph" &&
-                (styleNode
-                    .getAttribute("style:name")
+            isHeading: attr(styleNode, "style:family") === "paragraph" &&
+                (attr(styleNode, "style:name")
                     .toLowerCase()
                     .includes("heading") ||
-                    styleNode
-                        .getAttribute("style:parent-style-name")
+                    attr(styleNode, "style:parent-style-name")
                         ?.toLowerCase()
                         .includes("heading")),
-            outlineLevel: styleNode.getAttribute("text:outline-level"),
+            outlineLevel: attr(styleNode, "text:outline-level"),
             // Text properties
             textProperties: {},
             // Paragraph properties
@@ -162,53 +185,53 @@ export class OdtConvert {
         const textProperties = styleNode.query("style:text-properties");
         if (textProperties) {
             properties.textProperties = {
-                bold: textProperties.getAttribute("fo:font-weight") === "bold",
-                italic: textProperties.getAttribute("fo:font-style") === "italic",
-                fontSize: this.convertLength(textProperties.getAttribute("fo:font-size")),
-                fontFamily: textProperties.getAttribute("fo:font-family"),
-                color: textProperties.getAttribute("fo:color"),
-                backgroundColor: textProperties.getAttribute("fo:background-color"),
-                textDecoration: textProperties.getAttribute("style:text-underline-style") ||
-                    textProperties.getAttribute("style:text-line-through-style"),
-                textPosition: textProperties.getAttribute("style:text-position")
+                bold: attr(textProperties, "fo:font-weight") === "bold",
+                italic: attr(textProperties, "fo:font-style") === "italic",
+                fontSize: this.convertLength(attr(textProperties, "fo:font-size")),
+                fontFamily: attr(textProperties, "fo:font-family"),
+                color: attr(textProperties, "fo:color"),
+                backgroundColor: attr(textProperties, "fo:background-color"),
+                textDecoration: attr(textProperties, "style:text-underline-style") ||
+                    attr(textProperties, "style:text-line-through-style"),
+                textPosition: attr(textProperties, "style:text-position")
             };
         }
         // Parse paragraph properties
         const paragraphProperties = styleNode.query("style:paragraph-properties");
         if (paragraphProperties) {
             properties.paragraphProperties = {
-                marginTop: this.convertLength(paragraphProperties.getAttribute("fo:margin-top")),
-                marginBottom: this.convertLength(paragraphProperties.getAttribute("fo:margin-bottom")),
-                marginLeft: this.convertLength(paragraphProperties.getAttribute("fo:margin-left")),
-                marginRight: this.convertLength(paragraphProperties.getAttribute("fo:margin-right")),
-                textAlign: paragraphProperties.getAttribute("fo:text-align"),
-                lineHeight: paragraphProperties.getAttribute("fo:line-height"),
-                backgroundColor: paragraphProperties.getAttribute("fo:background-color"),
-                padding: this.convertLength(paragraphProperties.getAttribute("fo:padding")),
-                borderStyle: paragraphProperties.getAttribute("fo:border-style")
+                marginTop: this.convertLength(attr(paragraphProperties, "fo:margin-top")),
+                marginBottom: this.convertLength(attr(paragraphProperties, "fo:margin-bottom")),
+                marginLeft: this.convertLength(attr(paragraphProperties, "fo:margin-left")),
+                marginRight: this.convertLength(attr(paragraphProperties, "fo:margin-right")),
+                textAlign: attr(paragraphProperties, "fo:text-align"),
+                lineHeight: attr(paragraphProperties, "fo:line-height"),
+                backgroundColor: attr(paragraphProperties, "fo:background-color"),
+                padding: this.convertLength(attr(paragraphProperties, "fo:padding")),
+                borderStyle: attr(paragraphProperties, "fo:border-style")
             };
         }
         // Parse section properties
         const sectionProperties = styleNode.query("style:section-properties");
         if (sectionProperties) {
             properties.sectionProperties = {
-                columnCount: sectionProperties.getAttribute("fo:column-count"),
-                columnGap: this.convertLength(sectionProperties.getAttribute("fo:column-gap")),
-                backgroundColor: sectionProperties.getAttribute("fo:background-color"),
+                columnCount: attr(sectionProperties, "fo:column-count"),
+                columnGap: this.convertLength(attr(sectionProperties, "fo:column-gap")),
+                backgroundColor: attr(sectionProperties, "fo:background-color"),
                 margins: {
-                    top: this.convertLength(sectionProperties.getAttribute("fo:margin-top")),
-                    bottom: this.convertLength(sectionProperties.getAttribute("fo:margin-bottom")),
-                    left: this.convertLength(sectionProperties.getAttribute("fo:margin-left")),
-                    right: this.convertLength(sectionProperties.getAttribute("fo:margin-right"))
+                    top: this.convertLength(attr(sectionProperties, "fo:margin-top")),
+                    bottom: this.convertLength(attr(sectionProperties, "fo:margin-bottom")),
+                    left: this.convertLength(attr(sectionProperties, "fo:margin-left")),
+                    right: this.convertLength(attr(sectionProperties, "fo:margin-right"))
                 }
             };
         }
         // Additional table-specific properties
-        if (styleNode.getAttribute("style:family") === "table") {
+        if (attr(styleNode, "style:family") === "table") {
             properties.tableProperties = {
-                align: styleNode.getAttribute("table:align"),
-                width: this.convertLength(styleNode.getAttribute("style:width")),
-                relWidth: styleNode.getAttribute("style:rel-width")
+                align: attr(styleNode, "table:align"),
+                width: this.convertLength(attr(styleNode, "style:width")),
+                relWidth: attr(styleNode, "style:rel-width")
             };
         }
         return properties;
@@ -227,11 +250,14 @@ export class OdtConvert {
         return null;
     }
     parseComments() {
+        if (!this.contentDoc) {
+            return;
+        }
         const annotations = this.contentDoc.queryAll("office:annotation");
-        annotations.forEach(annotation => {
+        annotations.forEach((annotation) => {
             const username = annotation.query("dc:creator")?.textContent || "";
             const date = new Date(annotation.query("dc:date")?.textContent || "").getTime();
-            const id = (annotation.getAttribute("office:name") || "")
+            const id = (attr(annotation, "office:name") || "")
                 .replace(/\D/g, "")
                 .slice(0, 9);
             if (id) {
@@ -242,15 +268,15 @@ export class OdtConvert {
                     date,
                     comment: annotation
                         .queryAll("text:p")
-                        .map(par => this.convertBlockNode(par))
-                        .filter(par => par)
+                        .map((par) => this.convertBlockNode(par))
+                        .filter((par) => par)
                         .flat(),
                     answers: [],
-                    resolved: annotation.getAttribute("loext:resolved") === "true"
+                    resolved: attr(annotation, "loext:resolved") === "true"
                 };
             }
             else {
-                const parentId = (annotation.getAttribute("loext:parent-name") || "")
+                const parentId = (attr(annotation, "loext:parent-name") || "")
                     .replace(/\D/g, "")
                     .slice(0, 9);
                 if (parentId && this.comments[parentId]) {
@@ -263,8 +289,8 @@ export class OdtConvert {
                         answer: annotation
                             .queryAll("text:p")
                             .slice(1)
-                            .map(par => this.convertBlockNode(par))
-                            .filter(par => par)
+                            .map((par) => this.convertBlockNode(par))
+                            .filter((par) => par)
                             .flat()
                     });
                 }
@@ -274,8 +300,8 @@ export class OdtConvert {
     collectReferenceableObjects(node) {
         // Handle heading bookmarks
         const bookmarkStarts = node.queryAll("text:bookmark-start");
-        bookmarkStarts.forEach(mark => {
-            const refName = mark.getAttribute("text:name");
+        bookmarkStarts.forEach((mark) => {
+            const refName = attr(mark, "text:name");
             if (!refName) {
                 return;
             }
@@ -296,8 +322,8 @@ export class OdtConvert {
         });
         // Handle figure sequences
         const sequences = node.queryAll("text:sequence");
-        sequences.forEach(sequence => {
-            const refName = sequence.getAttribute("text:ref-name");
+        sequences.forEach((sequence) => {
+            const refName = attr(sequence, "text:ref-name");
             if (!refName) {
                 return;
             }
@@ -347,11 +373,11 @@ export class OdtConvert {
                 ]
             });
         }
-        title.containerNodes.forEach(node => {
+        title.containerNodes.forEach((node) => {
             node.parentElement.removeChild(node);
         });
         document.attrs.title =
-            title.content.map(node => node.textContent).join("") ||
+            title.content.map((node) => node.textContent).join("") ||
                 gettext("Untitled");
         // Get all content sections from the ODT
         const body = this.contentDoc.query("office:text");
@@ -361,7 +387,7 @@ export class OdtConvert {
         // Look for metadata sections first (author, abstract, etc.)
         const metadataContent = this.extractMetadata();
         metadataContent.forEach(({ type, attrs, content }) => {
-            const templatePart = templateParts.find(part => part.attrs.metadata === type);
+            const templatePart = templateParts.find((part) => part.attrs.metadata === type);
             if (templatePart) {
                 document.content.push({
                     type: templatePart.type,
@@ -372,7 +398,7 @@ export class OdtConvert {
                     content: content.content
                 });
                 // Remove paragraphs from content so they are not added to body
-                content.containerNodes.forEach(node => {
+                content.containerNodes.forEach((node) => {
                     node.parentElement.removeChild(node);
                 });
             }
@@ -380,7 +406,7 @@ export class OdtConvert {
         // Group remaining content by sections based on style names/titles
         const sections = this.groupContentIntoSections(body);
         // Map ODT sections to template parts
-        sections.forEach(section => {
+        sections.forEach((section) => {
             // Find matching template part
             const templatePart = this.findMatchingTemplatePart(section.title, templateParts);
             if (templatePart) {
@@ -403,18 +429,16 @@ export class OdtConvert {
         });
         // Add remaining content to body section
         const unassignedContent = sections
-            .filter(section => !this.findMatchingTemplatePart(section.title, templateParts))
-            .flatMap(section => section.content);
+            .filter((section) => !this.findMatchingTemplatePart(section.title, templateParts))
+            .flatMap((section) => section.content);
         if (unassignedContent.length) {
             // Find default body template part
-            const bodyTemplatePart = templateParts.find(part => !part.attrs.metadata && part.type === "richtext_part");
+            const bodyTemplatePart = templateParts.find((part) => !part.attrs.metadata && part.type === "richtext_part");
             document.content.push({
                 type: "richtext_part",
                 attrs: {
-                    title: bodyTemplatePart
-                        ? bodyTemplatePart.attrs.title
-                        : "Body",
-                    id: bodyTemplatePart ? bodyTemplatePart.attrs.id : "body",
+                    title: bodyTemplatePart?.attrs?.title || "Body",
+                    id: bodyTemplatePart?.attrs?.id || "body",
                     marks: ["strong", "em", "link"]
                 },
                 content: unassignedContent
@@ -468,8 +492,8 @@ export class OdtConvert {
         }
         const userDefined = this.metaDoc.queryAll("meta:user-defined");
         const contributors = [];
-        userDefined.forEach(prop => {
-            const name = prop.getAttribute("meta:name");
+        userDefined.forEach((prop) => {
+            const name = attr(prop, "meta:name");
             if (!name || !name.startsWith("fidus_contributor_")) {
                 return;
             }
@@ -509,7 +533,7 @@ export class OdtConvert {
             }
         });
         const byRole = {};
-        contributors.forEach(contributor => {
+        contributors.forEach((contributor) => {
             if (!contributor) {
                 return;
             }
@@ -527,7 +551,7 @@ export class OdtConvert {
         const metaAuthors = this.contentDoc.queryAll("meta:user-defined", {
             "meta:name": "author"
         });
-        metaAuthors.forEach(authorMeta => {
+        metaAuthors.forEach((authorMeta) => {
             const authorText = authorMeta.textContent;
             const [firstname = "", lastname = ""] = authorText.split(" ", 2);
             authors.push({
@@ -576,7 +600,7 @@ export class OdtConvert {
                 "text:outline-level": "1"
             }); // Then check content for "Abstract"
         if (abstractSection &&
-            (abstractSection.getAttribute("text:style-name") === "Abstract" ||
+            (attr(abstractSection, "text:style-name") === "Abstract" ||
                 abstractSection.textContent.includes("Abstract"))) {
             return {
                 content: this.convertContainer(abstractSection),
@@ -607,12 +631,12 @@ export class OdtConvert {
             return null;
         }
         // Try exact match first
-        let matchingPart = templateParts.find(part => part.type === "richtext_part" &&
+        let matchingPart = templateParts.find((part) => part.type === "richtext_part" &&
             !part.attrs.metadata &&
             part.attrs.title.toLowerCase() === sectionTitle.toLowerCase());
         if (!matchingPart) {
             // Try fuzzy matching if exact match fails
-            matchingPart = templateParts.find(part => part.type === "richtext_part" &&
+            matchingPart = templateParts.find((part) => part.type === "richtext_part" &&
                 !part.attrs.metadata &&
                 this.isSimilarTitle(part.attrs.title, sectionTitle));
         }
@@ -620,7 +644,7 @@ export class OdtConvert {
     }
     isSimilarTitle(title1, title2) {
         // Remove special characters and extra spaces
-        const normalize = str => str
+        const normalize = (str) => str
             .toLowerCase()
             .replace(/[^a-z0-9]/g, "")
             .trim();
@@ -672,7 +696,7 @@ export class OdtConvert {
         // Check style properties for title-like formatting
         const firstParagraph = this.contentDoc.query("text:p");
         if (firstParagraph) {
-            const styleName = firstParagraph.getAttribute("text:style-name");
+            const styleName = attr(firstParagraph, "text:style-name");
             const style = this.styles[styleName];
             if (style && this.isTitleStyle(style)) {
                 // Remove this node from the document so it's not processed again
@@ -727,7 +751,7 @@ export class OdtConvert {
         // For headings, use the text content as section title
         if (node.tagName === "text:h") {
             // Get the heading level
-            const level = parseInt(node.getAttribute("text:outline-level")) || 1;
+            const level = parseInt(attr(node, "text:outline-level")) || 1;
             // Only use level 1 and 2 headings as section titles
             if (level <= 2) {
                 return node.textContent.trim();
@@ -755,7 +779,7 @@ export class OdtConvert {
         }
         // For text:section elements, check for section-name attribute
         if (node.tagName === "text:section") {
-            const sectionName = node.getAttribute("text:name");
+            const sectionName = attr(node, "text:name");
             if (sectionName) {
                 return this.formatSectionName(sectionName);
             }
@@ -769,7 +793,7 @@ export class OdtConvert {
         const words = name.split(/[_-]/);
         // Capitalize first letter of each word and join
         return words
-            .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+            .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
             .join(" ")
             .trim();
     }
@@ -779,8 +803,8 @@ export class OdtConvert {
             title: null,
             content: []
         };
-        body.children.forEach(node => {
-            const styleName = node.getAttribute("text:style-name");
+        body.children.forEach((node) => {
+            const styleName = attr(node, "text:style-name");
             const title = this.getSectionTitle(node, styleName);
             if (title && this.isHeadingStyle(styleName)) {
                 // Start new section
@@ -793,9 +817,9 @@ export class OdtConvert {
                 };
             }
             const converted = [this.convertBlockNode(node)]
-                .filter(node => node)
+                .filter((node) => node)
                 .flat();
-            converted.forEach(node => currentSection.content.push(node));
+            converted.forEach((node) => currentSection.content.push(node));
         });
         // Add final section
         if (currentSection.content.length) {
@@ -834,7 +858,7 @@ export class OdtConvert {
                 "source code pro",
                 "fira code"
             ];
-            return monospacePatterns.some(pattern => fontFamily.includes(pattern));
+            return monospacePatterns.some((pattern) => fontFamily.includes(pattern));
         }
         return false;
     }
@@ -875,12 +899,12 @@ export class OdtConvert {
     }
     convertContainer(container) {
         return container.children
-            .map(node => this.convertBlockNode(node))
-            .filter(node => node)
+            .map((node) => this.convertBlockNode(node))
+            .filter((node) => node)
             .flat();
     }
     convertBlockNode(node) {
-        const track = this.currentTracks.map(track => ({
+        const track = this.currentTracks.map((track) => ({
             type: track.type,
             user: track.attrs.user,
             username: track.attrs.username,
@@ -917,7 +941,7 @@ export class OdtConvert {
                 // Skip bibliography sections inserted by citation managers
                 // (Zotero: name contains "ZOTERO_BIBL"/"CSL_BIBLIOGRAPHY",
                 //  JabRef: name is "JR_bib" / "JR_BIB").
-                const sectionName = node.getAttribute("text:name") || "";
+                const sectionName = attr(node, "text:name") || "";
                 if (isOdtBibliographySection(sectionName)) {
                     return null;
                 }
@@ -931,7 +955,7 @@ export class OdtConvert {
         }
     }
     convertParagraph(node, attrs = {}) {
-        const styleName = node.getAttribute("text:style-name");
+        const styleName = attr(node, "text:style-name");
         const style = this.styles[styleName];
         // Check if this is a code block (preformatted text)
         if (this.isCodeBlockStyle(styleName, style)) {
@@ -969,12 +993,12 @@ export class OdtConvert {
         };
     }
     convertHeading(node, attrs = {}) {
-        const level = parseInt(node.getAttribute("text:outline-level") || 1) || 1;
+        const level = parseInt(attr(node, "text:outline-level") || "1") || 1;
         // Check for bookmark
         let id = null;
         const bookmarkStart = node.query("text:bookmark-start");
         if (bookmarkStart) {
-            const refName = bookmarkStart.getAttribute("text:name");
+            const refName = attr(bookmarkStart, "text:name");
             if (refName && this.referenceableObjects[refName]) {
                 id = this.referenceableObjects[refName].id;
             }
@@ -992,12 +1016,12 @@ export class OdtConvert {
         let insideCitationReferenceMark = false;
         let insideBibliographyReferenceMark = false;
         return node.children
-            .map(child => {
+            .map((child) => {
             if (insideBibliographyReferenceMark) {
                 // Swallow all rendered bibliography content until the
                 // closing mark — we have our own bibliography system.
                 if (child.tagName === "text:reference-mark-end") {
-                    const name = child.getAttribute("text:name");
+                    const name = attr(child, "text:name");
                     if (name && isOdtBibliographyReferenceMark(name)) {
                         insideBibliographyReferenceMark = false;
                     }
@@ -1007,7 +1031,7 @@ export class OdtConvert {
             if (insideCitationReferenceMark) {
                 if (child.tagName === "text:reference-mark-end") {
                     // Process citation when we hit the end mark
-                    const name = child.getAttribute("text:name");
+                    const name = attr(child, "text:name");
                     if (name && isOdtCitationMark(name)) {
                         insideCitationReferenceMark = false;
                         return this.convertCitation(name, currentStyleMarks);
@@ -1017,7 +1041,7 @@ export class OdtConvert {
             }
             switch (child.tagName) {
                 case "text:change-start": {
-                    const changeId = child.getAttribute("text:change-id");
+                    const changeId = attr(child, "text:change-id");
                     const track = this.tracks[changeId];
                     if (track) {
                         const trackMark = {
@@ -1036,10 +1060,10 @@ export class OdtConvert {
                     return null;
                 }
                 case "text:change-end": {
-                    const changeId = child.getAttribute("text:change-id");
+                    const changeId = attr(child, "text:change-id");
                     const track = this.tracks[changeId];
                     if (track) {
-                        this.currentTracks = this.currentTracks.filter(mark => mark.type !== track.type);
+                        this.currentTracks = this.currentTracks.filter((mark) => mark.type !== track.type);
                     }
                     return null;
                 }
@@ -1059,7 +1083,7 @@ export class OdtConvert {
                 case "office:annotation-end":
                     return this.convertAnnotationEnd(child);
                 case "text:reference-mark-start": {
-                    const name = child.getAttribute("text:name");
+                    const name = attr(child, "text:name");
                     if (name && isOdtCitationMark(name)) {
                         insideCitationReferenceMark = true;
                     }
@@ -1081,13 +1105,13 @@ export class OdtConvert {
                     console.warn(`Unsupported inline node: ${child.tagName}`);
             }
         })
-            .filter(node => node)
+            .filter((node) => node)
             .flat();
     }
     getCurrentMarks(currentStyleMarks = []) {
         const commentMarks = [];
         // Add comment marks for any active comment IDs
-        this.currentCommentIds.forEach(commentId => {
+        this.currentCommentIds.forEach((commentId) => {
             commentMarks.push({
                 type: "comment",
                 attrs: {
@@ -1109,7 +1133,7 @@ export class OdtConvert {
         return textNode;
     }
     convertSpan(node, currentStyleMarks) {
-        const styleName = node.getAttribute("text:style-name");
+        const styleName = attr(node, "text:style-name");
         const style = this.styles[styleName];
         if (style?.textProperties?.bold) {
             currentStyleMarks = [...currentStyleMarks, { type: "strong" }];
@@ -1145,7 +1169,7 @@ export class OdtConvert {
                 "droid sans mono",
                 "monospace"
             ];
-            const isMonospace = monospacePatterns.some(pattern => fontFamily.includes(pattern));
+            const isMonospace = monospacePatterns.some((pattern) => fontFamily.includes(pattern));
             if (isMonospace) {
                 currentStyleMarks = [...currentStyleMarks, { type: "code" }];
             }
@@ -1165,13 +1189,13 @@ export class OdtConvert {
         // Check if this is a citation-only footnote
         const referenceMarkStart = firstParagraph.query("text:reference-mark-start");
         const referenceMarkEnd = firstParagraph.query("text:reference-mark-end");
-        const markName = referenceMarkStart?.getAttribute("text:name");
+        const markName = attr(referenceMarkStart, "text:name");
         if (referenceMarkStart &&
             referenceMarkEnd &&
             markName &&
             isOdtCitationMark(markName) &&
             // Check that there's no content outside the reference marks
-            firstParagraph.children.every(child => child.tagName === "text:reference-mark-start" ||
+            firstParagraph.children.every((child) => child.tagName === "text:reference-mark-start" ||
                 child.tagName === "text:reference-mark-end" ||
                 (child.tagName === "text:span" &&
                     child.previousSibling?.tagName ===
@@ -1207,7 +1231,7 @@ export class OdtConvert {
         return null;
     }
     convertList(node, attrs) {
-        const listStyle = node.getAttribute("text:style-name");
+        const listStyle = attr(node, "text:style-name");
         const isOrdered = this.isOrderedList(listStyle);
         attrs = Object.assign({
             id: randomListId()
@@ -1218,14 +1242,14 @@ export class OdtConvert {
         return {
             type: isOrdered ? "ordered_list" : "bullet_list",
             attrs,
-            content: node.queryAll("text:list-item").map(item => ({
+            content: node.queryAll("text:list-item").map((item) => ({
                 type: "list_item",
                 content: this.convertContainer(item)
             }))
         };
     }
     convertAnnotationStart(node) {
-        const commentId = (node.getAttribute("office:name") || "")
+        const commentId = (attr(node, "office:name") || "")
             .replace(/\D/g, "")
             .slice(0, 9);
         if (commentId && this.comments[commentId]) {
@@ -1234,7 +1258,7 @@ export class OdtConvert {
         return null;
     }
     convertAnnotationEnd(node) {
-        const commentId = (node.getAttribute("office:name") || "")
+        const commentId = (attr(node, "office:name") || "")
             .replace(/\D/g, "")
             .slice(0, 9);
         if (commentId) {
@@ -1246,7 +1270,7 @@ export class OdtConvert {
         return null;
     }
     convertHeadingReference(node) {
-        const refName = node.getAttribute("text:ref-name");
+        const refName = attr(node, "text:ref-name");
         if (!refName || !this.referenceableObjects[refName]) {
             return null;
         }
@@ -1263,7 +1287,7 @@ export class OdtConvert {
         };
     }
     convertFigureReference(node) {
-        const refName = node.getAttribute("text:ref-name");
+        const refName = attr(node, "text:ref-name");
         if (!refName || !this.referenceableObjects[refName]) {
             return null;
         }
@@ -1299,13 +1323,13 @@ export class OdtConvert {
         if (!frame) {
             return null;
         }
-        const href = imageElement.getAttribute("xlink:href");
+        const href = attr(imageElement, "xlink:href");
         if (!href || !href.startsWith("Pictures/")) {
             return null;
         }
         const imageId = Math.floor(Math.random() * 1000000);
-        const width = this.convertLength(node.getAttribute("svg:width"));
-        const height = this.convertLength(node.getAttribute("svg:height"));
+        const width = this.convertLength(attr(node, "svg:width"));
+        const height = this.convertLength(attr(node, "svg:height"));
         const title = href.split("/").pop();
         this.images[imageId] = {
             id: imageId,
@@ -1327,7 +1351,7 @@ export class OdtConvert {
         const sequence = frame.query("text:sequence");
         let figureId = null;
         if (sequence) {
-            const refName = sequence.getAttribute("text:ref-name");
+            const refName = attr(sequence, "text:ref-name");
             if (refName && this.referenceableObjects[refName]) {
                 figureId = this.referenceableObjects[refName].id;
             }
@@ -1411,13 +1435,13 @@ export class OdtConvert {
         }
     }
     convertTable(node, attrs) {
-        const width = node.getAttribute("style:rel-width")?.replace("%", "") || "100";
-        const styleName = node.getAttribute("table:style-name");
+        const width = attr(node, "style:rel-width")?.replace("%", "") || "100";
+        const styleName = attr(node, "table:style-name");
         const style = this.styles[styleName];
         const aligned = style?.tableProperties.align || "center";
         attrs = Object.assign({
             id: randomTableId(),
-            track: parseTracks(node.getAttribute("text:change-id")),
+            track: parseTracks(attr(node, "text:change-id")),
             width,
             aligned,
             layout: "fixed",
@@ -1433,7 +1457,7 @@ export class OdtConvert {
                     type: "table_body",
                     content: node
                         .queryAll("table:table-row")
-                        .map(row => this.convertTableRow(row))
+                        .map((row) => this.convertTableRow(row))
                 }
             ]
         };
@@ -1443,7 +1467,7 @@ export class OdtConvert {
             type: "table_row",
             content: row
                 .queryAll(["table:table-cell", "table:covered-table-cell"])
-                .map(cell => this.convertTableCell(cell))
+                .map((cell) => this.convertTableCell(cell))
         };
     }
     convertTableCell(node) {
@@ -1453,16 +1477,16 @@ export class OdtConvert {
         return {
             type: "table_cell",
             attrs: {
-                colspan: parseInt(node.getAttribute("table:number-columns-spanned")) || 1,
-                rowspan: parseInt(node.getAttribute("table:number-rows-spanned")) ||
+                colspan: parseInt(attr(node, "table:number-columns-spanned")) || 1,
+                rowspan: parseInt(attr(node, "table:number-rows-spanned")) ||
                     1,
-                track: parseTracks(node.getAttribute("text:change-id"))
+                track: parseTracks(attr(node, "text:change-id"))
             },
             content: this.convertContainer(node)
         };
     }
     convertLink(node, currentStyleMarks) {
-        const href = node.getAttribute("xlink:href");
+        const href = attr(node, "xlink:href");
         currentStyleMarks = currentStyleMarks.concat([
             { type: "link", attrs: { href } }
         ]);
@@ -1475,14 +1499,14 @@ export class OdtConvert {
         // 3. Default to "en-US"
         // Check content language
         if (this.contentDoc) {
-            const langAttr = this.contentDoc.getAttribute("office:default-language") ||
-                this.contentDoc.getAttribute("dc:language");
+            const langAttr = attr(this.contentDoc, "office:default-language") ||
+                attr(this.contentDoc, "dc:language");
             if (langAttr) {
                 return langAttr;
             }
             const firstParagraph = this.contentDoc.query("text:p");
             if (firstParagraph) {
-                const paraLang = firstParagraph.getAttribute("xml:lang");
+                const paraLang = attr(firstParagraph, "xml:lang");
                 if (paraLang) {
                     return paraLang;
                 }
@@ -1492,8 +1516,8 @@ export class OdtConvert {
         if (this.stylesDoc) {
             const defaultStyle = this.stylesDoc.query("style:default-style");
             if (defaultStyle) {
-                const styleLang = defaultStyle.getAttribute("fo:language") ||
-                    defaultStyle.getAttribute("style:language-complex");
+                const styleLang = attr(defaultStyle, "fo:language") ||
+                    attr(defaultStyle, "style:language-complex");
                 if (styleLang) {
                     return styleLang;
                 }