docxmlater 10.4.0 → 11.0.4

package/dist/core/DocumentGenerator.js

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentGenerator = void 0;
-const Hyperlink_1 = require("../elements/Hyperlink");
-const ImageManager_1 = require("../elements/ImageManager");
-const Paragraph_1 = require("../elements/Paragraph");
-const Revision_1 = require("../elements/Revision");
-const RevisionContent_1 = require("../elements/RevisionContent");
-const StructuredDocumentTag_1 = require("../elements/StructuredDocumentTag");
-const Table_1 = require("../elements/Table");
-const PreservedElement_1 = require("../elements/PreservedElement");
-const dateFormatting_1 = require("../utils/dateFormatting");
-const logger_1 = require("../utils/logger");
-const XMLBuilder_1 = require("../xml/XMLBuilder");
+const Hyperlink_js_1 = require("../elements/Hyperlink.js");
+const ImageManager_js_1 = require("../elements/ImageManager.js");
+const Paragraph_js_1 = require("../elements/Paragraph.js");
+const Revision_js_1 = require("../elements/Revision.js");
+const RevisionContent_js_1 = require("../elements/RevisionContent.js");
+const StructuredDocumentTag_js_1 = require("../elements/StructuredDocumentTag.js");
+const Table_js_1 = require("../elements/Table.js");
+const PreservedElement_js_1 = require("../elements/PreservedElement.js");
+const dateFormatting_js_1 = require("../utils/dateFormatting.js");
+const logger_js_1 = require("../utils/logger.js");
+const XMLBuilder_js_1 = require("../xml/XMLBuilder.js");
 function getLogger() {
-    return (0, logger_1.createScopedLogger)((0, logger_1.getGlobalLogger)(), 'DocumentGenerator');
+    return (0, logger_js_1.createScopedLogger)((0, logger_js_1.getGlobalLogger)(), 'DocumentGenerator');
 }
 function normalizeXmlOutput(xml) {
     return Array.isArray(xml) ? xml : [xml];
@@ -63,9 +63,9 @@ class DocumentGenerator {
                 bgAttrs['w:themeTint'] = documentBackground.themeTint;
             if (documentBackground.themeShade)
                 bgAttrs['w:themeShade'] = documentBackground.themeShade;
-            preBodyContent = [XMLBuilder_1.XMLBuilder.wSelf('background', bgAttrs)];
+            preBodyContent = [XMLBuilder_js_1.XMLBuilder.wSelf('background', bgAttrs)];
         }
-        const result = XMLBuilder_1.XMLBuilder.createDocument(bodyXmls, namespaces, preBodyContent);
+        const result = XMLBuilder_js_1.XMLBuilder.createDocument(bodyXmls, namespaces, preBodyContent);
         logger.info('Document.xml generated', { xmlSize: result.length });
         return result;
     }
@@ -74,7 +74,7 @@ class DocumentGenerator {
         const created = properties.created || now;
         const modified = properties.modified || now;
         const formatDate = (date) => {
-            return (0, dateFormatting_1.formatDateForXml)(date);
+            return (0, dateFormatting_js_1.formatDateForXml)(date);
         };
         return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
@@ -82,18 +82,18 @@ class DocumentGenerator {
                    xmlns:dcterms="http://purl.org/dc/terms/"
                    xmlns:dcmitype="http://purl.org/dc/dcmitype/"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <dc:title>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.title || '')}</dc:title>
-  <dc:subject>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.subject || '')}</dc:subject>
-  <dc:creator>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.creator || 'DocXML')}</dc:creator>
-  <cp:keywords>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.keywords || '')}</cp:keywords>
-  <dc:description>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.description || '')}</dc:description>
-  <cp:lastModifiedBy>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.lastModifiedBy || properties.creator || 'DocXML')}</cp:lastModifiedBy>
+  <dc:title>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.title || '')}</dc:title>
+  <dc:subject>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.subject || '')}</dc:subject>
+  <dc:creator>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.creator || 'DocXML')}</dc:creator>
+  <cp:keywords>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.keywords || '')}</cp:keywords>
+  <dc:description>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.description || '')}</dc:description>
+  <cp:lastModifiedBy>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.lastModifiedBy || properties.creator || 'DocXML')}</cp:lastModifiedBy>
   <cp:revision>${properties.revision || 1}</cp:revision>${properties.category
-            ? `\n  <cp:category>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.category)}</cp:category>`
+            ? `\n  <cp:category>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.category)}</cp:category>`
             : ''}${properties.contentStatus
-            ? `\n  <cp:contentStatus>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.contentStatus)}</cp:contentStatus>`
+            ? `\n  <cp:contentStatus>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.contentStatus)}</cp:contentStatus>`
             : ''}${properties.language
-            ? `\n  <dc:language>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.language)}</dc:language>`
+            ? `\n  <dc:language>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.language)}</dc:language>`
             : ''}
   <dcterms:created xsi:type="dcterms:W3CDTF">${formatDate(created)}</dcterms:created>
   <dcterms:modified xsi:type="dcterms:W3CDTF">${formatDate(modified)}</dcterms:modified>
