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

package/src/importer/docx/{convert.js → convert.ts}

@@ -1,5 +1,6 @@
 import {MathMLToLaTeX} from "mathml-to-latex"
 import {xmlDOM} from "../../exporter/tools/xml.js"
+import type {XMLElement} from "../../exporter/tools/xml.js"
 import {
     randomCommentId,
     randomFigureId,
@@ -16,9 +17,36 @@ import {
 import {normalizeText} from "./helpers.js"
 import {omml2mathml} from "./omml2mathml.js"
 import {DocxParser} from "./parse.js"
+import {gettext} from "fwtoolkit"
+import type {BibDB, FidusDoc, FidusNode, ImageDBEntry} from "../../types.js"
+
+function attr(node: unknown, name: string): string {
+    if (node && typeof node === "object" && "getAttribute" in node) {
+        return String((node as XMLElement).getAttribute(name) || "")
+    }
+    return ""
+}
 
 export class DocxConvert {
-    constructor(zip, importId, template, bibliography) {
+    zip: any
+    importId: string
+    template: {content: FidusDoc}
+    bibliography: Record<string, any>
+    images: Record<number, ImageDBEntry>
+    parser: DocxParser
+    tracks: Record<string, any>
+    currentTracks: any[]
+    currentFields: any[]
+    currentCommentIds: string[]
+    sourcesXml: string | null
+    referenceTargets: Record<string, {id: string; type: string; text?: string}>
+
+    constructor(
+        zip: any,
+        importId: string,
+        template: {content: FidusDoc},
+        bibliography: Record<string, any>
+    ) {
         this.zip = zip
         this.importId = importId
         this.template = template
@@ -30,16 +58,21 @@ export class DocxConvert {
         this.currentFields = []
         this.currentCommentIds = []
         this.sourcesXml = null
+        this.referenceTargets = {}
     }
 
-    async init() {
+    async init(): Promise<{
+        content: FidusDoc
+        settings: Record<string, any>
+        comments: Record<string, any>
+    }> {
         await this.parser.init()
         // Load Word-native bibliography sources if present.
         // This file is required by DocxCitationsParser for CITATION field codes.
         this.sourcesXml =
             (await this.zip.file("customXml/item1.xml")?.async("string")) ??
             null
-        const body = this.parser.document.query("w:body")
+        const body = this.parser.document!.query("w:body")
         if (!body) {
             return {
                 content: {
@@ -55,7 +88,7 @@ export class DocxConvert {
             }
         }
         // Find all reference targets in the document for cross-references
-        this.referenceTargets = this.findReferenceTargets(this.parser.document)
+        this.referenceTargets = this.findReferenceTargets(this.parser.document!)
 
         const convertedContent = this.convertDocument(body)
         // Convert document
@@ -63,18 +96,18 @@ export class DocxConvert {
             content: convertedContent,
             settings: {
                 import_id: this.importId,
-                tracked: this.hasTrackedChanges(this.parser.document),
-                language: this.detectLanguage(this.parser.document)
+                tracked: this.hasTrackedChanges(this.parser.document!),
+                language: this.detectLanguage(this.parser.document!)
             },
             comments: this.parser.comments
         }
     }
 
-    convertDocument(body) {
+    convertDocument(body: any): FidusDoc {
         const templateParts = this.template.content.content.slice()
         templateParts.shift() // Remove first element
 
-        const document = {
+        const document: any = {
             type: "doc",
             attrs: {
                 import_id: this.importId
@@ -89,23 +122,23 @@ export class DocxConvert {
                 {type: "text", text: gettext("Untitled")}
             ]
         })
-        title.containerNodes.forEach(node => {
+        title.containerNodes.forEach((node: any) => {
             node.parentElement.removeChild(node)
         })
         document.attrs.title =
-            title.content.map(node => node.textContent).join("") ||
+            title.content.map((node: any) => node.textContent).join("") ||
             gettext("Untitled")
         // Extract metadata sections
         const metadata = this.extractMetadata(body)
-        metadata.forEach(({type, content}) => {
+        metadata.forEach(({type, content}: any) => {
             const templatePart = templateParts.find(
-                part => part.attrs.metadata === type
+                (part: any) => part.attrs.metadata === type
             )
-            const attrs = {}
-            if (templatePart.attrs.hidden) {
-                attrs.hidden = false
-            }
+            const attrs: Record<string, any> = {}
             if (templatePart) {
+                if (templatePart.attrs?.hidden) {
+                    attrs.hidden = false
+                }
                 document.content.push({
                     type: templatePart.type,
                     attrs: {
@@ -115,7 +148,7 @@ export class DocxConvert {
                     content: content.content
                 })
                 // Remove paragraphs from content so they are not added to body
-                content.containerNodes.forEach(node => {
+                content.containerNodes.forEach((node: any) => {
                     node.parentElement?.removeChild(node)
                 })
             }
@@ -123,7 +156,7 @@ export class DocxConvert {
         // Extract main content sections
         const sections = this.groupContentIntoSections(body)
         // Map sections to template parts
-        sections.forEach(section => {
+        sections.forEach((section: any) => {
             const templatePart = this.findMatchingTemplatePart(
                 section.title,
                 templateParts
@@ -149,40 +182,38 @@ export class DocxConvert {
         // Add remaining content to body section
         const unassignedContent = sections
             .filter(
-                section =>
+                (section: any) =>
                     !this.findMatchingTemplatePart(section.title, templateParts)
             )
-            .flatMap(section => section.content)
+            .flatMap((section: any) => section.content)
 
         if (unassignedContent.length) {
             const bodyTemplatePart = templateParts.find(
-                part => !part.attrs.metadata && part.type === "richtext_part"
+                (part: any) => !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
             })
         }
 
-        return document
+        return document as FidusDoc
     }
 
-    extractMetadata(body) {
-        const metadata = []
+    extractMetadata(body: any) {
+        const metadata: any[] = []
 
         // Try structured contributor data from custom properties first
         const contributorsByRole = this.extractContributorsFromCustomProps()
         if (Object.keys(contributorsByRole).length) {
             Object.entries(contributorsByRole).forEach(
-                ([role, contributors]) => {
+                ([role, contributors]: any) => {
                     metadata.push({
                         type: role,
                         content: {content: contributors, containerNodes: []}
@@ -226,10 +257,10 @@ export class DocxConvert {
         }
 
         const properties = this.parser.customDoc.queryAll("property")
-        const contributors = []
+        const contributors: any[] = []
 
-        properties.forEach(prop => {
-            const name = prop.getAttribute("name")
+        properties.forEach((prop: any) => {
+            const name = attr(prop, "name")
             if (!name || !name.startsWith("fidus_contributor_")) {
                 return
             }
@@ -272,8 +303,8 @@ export class DocxConvert {
             }
         })
 
-        const byRole = {}
-        contributors.forEach(contributor => {
+        const byRole: Record<string, any> = {}
+        contributors.forEach((contributor: any) => {
             if (!contributor) {
                 return
             }
@@ -287,15 +318,15 @@ export class DocxConvert {
         return byRole
     }
 
-    extractAuthors(body) {
-        const authors = []
+    extractAuthors(body: any) {
+        const authors: any[] = []
 
         // Try to find author information in metadata
         const authorNodes = body
             .queryAll("w:pStyle", {"w:val": "Author"})
-            .map(pStyle => pStyle.closest("w:p"))
-            .filter(p => p)
-        authorNodes.forEach(authorNode => {
+            .map((pStyle: any) => pStyle.closest("w:p"))
+            .filter((p: any) => p)
+        authorNodes.forEach((authorNode: any) => {
             const authorText = this.getTextContent(authorNode)
             const [firstname = "", lastname = ""] = authorText.split(" ", 2)
             authors.push({
@@ -315,7 +346,7 @@ export class DocxConvert {
             }
         }
         // Also check Creator in document properties
-        const creator = this.parser.coreDoc.query("dc:creator")?.textContent
+        const creator = this.parser.coreDoc?.query("dc:creator")?.textContent
 
         if (creator) {
             const [firstname = "", lastname = ""] = creator.split(" ", 2)
@@ -338,15 +369,15 @@ export class DocxConvert {
         return {content: [], containerNodes: []}
     }
 
-    extractAbstract(body) {
+    extractAbstract(body: any) {
         // Look for section with Abstract style or heading
         const abstractNodes = body
             .queryAll("w:pStyle", {"w:val": "Abstract"})
-            .map(pStyle => pStyle.closest("w:p"))
-            .filter(p => p)
+            .map((pStyle: any) => pStyle.closest("w:p"))
+            .filter((p: any) => p)
         if (abstractNodes.length) {
             return {
-                content: abstractNodes.map(abstractNode =>
+                content: abstractNodes.map((abstractNode: any) =>
                     this.convertBlock(abstractNode)
                 ),
                 containerNodes: abstractNodes
@@ -355,7 +386,7 @@ export class DocxConvert {
         const extractedPart = this.extractPartOnTitle(body, ["Abstract"])
         if (extractedPart.content.length) {
             return {
-                content: extractedPart.content.map(abstractNode =>
+                content: extractedPart.content.map((abstractNode: any) =>
                     this.convertBlock(abstractNode)
                 ),
                 containerNodes: extractedPart.content.concat([
@@ -366,13 +397,13 @@ export class DocxConvert {
         return {content: [], containerNodes: []}
     }
 
-    extractKeywords(body) {
-        let extraNodes = []
+    extractKeywords(body: any) {
+        let extraNodes: any[] = []
         // Look for keywords section or metadata
         let keywordNodes = body
             .queryAll("w:pStyle", {"w:val": "Keywords"})
-            .map(pStyle => pStyle.closest("w:p"))
-            .filter(p => p)
+            .map((pStyle: any) => pStyle.closest("w:p"))
+            .filter((p: any) => p)
 
         if (!keywordNodes.length) {
             // If no keywords section is found, look for a title called "Keywords"
@@ -391,11 +422,11 @@ export class DocxConvert {
         if (keywordNodes) {
             return {
                 content: keywordNodes
-                    .map(keywordsNode => this.getTextContent(keywordsNode))
-                    .flatMap(str => str.split(/[,;|:]+/)) // Split on multiple separators
-                    .map(keyword => keyword.trim()) // Trim whitespace
-                    .filter(keyword => keyword.length > 0)
-                    .map(keyword => ({
+                    .map((keywordsNode: any) => this.getTextContent(keywordsNode))
+                    .flatMap((str: any) => str.split(/[,;|:]+/)) // Split on multiple separators
+                    .map((keyword: any) => keyword.trim()) // Trim whitespace
+                    .filter((keyword: any) => keyword.length > 0)
+                    .map((keyword: any) => ({
                         type: "tag",
                         attrs: {
                             tag: keyword
@@ -408,7 +439,7 @@ export class DocxConvert {
         return {content: [], containerNodes: []}
     }
 
-    extractPartOnTitle(body, titleWords, maxPars = false) {
+    extractPartOnTitle(body: any, titleWords: any, maxPars: any = false) {
         // Fall back to heading starting with TITLEWORD in text
         if (typeof titleWords === "string") {
             titleWords = [titleWords]
@@ -427,12 +458,12 @@ export class DocxConvert {
                     "Heading9"
                 ]
             })
-            .map(pStyle => pStyle.closest("w:p"))
-            .filter(p => p)
-        const header = headingPars.find(p =>
+            .map((pStyle: any) => pStyle.closest("w:p"))
+            .filter((p: any) => p)
+        const header = headingPars.find((p: any) =>
             titleWords.includes(this.getTextContent(p).trim())
         )
-        const content = []
+        const content: any[] = []
         if (header && header.nextSibling) {
             //const content = []
             //const containerNodes = [sectionHeader]
@@ -456,16 +487,16 @@ export class DocxConvert {
         return {header, content}
     }
 
-    groupContentIntoSections(body) {
-        const sections = []
-        let currentSection = {
+    groupContentIntoSections(body: any) {
+        const sections: any[] = []
+        let currentSection: Record<string, any> = {
             title: null,
             content: []
         }
 
-        const skippedBlocks = []
+        const skippedBlocks: any[] = []
 
-        body.children.forEach(node => {
+        body.children.forEach((node: any) => {
             if (skippedBlocks.includes(node)) {
                 return
             }
@@ -498,7 +529,7 @@ export class DocxConvert {
         return sections
     }
 
-    getSectionTitle(node, style) {
+    getSectionTitle(node: any, style: any) {
         if (!node || !style) {
             return null
         }
@@ -519,14 +550,14 @@ export class DocxConvert {
         return null
     }
 
-    findMatchingTemplatePart(sectionTitle, templateParts) {
+    findMatchingTemplatePart(sectionTitle: any, templateParts: any) {
         if (!sectionTitle) {
             return null
         }
 
         // Try exact match first
         let matchingPart = templateParts.find(
-            part =>
+            (part: any) =>
                 part.type === "richtext_part" &&
                 !part.attrs.metadata &&
                 part.attrs.title.toLowerCase() === sectionTitle.toLowerCase()
@@ -535,7 +566,7 @@ export class DocxConvert {
         if (!matchingPart) {
             // Try fuzzy matching
             matchingPart = templateParts.find(
-                part =>
+                (part: any) =>
                     part.type === "richtext_part" &&
                     !part.attrs.metadata &&
                     this.isSimilarTitle(part.attrs.title, sectionTitle)
@@ -545,7 +576,7 @@ export class DocxConvert {
         return matchingPart
     }
 
-    isSimilarTitle(title1, title2) {
+    isSimilarTitle(title1: any, title2: any) {
         const normalized1 = normalizeText(title1)
         const normalized2 = normalizeText(title2)
 
@@ -555,19 +586,19 @@ export class DocxConvert {
         )
     }
 
-    getTextContent(node) {
+    getTextContent(node: any) {
         return node
             .queryAll("w:t")
-            .map(t => t.textContent)
+            .map((t: any) => t.textContent)
             .join("")
     }
 
-    extractTitle(body) {
+    extractTitle(body: any) {
         // First try to find paragraph with Title style
         const titlePars = body
             .queryAll("w:pStyle", {"w:val": "Title"})
-            .map(pStyle => pStyle.closest("w:p"))
-            .filter(p => p)
+            .map((pStyle: any) => pStyle.closest("w:p"))
+            .filter((p: any) => p)
 
         if (titlePars.length) {
             return {
@@ -591,8 +622,8 @@ export class DocxConvert {
                     "Heading9"
                 ]
             })
-            .map(pStyle => pStyle.closest("w:p"))
-            .filter(p => p)
+            .map((pStyle: any) => pStyle.closest("w:p"))
+            .filter((p: any) => p)
         if (headingPars.length) {
             return {
                 content: this.convertInline(headingPars[0]),
@@ -611,7 +642,7 @@ export class DocxConvert {
         }
     }
 
-    inBibliography(node) {
+    inBibliography(node: any) {
         // Check if we currently are in a field.
         const currentField = this.currentFields[this.currentFields.length - 1]
 
@@ -631,7 +662,7 @@ export class DocxConvert {
         return false
     }
 
-    convertBlock(node, skippedBlocks = []) {
+    convertBlock(node: any, skippedBlocks: any = []) {
         if (node.tagName !== "w:p") {
             return null
         }
@@ -675,7 +706,7 @@ export class DocxConvert {
         return this.wrapTrackChanges(node, converted)
     }
 
-    wrapTrackChanges(node, content) {
+    wrapTrackChanges(node: any, content: any) {
         if (!content || !node.previousSibling) {
             return content
         }
@@ -690,30 +721,30 @@ export class DocxConvert {
         }
     }
 
-    getTracksFromNode(node) {
+    getTracksFromNode(node: any) {
         const deletion = node.query("w:pPr")?.query("w:del")
         const insertion = node.query("w:pPr")?.query("w:ins")
 
-        const tracks = []
+        const tracks: any[] = []
 
         if (insertion) {
-            const date = new Date(insertion.getAttribute("w:date"))
+            const date = new Date(attr(insertion, "w:date"))
             const date10 = Math.floor(date.getTime() / 60000) * 10
             tracks.push({
                 type: "insertion",
                 user: 0, // Default user ID
-                username: insertion.getAttribute("w:author"),
+                username: attr(insertion, "w:author"),
                 date: date10
             })
         }
 
         if (deletion) {
-            const date = new Date(deletion.getAttribute("w:date"))
+            const date = new Date(attr(deletion, "w:date"))
             const date10 = Math.floor(date.getTime() / 60000) * 10
             tracks.push({
                 type: "deletion",
                 user: 0, // Default user ID
-                username: deletion.getAttribute("w:author"),
+                username: attr(deletion, "w:author"),
                 date: date10
             })
         }
@@ -725,15 +756,15 @@ export class DocxConvert {
         return tracks
     }
 
-    getParaStyle(node) {
+    getParaStyle(node: any) {
         const pStyle = node.query("w:pStyle")
-        const styleId = pStyle?.getAttribute("w:val")
+        const styleId = attr(pStyle, "w:val")
         const style = this.parser.styles[styleId] || {}
 
         const numPr = node.query("w:numPr")
-        const numId = numPr?.query("w:numId")?.getAttribute("w:val")
+        const numId = attr(numPr?.query("w:numId"), "w:val")
         const ilvl = parseInt(
-            numPr?.query("w:ilvl")?.getAttribute("w:val") || "0"
+            attr(numPr?.query("w:ilvl"), "w:val") || "0"
         )
 
         return {
@@ -748,9 +779,9 @@ export class DocxConvert {
         }
     }
 
-    convertParagraph(node) {
+    convertParagraph(node: any) {
         const pStyle = node.query("w:pStyle")
-        const styleId = pStyle?.getAttribute("w:val")
+        const styleId = attr(pStyle, "w:val")
 
         // Check if this is a code block (Code style or inherited from one)
         if (
@@ -776,7 +807,7 @@ export class DocxConvert {
         }
     }
 
-    convertHeading(node, style) {
+    convertHeading(node: any, style: any) {
         return {
             type: `heading${style.level}`,
             attrs: {
@@ -787,7 +818,7 @@ export class DocxConvert {
         }
     }
 
-    convertListItem(node, style) {
+    convertListItem(node: any, style: any) {
         const numbering = style.numbering
         const level = numbering.definition?.levels[numbering.level]
 
@@ -807,7 +838,7 @@ export class DocxConvert {
         }
     }
 
-    convertFigure(node, captionNode = null) {
+    convertFigure(node: any, captionNode: any = null) {
         let captionBlock, captionOrder
         if (captionNode) {
             captionBlock = this.convertParagraph(captionNode)
@@ -824,7 +855,7 @@ export class DocxConvert {
             return null
         }
 
-        const rId = blip.getAttribute("r:embed")
+        const rId = attr(blip, "r:embed")
         const rel = this.parser.relationships[rId]
         if (!rel) {
             return null
@@ -840,8 +871,8 @@ export class DocxConvert {
         // <a:ext cx="5753598" cy="4463556" />
         //
         const size = drawing.query("a:ext")
-        const width = parseInt(size.getAttribute("cx") || 0) / 9525 // In EMUs
-        const height = parseInt(size.getAttribute("cy") || 0) / 9525 // In EMUs
+        const width = parseInt(attr(size, "cx") || "0") / 9525 // In EMUs
+        const height = parseInt(attr(size, "cy") || "0") / 9525 // In EMUs
 
         const imageId = Math.floor(Math.random() * 1000000)
         this.images[imageId] = {
@@ -861,14 +892,14 @@ export class DocxConvert {
             height
         }
 
-        const image = {
+        const image: Record<string, any> = {
             type: "image",
             attrs: {
                 image: imageId
             }
         }
 
-        const caption = {
+        const caption: Record<string, any> = {
             type: "figure_caption",
             content: captionBlock?.content || []
         }
@@ -888,11 +919,11 @@ export class DocxConvert {
         }
     }
 
-    convertInline(node) {
-        const content = []
+    convertInline(node: any) {
+        const content: any[] = []
 
         // We'll process all inline nodes in document order
-        node.children.forEach(child => {
+        node.children.forEach((child: any) => {
             let contentReceiver = content
             const currentField =
                 this.currentFields[this.currentFields.length - 1]
@@ -915,7 +946,7 @@ export class DocxConvert {
                 if (fieldChar) {
                     let currentField
                     let rendercurrentField = false
-                    const type = fieldChar.getAttribute("w:fldCharType")
+                    const type = attr(fieldChar, "w:fldCharType")
                     if (type === "begin") {
                         currentField = {
                             status: "instruction",
@@ -949,7 +980,7 @@ export class DocxConvert {
                     }
 
                     if (rendercurrentField && currentField) {
-                        this.renderField(currentField).forEach(node =>
+                        this.renderField(currentField).forEach((node: any) =>
                             contentReceiver.push(node)
                         )
                     }
@@ -959,7 +990,7 @@ export class DocxConvert {
                 // Process footnote references
                 const footnoteRef = child.query("w:footnoteReference")
                 if (footnoteRef) {
-                    const footnoteId = footnoteRef.getAttribute("w:id")
+                    const footnoteId = attr(footnoteRef, "w:id")
                     if (this.parser.footnotes[footnoteId]) {
                         contentReceiver.push(this.convertFootnote(footnoteId))
                     }
@@ -969,7 +1000,7 @@ export class DocxConvert {
                 // Process endnote references
                 const endnoteRef = child.query("w:endnoteReference")
                 if (endnoteRef) {
-                    const endnoteId = endnoteRef.getAttribute("w:id")
+                    const endnoteId = attr(endnoteRef, "w:id")
                     if (this.parser.endnotes[endnoteId]) {
                         contentReceiver.push(
                             this.convertFootnote(endnoteId, true)
@@ -1003,13 +1034,13 @@ export class DocxConvert {
                     marks: this.getCurrentMarks(formatting, insertion, deletion)
                 })
             } else if (child.tagName === "w:commentRangeStart") {
-                const commentId = child.getAttribute("w:id")
+                const commentId = attr(child, "w:id")
                 if (commentId && this.parser.comments[commentId]) {
                     this.currentCommentIds.push(commentId)
                 }
                 return
             } else if (child.tagName === "w:commentRangeEnd") {
-                const commentId = child.getAttribute("w:id")
+                const commentId = attr(child, "w:id")
                 if (commentId) {
                     const index = this.currentCommentIds.indexOf(commentId)
                     if (index !== -1) {
@@ -1025,8 +1056,8 @@ export class DocxConvert {
                 return
             } else if (child.tagName === "w:hyperlink") {
                 // Process hyperlink
-                const rId = child.getAttribute("r:id")
-                const anchor = child.getAttribute("w:anchor")
+                const rId = attr(child, "r:id")
+                const anchor = attr(child, "w:anchor")
                 const relationship = rId ? this.parser.relationships[rId] : null
                 const href =
                     relationship?.target || (anchor ? `#${anchor}` : null)
@@ -1034,7 +1065,7 @@ export class DocxConvert {
                 if (href) {
                     const runs = child.queryAll("w:r")
                     const text = runs
-                        .map(run => run.query("w:t")?.textContent || "")
+                        .map((run: any) => run.query("w:t")?.textContent || "")
                         .join("")
 
                     if (text) {
@@ -1103,13 +1134,13 @@ export class DocxConvert {
     }
 
     // Method to help process cross-references in documents
-    findReferenceTargets(document) {
-        const targets = {}
+    findReferenceTargets(document: any) {
+        const targets: Record<string, any> = {}
 
         // Find bookmarks
-        document.queryAll("w:bookmarkStart").forEach(bookmark => {
-            const id = bookmark.getAttribute("w:id")
-            const name = bookmark.getAttribute("w:name")
+        document.queryAll("w:bookmarkStart").forEach((bookmark: any) => {
+            const id = attr(bookmark, "w:id")
+            const name = attr(bookmark, "w:name")
             if (id && name) {
                 targets[name] = {
                     id: name,
@@ -1119,8 +1150,8 @@ export class DocxConvert {
         })
 
         // Find headings (with styles like Heading1, Heading2, etc.)
-        document.queryAll("w:pStyle").forEach(pStyle => {
-            const val = pStyle.getAttribute("w:val")
+        document.queryAll("w:pStyle").forEach((pStyle: any) => {
+            const val = attr(pStyle, "w:val")
             if (val && val.match(/^Heading\d+$/)) {
                 const paragraph = pStyle.closest("w:p")
                 if (paragraph) {
@@ -1144,18 +1175,18 @@ export class DocxConvert {
         return targets
     }
 
-    convertFootnote(id, isEndnote = false) {
+    convertFootnote(id: any, isEndnote: any = false) {
         const footnoteContent = isEndnote
             ? this.parser.endnotes[id].content
             : this.parser.footnotes[id].content
 
         // Convert the footnote content to our document model
-        const content = []
-        footnoteContent.forEach(block => {
+        const content: any[] = []
+        footnoteContent.forEach((block: any) => {
             if (block.type === "paragraph") {
                 content.push({
                     type: "paragraph",
-                    content: block.content.map(node => {
+                    content: block.content.map((node: any) => {
                         if (node.type === "text") {
                             return {
                                 type: "text",
@@ -1177,7 +1208,7 @@ export class DocxConvert {
         }
     }
 
-    convertEquation(oMathNode) {
+    convertEquation(oMathNode: any) {
         // Extract OMML content and convert to MathML
         const mmlNode = omml2mathml(oMathNode)
         const latex = MathMLToLaTeX.convert(mmlNode.outerXML)
@@ -1189,7 +1220,7 @@ export class DocxConvert {
         }
     }
 
-    simplifiedOmmlToLatex(omml) {
+    simplifiedOmmlToLatex(omml: any) {
         // This is a very basic conversion - in a real implementation you would
         // use a library like MathML-to-LaTeX or implement a more complete converter
 
@@ -1239,7 +1270,7 @@ export class DocxConvert {
         return textContent || "x^2" // Default fallback
     }
 
-    renderField(field) {
+    renderField(field: any) {
         const instr = field.instructions.trim()
 
         // Handle REF fields (cross-references)
@@ -1249,7 +1280,7 @@ export class DocxConvert {
             if (parts.length > 0) {
                 const target = parts[0]
                 const text = field.display.reduce(
-                    (accumulator, currentValue) => {
+                    (accumulator: any, currentValue: any) => {
                         if (currentValue.type === "text") {
                             return accumulator + currentValue.text
                         }
@@ -1267,7 +1298,7 @@ export class DocxConvert {
             const seqMatch = instr.match(/^SEQ\s+(\S+)/)
             if (seqMatch) {
                 const _seqName = seqMatch[1]
-                const text = field.display.reduce((acc, curr) => {
+                const text = field.display.reduce((acc: any, curr: any) => {
                     if (curr.type === "text") {
                         return acc + curr.text
                     }
@@ -1305,7 +1336,7 @@ export class DocxConvert {
         }
     }
 
-    convertCrossReference(targetId, displayText) {
+    convertCrossReference(targetId: any, displayText: any) {
         // Look up the target in our reference targets
         const target = this.referenceTargets[targetId]
 
@@ -1330,8 +1361,8 @@ export class DocxConvert {
         }
     }
 
-    createMarksFromFormatting(formatting, insertion = null, deletion = null) {
-        const marks = []
+    createMarksFromFormatting(formatting: any, insertion: any = null, deletion: any = null) {
+        const marks: any[] = []
         if (formatting.bold) {
             marks.push({type: "strong"})
         }
@@ -1350,7 +1381,7 @@ export class DocxConvert {
         }
         // Handle inline code (monospace fonts)
         if (formatting.fontFamily) {
-            const monospacePatterns = [
+            const monospacePatterns: any[] = [
                 /^courier/i,
                 /^consolas/i,
                 /^monaco/i,
@@ -1364,7 +1395,7 @@ export class DocxConvert {
                 /^ubuntu mono/i,
                 /^droid sans mono/i
             ]
-            const isMonospace = monospacePatterns.some(pattern =>
+            const isMonospace = monospacePatterns.some((pattern: any) =>
                 pattern.test(formatting.fontFamily)
             )
             if (isMonospace) {
@@ -1372,26 +1403,26 @@ export class DocxConvert {
             }
         }
         if (insertion) {
-            const date = new Date(insertion.getAttribute("w:date"))
+            const date = new Date(attr(insertion, "w:date"))
             const date10 = Math.floor(date.getTime() / 600000) * 10
             marks.push({
                 type: "insertion",
                 attrs: {
                     user: 0,
-                    username: insertion.getAttribute("w:author"),
+                    username: attr(insertion, "w:author"),
                     date: date10,
                     approved: false
                 }
             })
         }
         if (deletion) {
-            const date = new Date(deletion.getAttribute("w:date"))
+            const date = new Date(attr(deletion, "w:date"))
             const date10 = Math.floor(date.getTime() / 600000) * 10
             marks.push({
                 type: "deletion",
                 attrs: {
                     user: 0,
-                    username: deletion.getAttribute("w:author"),
+                    username: attr(deletion, "w:author"),
                     date: date10
                 }
             })
@@ -1399,14 +1430,18 @@ export class DocxConvert {
         return marks
     }
 
-    getCurrentMarks(formatting, insertion, deletion) {
+    getCurrentMarks(
+        formatting: any,
+        insertion: any = null,
+        deletion: any = null
+    ): any[] {
         const marks = this.createMarksFromFormatting(
             formatting,
             insertion,
             deletion
         )
         // Add comment marks for any active comment IDs
-        this.currentCommentIds.forEach(commentId => {
+        this.currentCommentIds.forEach((commentId: any) => {
             marks.push({
                 type: "comment",
                 attrs: {
@@ -1417,11 +1452,11 @@ export class DocxConvert {
         return marks
     }
 
-    hasTrackedChanges(doc) {
+    hasTrackedChanges(doc: any) {
         return Boolean(doc.query("w:ins") || doc.query("w:del"))
     }
 
-    detectLanguage(doc) {
-        return doc.query("w:lang")?.getAttribute("w:val") || "en-US"
+    detectLanguage(doc: any) {
+        return attr(doc.query("w:lang"), "w:val") || "en-US"
     }
 }