docxmlater 1.16.0 → 1.17.0

package/dist/core/DocumentParser.js

@@ -54,6 +54,7 @@ const Style_1 = require("../formatting/Style");
 const AbstractNumbering_1 = require("../formatting/AbstractNumbering");
 const NumberingInstance_1 = require("../formatting/NumberingInstance");
 const diagnostics_1 = require("../utils/diagnostics");
+const logger_1 = require("../utils/logger");
 class DocumentParser {
     parseErrors = [];
     strictParsing;
@@ -236,7 +237,7 @@ class DocumentParser {
                     element: "document-validation",
                     error: warning,
                 });
-                console.warn(`\nDocXML Load Warning:\n${warning.message}\n`);
+                logger_1.defaultLogger.warn(`\nDocXML Load Warning:\n${warning.message}\n`);
             }
             else if (emptyPercentage > 50 && emptyRuns > 5) {
                 const warning = new Error(`Document has ${emptyRuns} out of ${totalRuns} runs (${emptyPercentage.toFixed(1)}%) with no text. ` +
@@ -245,7 +246,7 @@ class DocumentParser {
                     element: "document-validation",
                     error: warning,
                 });
-                console.warn(`\nDocXML Load Warning:\n${warning.message}\n`);
+                logger_1.defaultLogger.warn(`\nDocXML Load Warning:\n${warning.message}\n`);
             }
         }
     }
@@ -838,7 +839,7 @@ class DocumentParser {
             }
             let displayText = text || url || '[Link]';
             if (!text && anchor) {
-                console.warn(`[DocumentParser] Hyperlink to anchor "${anchor}" has no display text. ` +
+                logger_1.defaultLogger.warn(`[DocumentParser] Hyperlink to anchor "${anchor}" has no display text. ` +
                     `Using placeholder "[Link]" to prevent bookmark ID from appearing as visible text. ` +
                     `This may indicate a corrupted TOC or malformed hyperlink in the source document.`);
             }
@@ -856,7 +857,7 @@ class DocumentParser {
             return hyperlink;
         }
         catch (error) {
-            console.warn('[DocumentParser] Failed to parse hyperlink:', error);
+            logger_1.defaultLogger.warn('[DocumentParser] Failed to parse hyperlink:', error instanceof Error ? { message: error.message, stack: error.stack } : { error: String(error) });
             return null;
         }
     }
