docxmlater 4.0.0 → 4.0.2

package/dist/core/DocumentParser.d.ts

@@ -61,6 +61,8 @@ export declare class DocumentParser {
     private parseTableBordersFromObject;
     private parseTableCellFromObject;
     private parseSDTFromObject;
+    private extractInstructionFromContent;
+    private extractInstructionFromRawXML;
     private parseTOCFromSDTContent;
     private parseListItems;
     private objectToXml;

package/dist/core/DocumentParser.d.ts.map

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

package/dist/core/DocumentParser.js

@@ -2229,6 +2229,104 @@ class DocumentParser {
             return null;
         }
     }
+    extractInstructionFromContent(content) {
+        logger_1.defaultLogger.debug(`[TOC Parser] Searching ${content.length} content elements for TOC ComplexField`);
+        for (const element of content) {
+            if (element instanceof Paragraph_1.Paragraph) {
+                const paragraphContent = element.getContent();
+                for (const item of paragraphContent) {
+                    if (item instanceof Field_1.ComplexField) {
+                        const instruction = item.getInstruction();
+                        if (instruction && instruction.trim().startsWith("TOC")) {
+                            logger_1.defaultLogger.debug(`[TOC Parser] Found ComplexField with TOC instruction: "${instruction.substring(0, 100)}..."`);
+                            return instruction.trim();
+                        }
+                    }
+                }
+            }
+        }
+        logger_1.defaultLogger.debug("[TOC Parser] No ComplexField with TOC instruction found in assembled content");
+        return undefined;
+    }
+    extractInstructionFromRawXML(sdtContent) {
+        const paragraphs = sdtContent["w:p"];
+        const paraArray = Array.isArray(paragraphs)
+            ? paragraphs
+            : paragraphs
+                ? [paragraphs]
+                : [];
+        logger_1.defaultLogger.debug(`[TOC Parser] Fallback: Parsing raw XML from ${paraArray.length} paragraph(s)`);
+        let inField = false;
+        let instructionParts = [];
+        let foundTOCInstruction;
+        for (let pIdx = 0; pIdx < paraArray.length; pIdx++) {
+            const paraObj = paraArray[pIdx];
+            const runs = paraObj["w:r"];
+            const runArray = Array.isArray(runs) ? runs : runs ? [runs] : [];
+            logger_1.defaultLogger.debug(`[TOC Parser] Paragraph ${pIdx + 1}: ${runArray.length} runs`);
+            for (let rIdx = 0; rIdx < runArray.length; rIdx++) {
+                const runObj = runArray[rIdx];
+                const fldChar = runObj["w:fldChar"];
+                if (fldChar) {
+                    const fldCharArray = Array.isArray(fldChar) ? fldChar : [fldChar];
+                    logger_1.defaultLogger.debug(`[TOC Parser] Paragraph ${pIdx + 1}, Run ${rIdx + 1}: Found ${fldCharArray.length} fldChar element(s)`);
+                    for (const fldCharObj of fldCharArray) {
+                        const charType = fldCharObj["@_w:fldCharType"] || fldCharObj["@_fldCharType"];
+                        if (!charType) {
+                            logger_1.defaultLogger.debug(`[TOC Parser] Warning: fldChar without charType attribute`);
+                            continue;
+                        }
+                        logger_1.defaultLogger.debug(`[TOC Parser] Paragraph ${pIdx + 1}, Run ${rIdx + 1}: fldChar type = "${charType}"`);
+                        if (charType === "begin") {
+                            inField = true;
+                            instructionParts = [];
+                            logger_1.defaultLogger.debug("[TOC Parser] Found field begin marker, starting instruction collection");
+                            continue;
+                        }
+                        if (charType === "end" || charType === "separate") {
+                            const fullInstruction = instructionParts.join("").trim();
+                            logger_1.defaultLogger.debug(`[TOC Parser] Field ${charType} marker found. Collected instruction: "${fullInstruction.substring(0, 100)}..."`);
+                            if (fullInstruction.startsWith("TOC")) {
+                                foundTOCInstruction = fullInstruction;
+                                logger_1.defaultLogger.debug(`[TOC Parser] ✓ Extracted complete TOC instruction from ${instructionParts.length} part(s)`);
+                            }
+                            if (charType === "end") {
+                                inField = false;
+                                instructionParts = [];
+                                if (foundTOCInstruction) {
+                                    return foundTOCInstruction;
+                                }
+                            }
+                            continue;
+                        }
+                    }
+                }
+                if (inField) {
+                    const instrText = runObj["w:instrText"];
+                    if (instrText) {
+                        let text = "";
+                        if (typeof instrText === "string") {
+                            text = instrText;
+                        }
+                        else if (instrText["#text"]) {
+                            text = instrText["#text"];
+                        }
+                        else {
+                            text = String(instrText);
+                        }
+                        instructionParts.push(text);
+                        logger_1.defaultLogger.debug(`[TOC Parser] Paragraph ${pIdx + 1}, Run ${rIdx + 1}: Collected instrText = "${text.substring(0, 50)}..."`);
+                    }
+                }
+            }
+        }
+        if (foundTOCInstruction) {
+            logger_1.defaultLogger.debug(`[TOC Parser] Returning TOC instruction (no end marker found): "${foundTOCInstruction.substring(0, 100)}..."`);
+            return foundTOCInstruction;
+        }
+        logger_1.defaultLogger.debug("[TOC Parser] No TOC instruction found in raw XML fallback");
+        return undefined;
+    }
     parseTOCFromSDTContent(content, properties, sdtContent) {
         try {
             let title;
@@ -2242,35 +2340,16 @@ class DocumentParser {
                     }
                 }
             }
-            const paragraphs = sdtContent["w:p"];
-            const paraArray = Array.isArray(paragraphs)
-                ? paragraphs
-                : paragraphs
-                    ? [paragraphs]
-                    : [];
-            for (const paraObj of paraArray) {
-                const runs = paraObj["w:r"];
-                const runArray = Array.isArray(runs) ? runs : runs ? [runs] : [];
-                for (const runObj of runArray) {
-                    const instrText = runObj["w:instrText"];
-                    if (instrText) {
-                        if (typeof instrText === "string") {
-                            fieldInstruction = instrText.trim();
-                        }
-                        else if (instrText["#text"]) {
-                            fieldInstruction = instrText["#text"].trim();
-                        }
-                        if (fieldInstruction)
-                            break;
-                    }
-                }
-                if (fieldInstruction)
-                    break;
+            fieldInstruction = this.extractInstructionFromContent(content);
+            if (!fieldInstruction) {
+                logger_1.defaultLogger.debug("[TOC Parser] ComplexField extraction failed, falling back to raw XML parsing");
+                fieldInstruction = this.extractInstructionFromRawXML(sdtContent);
             }
             if (!fieldInstruction) {
-                logger_1.defaultLogger.warn("[DocumentParser] No TOC field instruction found in SDT content");
+                logger_1.defaultLogger.warn("[DocumentParser] No TOC field instruction found in SDT content (tried both ComplexField and raw XML)");
                 return null;
             }
+            logger_1.defaultLogger.debug(`[TOC Parser] Successfully extracted instruction: "${fieldInstruction}"`);
             const tocOptions = {
                 title,
                 originalFieldInstruction: fieldInstruction.trim(),