@@ -103,16 +103,16 @@ class DocumentGenerator {
         return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
             xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
-  <Application>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.application || 'docxmlater')}</Application>
+  <Application>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.application || 'docxmlater')}</Application>
   <DocSecurity>0</DocSecurity>
   <ScaleCrop>false</ScaleCrop>
-  <Company>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.company || '')}</Company>${properties.manager
-            ? `\n  <Manager>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.manager)}</Manager>`
+  <Company>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.company || '')}</Company>${properties.manager
+            ? `\n  <Manager>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.manager)}</Manager>`
             : ''}
   <LinksUpToDate>false</LinksUpToDate>
   <SharedDoc>false</SharedDoc>
   <HyperlinksChanged>false</HyperlinksChanged>
-  <AppVersion>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.appVersion || properties.version || '1.0.0')}</AppVersion>
+  <AppVersion>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(properties.appVersion || properties.version || '1.0.0')}</AppVersion>
 </Properties>`;
     }
     generateCustomProps(customProps) {
@@ -121,22 +121,22 @@ class DocumentGenerator {
         }
         const formatCustomValue = (key, value, pid) => {
             if (typeof value === 'string') {
-                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
-    <vt:lpwstr>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(value)}</vt:lpwstr>
+                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(key)}">
+    <vt:lpwstr>${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(value)}</vt:lpwstr>
   </property>`;
             }
             else if (typeof value === 'number') {
-                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
+                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(key)}">
     <vt:r8>${value}</vt:r8>
   </property>`;
             }
             else if (typeof value === 'boolean') {
-                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
+                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(key)}">
     <vt:bool>${value ? 'true' : 'false'}</vt:bool>
   </property>`;
             }
             else if (value instanceof Date) {
-                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
+                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_js_1.XMLBuilder.sanitizeXmlContent(key)}">
     <vt:filetime>${value.toISOString()}</vt:filetime>
   </property>`;
             }
@@ -163,7 +163,7 @@ ${properties}
         generatedDefaults.add('xml|application/xml');
         for (const entry of images) {
             const ext = entry.image.getExtension();
-            const mimeType = ImageManager_1.ImageManager.getMimeType(ext);
+            const mimeType = ImageManager_js_1.ImageManager.getMimeType(ext);
             generatedDefaults.add(`${ext}|${mimeType}`);
         }
         const mediaExtensions = new Map([
@@ -291,16 +291,16 @@ ${properties}
             const parts = entry.split('|');
             const ext = parts[0] || '';
             const contentType = parts[1] || '';
-            const escapedExt = XMLBuilder_1.XMLBuilder.escapeXmlAttribute(ext);
-            const escapedContentType = XMLBuilder_1.XMLBuilder.escapeXmlAttribute(contentType);
+            const escapedExt = XMLBuilder_js_1.XMLBuilder.escapeXmlAttribute(ext);
+            const escapedContentType = XMLBuilder_js_1.XMLBuilder.escapeXmlAttribute(contentType);
             xml += `  <Default Extension="${escapedExt}" ContentType="${escapedContentType}"/>\n`;
         }
         for (const entry of allOverrides) {
             const parts = entry.split('|');
             const partName = parts[0] || '';
             const contentType = parts[1] || '';
-            const escapedPartName = XMLBuilder_1.XMLBuilder.escapeXmlAttribute(partName);
-            const escapedContentType = XMLBuilder_1.XMLBuilder.escapeXmlAttribute(contentType);
+            const escapedPartName = XMLBuilder_js_1.XMLBuilder.escapeXmlAttribute(partName);
+            const escapedContentType = XMLBuilder_js_1.XMLBuilder.escapeXmlAttribute(contentType);
             xml += `  <Override PartName="${escapedPartName}" ContentType="${escapedContentType}"/>\n`;
         }
         xml += '</Types>';
@@ -310,15 +310,15 @@ ${properties}
         const usedRelIds = new Set();
         const scanParagraph = (para) => {
             for (const item of para.getContent()) {
-                if (item instanceof Hyperlink_1.Hyperlink && item.isExternal()) {
+                if (item instanceof Hyperlink_js_1.Hyperlink && item.isExternal()) {
                     const relId = item.getRelationshipId();
                     if (relId) {
                         usedRelIds.add(relId);
                     }
                 }
-                if (item instanceof Revision_1.Revision) {
+                if (item instanceof Revision_js_1.Revision) {
                     for (const revContent of item.getContent()) {
-                        if ((0, RevisionContent_1.isHyperlinkContent)(revContent)) {
+                        if ((0, RevisionContent_js_1.isHyperlinkContent)(revContent)) {
                             const hyperlink = revContent;
                             if (hyperlink.isExternal()) {
                                 const relId = hyperlink.getRelationshipId();
@@ -329,7 +329,7 @@ ${properties}
                         }
                     }
                 }
-                if (item instanceof PreservedElement_1.PreservedElement) {
+                if (item instanceof PreservedElement_js_1.PreservedElement) {
                     const rawXml = item.getRawXml();
                     const rIdPattern = /r:id="(rId\d+)"/g;
                     let rIdMatch;
@@ -340,10 +340,10 @@ ${properties}
             }
         };
         const scanElement = (element) => {
-            if (element instanceof Paragraph_1.Paragraph) {
+            if (element instanceof Paragraph_js_1.Paragraph) {
                 scanParagraph(element);
             }
-            else if (element instanceof Table_1.Table) {
+            else if (element instanceof Table_js_1.Table) {
                 for (let row = 0; row < element.getRowCount(); row++) {
                     for (let col = 0; col < element.getColumnCount(); col++) {
                         const cell = element.getCell(row, col);
@@ -363,7 +363,7 @@ ${properties}
                     }
                 }
             }
-            else if (element instanceof StructuredDocumentTag_1.StructuredDocumentTag) {
+            else if (element instanceof StructuredDocumentTag_js_1.StructuredDocumentTag) {
                 const content = element.getContent();
                 for (const item of content) {
                     scanElement(item);
@@ -411,10 +411,10 @@ ${properties}
         logger.info('Processing hyperlinks');
         this.clearOrphanedHyperlinkRelationships(bodyElements, headerFooterManager, relationshipManager, footnoteManager, endnoteManager);
         const processElement = (element) => {
-            if (element instanceof Paragraph_1.Paragraph) {
+            if (element instanceof Paragraph_js_1.Paragraph) {
                 this.processHyperlinksInParagraph(element, relationshipManager);
             }
-            else if (element instanceof Table_1.Table) {
+            else if (element instanceof Table_js_1.Table) {
                 for (let row = 0; row < element.getRowCount(); row++) {
                     for (let col = 0; col < element.getColumnCount(); col++) {
                         const cell = element.getCell(row, col);
@@ -427,7 +427,7 @@ ${properties}
                     }
                 }
             }
-            else if (element instanceof StructuredDocumentTag_1.StructuredDocumentTag) {
+            else if (element instanceof StructuredDocumentTag_js_1.StructuredDocumentTag) {
                 const content = element.getContent();
                 for (const item of content) {
                     processElement(item);
@@ -468,12 +468,12 @@ ${properties}
     processHyperlinksInParagraph(paragraph, relationshipManager) {
         const content = paragraph.getContent();
         for (const item of content) {
-            if (item instanceof Hyperlink_1.Hyperlink && item.isExternal() && !item.getRelationshipId()) {
+            if (item instanceof Hyperlink_js_1.Hyperlink && item.isExternal() && !item.getRelationshipId()) {
                 this.registerHyperlinkRelationship(item, relationshipManager);
             }
-            if (item instanceof Revision_1.Revision) {
+            if (item instanceof Revision_js_1.Revision) {
                 for (const revContent of item.getContent()) {
-                    if ((0, RevisionContent_1.isHyperlinkContent)(revContent)) {
+                    if ((0, RevisionContent_js_1.isHyperlinkContent)(revContent)) {
                         const hyperlink = revContent;
                         if (hyperlink.isExternal() && !hyperlink.getRelationshipId()) {
                             this.registerHyperlinkRelationship(hyperlink, relationshipManager);
@@ -585,11 +585,19 @@ ${properties}
             const view = trackChangesSettings.revisionView;
             if (!view.showInsertionsAndDeletions ||
                 !view.showFormatting ||
-                view.showInkAnnotations === false) {
+                view.showInkAnnotations === false ||
+                view.showMarkup === false ||
+                view.showComments === false) {
                 xml += `\n  <w:revisionView w:insDel="${view.showInsertionsAndDeletions ? '1' : '0'}" w:formatting="${view.showFormatting ? '1' : '0'}"`;
                 if (view.showInkAnnotations !== undefined) {
                     xml += ` w:inkAnnotations="${view.showInkAnnotations ? '1' : '0'}"`;
                 }
+                if (view.showMarkup !== undefined) {
+                    xml += ` w:markup="${view.showMarkup ? '1' : '0'}"`;
+                }
+                if (view.showComments !== undefined) {
+                    xml += ` w:comments="${view.showComments ? '1' : '0'}"`;
+                }
                 xml += '/>';
             }
         }
@@ -604,6 +612,9 @@ ${properties}
         if (trackChangesSettings?.documentProtection) {
             const prot = trackChangesSettings.documentProtection;
             xml += `\n  <w:documentProtection w:edit="${prot.edit}" w:enforcement="${prot.enforcement ? '1' : '0'}"`;
+            if (prot.formatting !== undefined) {
+                xml += ` w:formatting="${prot.formatting ? '1' : '0'}"`;
+            }
             if (prot.cryptProviderType) {
                 xml += ` w:cryptProviderType="${prot.cryptProviderType}"`;
             }
@@ -625,6 +636,15 @@ ${properties}
             if (prot.salt) {
                 xml += ` w:salt="${prot.salt}"`;
             }
+            if (prot.algorithmName) {
+                xml += ` w:algorithmName="${prot.algorithmName}"`;
+            }
+            if (prot.hashValue) {
+                xml += ` w:hashValue="${prot.hashValue}"`;
+            }
+            if (prot.saltValue) {
+                xml += ` w:saltValue="${prot.saltValue}"`;
+            }
             xml += '/>';
         }
         xml += `