docxmlater 3.2.0 → 4.0.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();
@@ -516,6 +518,9 @@ class Document {
     getStylesManager() {
         return this.stylesManager;
     }
+    styles() {
+        return this.stylesManager;
+    }
     addStyle(style) {
         this.stylesManager.addStyle(style);
         this.updateStylesXml();
@@ -1225,113 +1230,6 @@ class Document {
         this.bodyElements.splice(paraIndex, 0, table);
         return table;
     }
-    applyCustomStylesToDocument() {
-        const counts = { heading1: 0, heading2: 0, normal: 0 };
-        const header1Style = Style_1.Style.create({
-            styleId: "CustomHeader1",
-            name: "Custom Header 1",
-            type: "paragraph",
-            basedOn: "Normal",
-            runFormatting: {
-                font: "Verdana",
-                size: 18,
-                bold: true,
-                color: "000000",
-            },
-            paragraphFormatting: {
-                alignment: "left",
-                spacing: {
-                    before: 0,
-                    after: 240,
-                },
-            },
-        });
-        const header2Style = Style_1.Style.create({
-            styleId: "CustomHeader2",
-            name: "Custom Header 2",
-            type: "paragraph",
-            basedOn: "Normal",
-            runFormatting: {
-                font: "Verdana",
-                size: 14,
-                bold: true,
-                color: "000000",
-            },
-            paragraphFormatting: {
-                alignment: "left",
-                spacing: {
-                    before: 120,
-                    after: 120,
-                },
-            },
-        });
-        const normalStyle = Style_1.Style.create({
-            styleId: "CustomNormal",
-            name: "Custom Normal",
-            type: "paragraph",
-            basedOn: "Normal",
-            runFormatting: {
-                font: "Verdana",
-                size: 12,
-                color: "000000",
-            },
-            paragraphFormatting: {
-                alignment: "left",
-                spacing: {
-                    before: 60,
-                    after: 60,
-                },
-            },
-        });
-        this.addStyle(header1Style);
-        this.addStyle(header2Style);
-        this.addStyle(normalStyle);
-        const allParagraphs = this.getAllParagraphs();
-        for (const para of allParagraphs) {
-            const currentStyle = para.getStyle();
-            if (currentStyle === "Heading1" || currentStyle === "Heading 1") {
-                para.setStyle("CustomHeader1");
-                counts.heading1++;
-            }
-            else if (currentStyle === "Heading2" || currentStyle === "Heading 2") {
-                para.setStyle("CustomHeader2");
-                const { inTable, cell } = this.isParagraphInTable(para);
-                if (inTable && cell) {
-                    cell.setShading({ fill: "BFBFBF" });
-                    cell.setMargins({ top: 0, bottom: 0, left: 101, right: 101 });
-                    const table = this.getAllTables().find((t) => {
-                        for (const row of t.getRows()) {
-                            for (const c of row.getCells()) {
-                                if (c === cell)
-                                    return true;
-                            }
-                        }
-                        return false;
-                    });
-                    if (table) {
-                        table.setWidth(5000);
-                        table.setWidthType("pct");
-                    }
-                }
-                else {
-                    this.wrapParagraphInTable(para, {
-                        shading: "BFBFBF",
-                        marginTop: 0,
-                        marginBottom: 0,
-                        marginLeft: 101,
-                        marginRight: 101,
-                        tableWidthPercent: 5000,
-                    });
-                }
-                counts.heading2++;
-            }
-            else if (currentStyle === "Normal" || currentStyle === undefined) {
-                para.setStyle("CustomNormal");
-                counts.normal++;
-            }
-        }
-        return counts;
-    }
     static DEFAULT_HEADING1_CONFIG = {
         run: {
             font: "Verdana",
@@ -1400,7 +1298,7 @@ class Document {
             contextualSpacing: true,
         },
     };
-    applyCustomFormattingToExistingStyles(options) {
+    applyStyles(options) {
         const results = {
             heading1: false,
             heading2: false,
@@ -1871,7 +1769,7 @@ class Document {
                     break;
             }
         }
-        return this.applyCustomFormattingToExistingStyles(options);
+        return this.applyStyles(options);
     }
     removeExtraBlankParagraphs(options) {
         const keepOne = options?.keepOne ?? true;
@@ -2006,6 +1904,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 +1966,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,11 +2324,21 @@ 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;
-        const normalizedText = instrText.replace(/"/g, '"');
+        const normalizedText = instrText.trim().replace(/"/g, '"');
         const outlineMatch = normalizedText.match(/\\o\s+"(\d+)-(\d+)"/);
         if (outlineMatch?.[1] && outlineMatch?.[2]) {
             hasOutlineSwitch = true;
@@ -2439,7 +2349,7 @@ class Document {
                     levels.add(i);
             }
         }
-        if (/\bu\b/.test(normalizedText)) {
+        if (/\\u(?:\s|\\|$)/.test(normalizedText)) {
             const hasTSwitch = /\\t\s+"/.test(normalizedText);
             if (!hasOutlineSwitch && !hasTSwitch) {
                 for (let i = 1; i <= 9; i++)