docxmlater 3.1.0 → 3.5.0

package/dist/core/Document.js

@@ -418,6 +418,7 @@ class Document {
                     images: sizeInfo.images,
                 });
             }
+            this.clearAllPreserveFlags();
             this.processHyperlinks();
             this.updateDocumentXml();
             this.updateStylesXml();
@@ -466,6 +467,7 @@ class Document {
                     images: sizeInfo.images,
                 });
             }
+            this.clearAllPreserveFlags();
             this.processHyperlinks();
             this.updateDocumentXml();
             this.updateStylesXml();
@@ -2006,6 +2008,7 @@ class Document {
             const nextElement = this.bodyElements[tableIndex + 1];
             if (nextElement instanceof Paragraph_1.Paragraph) {
                 if (this.isParagraphBlank(nextElement)) {
+                    nextElement.setStyle(style);
                     if (markAsPreserved && !nextElement.isPreserved()) {
                         nextElement.setPreserved(true);
                         existingLinesMarked++;
@@ -2067,6 +2070,7 @@ class Document {
             const nextElement = this.bodyElements[tableIndex + 1];
             if (nextElement instanceof Paragraph_1.Paragraph) {
                 if (this.isParagraphBlank(nextElement)) {
+                    nextElement.setStyle(style);
                     if (markAsPreserved && !nextElement.isPreserved()) {
                         nextElement.setPreserved(true);
                         existingLinesMarked++;
@@ -2424,76 +2428,70 @@ class Document {
         }
         return true;
     }
+    clearAllPreserveFlags() {
+        let cleared = 0;
+        for (const para of this.getAllParagraphs()) {
+            if (para.isPreserved()) {
+                para.setPreserved(false);
+                cleared++;
+            }
+        }
+        return cleared;
+    }
     parseTOCFieldInstruction(instrText) {
         const levels = new Set();
         let hasOutlineSwitch = false;
         let hasTableSwitch = false;
-        let hasUseOutlineLevelsSwitch = false;
-        const outlineMatch = instrText.match(/\\o\s+"(\d+)-(\d+)"/);
-        if (outlineMatch && outlineMatch[1] && outlineMatch[2]) {
+        const normalizedText = instrText.trim().replace(/"/g, '"');
+        const outlineMatch = normalizedText.match(/\\o\s+"(\d+)-(\d+)"/);
+        if (outlineMatch?.[1] && outlineMatch?.[2]) {
             hasOutlineSwitch = true;
             const start = parseInt(outlineMatch[1], 10);
             const end = parseInt(outlineMatch[2], 10);
             for (let i = start; i <= end; i++) {
-                if (i >= 1 && i <= 9) {
+                if (i >= 1 && i <= 9)
                     levels.add(i);
-                }
             }
         }
-        if (instrText.match(/\\u\b/)) {
-            hasUseOutlineLevelsSwitch = true;
-            if (!hasOutlineSwitch && !instrText.match(/\\t\s+"/)) {
-                for (let i = 1; i <= 9; i++) {
+        if (/\\u(?:\s|\\|$)/.test(normalizedText)) {
+            const hasTSwitch = /\\t\s+"/.test(normalizedText);
+            if (!hasOutlineSwitch && !hasTSwitch) {
+                for (let i = 1; i <= 9; i++)
                     levels.add(i);
-                }
             }
         }
-        const styleMatches = instrText.matchAll(/\\t\s+"([^"]+)"/g);
-        for (const match of styleMatches) {
+        const tSwitchRegex = /\\t\s+"([^"]*)"/g;
+        const tMatches = [...normalizedText.matchAll(tSwitchRegex)];
+        for (const match of tMatches) {
             hasTableSwitch = true;
-            const content = match[1];
+            const content = (match[1] || "").trim();
             if (!content)
                 continue;
             const rangeMatch = content.match(/^(\d+)-(\d+)$/);
-            if (rangeMatch && rangeMatch[1] && rangeMatch[2]) {
+            if (rangeMatch?.[1] && rangeMatch?.[2]) {
                 const start = parseInt(rangeMatch[1], 10);
                 const end = parseInt(rangeMatch[2], 10);
                 for (let i = start; i <= end; i++) {
-                    if (i >= 1 && i <= 9) {
+                    if (i >= 1 && i <= 9)
                         levels.add(i);
-                    }
                 }
                 continue;
             }
             const parts = content
                 .split(",")
                 .map((p) => p.trim())
-                .filter((p) => p);
-            if (parts.length < 2)
-                continue;
-            const styleName = parts[0];
-            const levelStr = parts[1];
-            if (!styleName || !levelStr)
-                continue;
-            const level = parseInt(levelStr, 10);
-            if (isNaN(level))
-                continue;
-            const headingMatch = styleName.match(/Heading\s*(\d+)/i);
-            if (headingMatch && headingMatch[1]) {
-                const headingLevel = parseInt(headingMatch[1], 10);
-                if (headingLevel >= 1 && headingLevel <= 9) {
-                    levels.add(headingLevel);
+                .filter(Boolean);
+            for (let i = 0; i < parts.length; i += 2) {
+                if (i + 1 < parts.length) {
+                    const levelStr = parts[i + 1];
+                    if (levelStr) {
+                        const level = parseInt(levelStr, 10);
+                        if (!isNaN(level) && level >= 1 && level <= 9) {
+                            levels.add(level);
+                        }
+                    }
                 }
             }
-            else if (level >= 1 && level <= 9) {
-                levels.add(level);
-            }
-        }
-        if (levels.size === 0) {
-            if (!hasOutlineSwitch && !hasTableSwitch && !hasUseOutlineLevelsSwitch) {
-                return [1, 2, 3];
-            }
-            return [];
         }
         return Array.from(levels).sort((a, b) => a - b);
     }