@@ -869,16 +870,15 @@ class DocumentParser {
         const hyperlinkIndices = new Map();
         for (let i = 0; i < content.length; i++) {
             const item = content[i];
-            if (item.constructor.name === 'Hyperlink') {
-                const hyperlink = item;
-                const url = hyperlink.getUrl() || '';
-                const anchor = hyperlink.getAnchor() || '';
+            if (item instanceof Hyperlink_1.Hyperlink) {
+                const url = item.getUrl() || '';
+                const anchor = item.getAnchor() || '';
                 const key = `${url}|${anchor}`;
                 if (!hyperlinkGroups.has(key)) {
                     hyperlinkGroups.set(key, []);
                 }
-                hyperlinkGroups.get(key).push(hyperlink);
-                hyperlinkIndices.set(hyperlink, i);
+                hyperlinkGroups.get(key).push(item);
+                hyperlinkIndices.set(item, i);
             }
             else {
                 nonHyperlinkItems.push({ item, index: i });
@@ -901,21 +901,20 @@ class DocumentParser {
                 continue;
             }
             const item = content[i];
-            if (item.constructor.name === 'Hyperlink') {
-                const hyperlink = item;
-                const url = hyperlink.getUrl() || '';
-                const anchor = hyperlink.getAnchor() || '';
+            if (item instanceof Hyperlink_1.Hyperlink) {
+                const url = item.getUrl() || '';
+                const anchor = item.getAnchor() || '';
                 const key = `${url}|${anchor}`;
                 const group = hyperlinkGroups.get(key);
-                if (group.length > 1 && group[0] === hyperlink) {
+                if (group.length > 1 && group[0] === item) {
                     const mergedText = group.map(h => h.getText()).join('');
-                    const mergedHyperlink = new hyperlink.constructor({
-                        url: hyperlink.getUrl(),
-                        anchor: hyperlink.getAnchor(),
+                    const mergedHyperlink = new Hyperlink_1.Hyperlink({
+                        url: item.getUrl(),
+                        anchor: item.getAnchor(),
                         text: mergedText,
-                        formatting: resetFormatting ? this.getStandardHyperlinkFormatting() : hyperlink.getFormatting(),
-                        tooltip: hyperlink.getTooltip(),
-                        relationshipId: hyperlink.getRelationshipId(),
+                        formatting: resetFormatting ? this.getStandardHyperlinkFormatting() : item.getFormatting(),
+                        tooltip: item.getTooltip(),
+                        relationshipId: item.getRelationshipId(),
                     });
                     for (const h of group) {
                         processedIndices.add(hyperlinkIndices.get(h));
@@ -924,18 +923,18 @@ class DocumentParser {
                 }
                 else if (group.length === 1) {
                     if (resetFormatting) {
-                        const resetHyperlink = new hyperlink.constructor({
-                            url: hyperlink.getUrl(),
-                            anchor: hyperlink.getAnchor(),
-                            text: hyperlink.getText(),
+                        const resetHyperlink = new Hyperlink_1.Hyperlink({
+                            url: item.getUrl(),
+                            anchor: item.getAnchor(),
+                            text: item.getText(),
                             formatting: this.getStandardHyperlinkFormatting(),
-                            tooltip: hyperlink.getTooltip(),
-                            relationshipId: hyperlink.getRelationshipId(),
+                            tooltip: item.getTooltip(),
+                            relationshipId: item.getRelationshipId(),
                         });
                         mergedContent.push(resetHyperlink);
                     }
                     else {
-                        mergedContent.push(hyperlink);
+                        mergedContent.push(item);
                     }
                     processedIndices.add(i);
                 }
@@ -948,13 +947,13 @@ class DocumentParser {
         if (needsMerge || resetFormatting) {
             paragraph.clearContent();
             for (const item of mergedContent) {
-                if (item.constructor.name === 'Hyperlink') {
+                if (item instanceof Hyperlink_1.Hyperlink) {
                     paragraph.addHyperlink(item);
                 }
-                else if (item.constructor.name === 'Run') {
+                else if (item instanceof Run_1.Run) {
                     paragraph.addRun(item);
                 }
-                else if (item.constructor.name === 'Field') {
+                else if (item instanceof Field_1.Field) {
                     paragraph.addField(item);
                 }
             }
@@ -989,7 +988,7 @@ class DocumentParser {
             return field;
         }
         catch (error) {
-            console.warn('[DocumentParser] Failed to parse field:', error);
+            logger_1.defaultLogger.warn('[DocumentParser] Failed to parse field:', error instanceof Error ? { message: error.message, stack: error.stack } : { error: String(error) });
             return null;
         }
     }
@@ -1231,18 +1230,18 @@ class DocumentParser {
             }
             const relationship = relationshipManager.getRelationship(relationshipId);
             if (!relationship) {
-                console.warn(`[DocumentParser] Image relationship not found: ${relationshipId}`);
+                logger_1.defaultLogger.warn(`[DocumentParser] Image relationship not found: ${relationshipId}`);
                 return null;
             }
             const imageTarget = relationship.getTarget();
             if (!imageTarget) {
-                console.warn(`[DocumentParser] Image relationship has no target: ${relationshipId}`);
+                logger_1.defaultLogger.warn(`[DocumentParser] Image relationship has no target: ${relationshipId}`);
                 return null;
             }
             const imagePath = `word/${imageTarget}`;
             const imageData = zipHandler.getFileAsBuffer(imagePath);
             if (!imageData) {
-                console.warn(`[DocumentParser] Image file not found: ${imagePath}`);
+                logger_1.defaultLogger.warn(`[DocumentParser] Image file not found: ${imagePath}`);
                 return null;
             }
             const extension = imagePath.split('.').pop()?.toLowerCase() || 'png';
@@ -1265,7 +1264,7 @@ class DocumentParser {
             return new ImageRun_1.ImageRun(image);
         }
         catch (error) {
-            console.warn('[DocumentParser] Failed to parse drawing:', error);
+            logger_1.defaultLogger.warn('[DocumentParser] Failed to parse drawing:', error instanceof Error ? { message: error.message, stack: error.stack } : { error: String(error) });
             return null;
         }
     }
@@ -1391,7 +1390,7 @@ class DocumentParser {
             return table;
         }
         catch (error) {
-            console.warn('[DocumentParser] Failed to parse table:', error);
+            logger_1.defaultLogger.warn('[DocumentParser] Failed to parse table:', error instanceof Error ? { message: error.message, stack: error.stack } : { error: String(error) });
             return null;
         }
     }
@@ -1490,7 +1489,7 @@ class DocumentParser {
             return row;
         }
         catch (error) {
-            console.warn('[DocumentParser] Failed to parse table row:', error);
+            logger_1.defaultLogger.warn('[DocumentParser] Failed to parse table row:', error instanceof Error ? { message: error.message, stack: error.stack } : { error: String(error) });
             return null;
         }
     }
@@ -1717,7 +1716,7 @@ class DocumentParser {
             return cell;
         }
         catch (error) {
-            console.warn('[DocumentParser] Failed to parse table cell:', error);
+            logger_1.defaultLogger.warn('[DocumentParser] Failed to parse table cell:', error instanceof Error ? { message: error.message, stack: error.stack } : { error: String(error) });
             return null;
         }
     }
@@ -1871,7 +1870,7 @@ class DocumentParser {
             return new StructuredDocumentTag_1.StructuredDocumentTag(properties, content);
         }
         catch (error) {
-            console.warn('[DocumentParser] Failed to parse SDT:', error);
+            logger_1.defaultLogger.warn('[DocumentParser] Failed to parse SDT:', error instanceof Error ? { message: error.message, stack: error.stack } : { error: String(error) });
             return null;
         }
     }
@@ -1910,7 +1909,7 @@ class DocumentParser {
                     break;
             }
             if (!fieldInstruction) {
-                console.warn('[DocumentParser] No TOC field instruction found in SDT content');
+                logger_1.defaultLogger.warn('[DocumentParser] No TOC field instruction found in SDT content');
                 return null;
             }
             const tocOptions = {
@@ -1953,7 +1952,7 @@ class DocumentParser {
             return new TableOfContents_1.TableOfContents(tocOptions);
         }
         catch (error) {
-            console.warn('[DocumentParser] Failed to parse TOC from SDT content:', error);
+            logger_1.defaultLogger.warn('[DocumentParser] Failed to parse TOC from SDT content:', error instanceof Error ? { message: error.message, stack: error.stack } : { error: String(error) });
             return null;
         }
     }