docxmlater 10.4.1 → 11.0.4

package/dist/formatting/Style.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Style = void 0;
-const XMLBuilder_1 = require("../xml/XMLBuilder");
-const Run_1 = require("../elements/Run");
-const CommonTypes_1 = require("../elements/CommonTypes");
-const deepClone_1 = require("../utils/deepClone");
+const XMLBuilder_js_1 = require("../xml/XMLBuilder.js");
+const Run_js_1 = require("../elements/Run.js");
+const CommonTypes_js_1 = require("../elements/CommonTypes.js");
+const deepClone_js_1 = require("../utils/deepClone.js");
 class Style {
     properties;
     constructor(properties) {
@@ -261,75 +261,127 @@ class Style {
             styleAttrs['w:customStyle'] = '1';
         }
         const styleChildren = [];
-        styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('name', { 'w:val': this.properties.name }));
+        styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('name', { 'w:val': this.properties.name }));
         if (this.properties.aliases) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('aliases', { 'w:val': this.properties.aliases }));
+            styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('aliases', { 'w:val': this.properties.aliases }));
         }
         if (this.properties.basedOn) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('basedOn', { 'w:val': this.properties.basedOn }));
+            styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('basedOn', { 'w:val': this.properties.basedOn }));
         }
         if (this.properties.next) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('next', { 'w:val': this.properties.next }));
+            styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('next', { 'w:val': this.properties.next }));
         }
         if (this.properties.link) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('link', { 'w:val': this.properties.link }));
+            styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('link', { 'w:val': this.properties.link }));
         }
-        if (this.properties.autoRedefine) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('autoRedefine'));
+        if (this.properties.autoRedefine !== undefined) {
+            if (this.properties.autoRedefine) {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('autoRedefine'));
+            }
+            else {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('autoRedefine', { 'w:val': 'off' }));
+            }
+        }
+        if (this.properties.hidden !== undefined) {
+            if (this.properties.hidden) {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('hidden'));
+            }
+            else {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('hidden', { 'w:val': 'off' }));
+            }
         }
         if (this.properties.uiPriority !== undefined) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('uiPriority', {
+            styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('uiPriority', {
                 'w:val': String(this.properties.uiPriority),
             }));
         }
-        if (this.properties.semiHidden) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('semiHidden'));
+        if (this.properties.semiHidden !== undefined) {
+            if (this.properties.semiHidden) {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('semiHidden'));
+            }
+            else {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('semiHidden', { 'w:val': 'off' }));
+            }
         }
-        if (this.properties.unhideWhenUsed) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('unhideWhenUsed'));
+        if (this.properties.unhideWhenUsed !== undefined) {
+            if (this.properties.unhideWhenUsed) {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('unhideWhenUsed'));
+            }
+            else {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('unhideWhenUsed', { 'w:val': 'off' }));
+            }
         }
         if (this.properties.qFormat !== undefined) {
             if (this.properties.qFormat) {
-                styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('qFormat'));
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('qFormat'));
+            }
+            else {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('qFormat', { 'w:val': 'off' }));
             }
         }
         else if (!this.properties.customStyle) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('qFormat'));
+            styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('qFormat'));
         }
-        if (this.properties.locked) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('locked'));
+        if (this.properties.locked !== undefined) {
+            if (this.properties.locked) {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('locked'));
+            }
+            else {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('locked', { 'w:val': 'off' }));
+            }
         }
-        if (this.properties.personal) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('personal'));
+        if (this.properties.personal !== undefined) {
+            if (this.properties.personal) {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('personal'));
+            }
+            else {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('personal', { 'w:val': 'off' }));
+            }
         }
-        if (this.properties.personalCompose) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('personalCompose'));
+        if (this.properties.personalCompose !== undefined) {
+            if (this.properties.personalCompose) {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('personalCompose'));
+            }
+            else {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('personalCompose', { 'w:val': 'off' }));
+            }
         }
-        if (this.properties.personalReply) {
-            styleChildren.push(XMLBuilder_1.XMLBuilder.wSelf('personalReply'));
+        if (this.properties.personalReply !== undefined) {
+            if (this.properties.personalReply) {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('personalReply'));
+            }
+            else {
+                styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('personalReply', { 'w:val': 'off' }));
+            }
+        }
+        if (this.properties.rsid !== undefined && this.properties.rsid !== '') {
+            styleChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('rsid', { 'w:val': this.properties.rsid }));
         }
         if (this.properties.paragraphFormatting || this.properties.numPr) {
             const pPr = this.generateParagraphProperties(this.properties.paragraphFormatting || {});
             if (this.properties.numPr) {
                 const numPrChildren = [];
                 if (this.properties.numPr.ilvl !== undefined) {
-                    numPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('ilvl', { 'w:val': String(this.properties.numPr.ilvl) }));
+                    numPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('ilvl', { 'w:val': String(this.properties.numPr.ilvl) }));
                 }
                 if (this.properties.numPr.numId !== undefined) {
-                    numPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('numId', { 'w:val': String(this.properties.numPr.numId) }));
+                    numPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('numId', { 'w:val': String(this.properties.numPr.numId) }));
                 }
                 if (numPrChildren.length > 0) {
-                    const numPrEl = XMLBuilder_1.XMLBuilder.w('numPr', undefined, numPrChildren);
+                    const numPrEl = XMLBuilder_js_1.XMLBuilder.w('numPr', undefined, numPrChildren);
                     if (pPr.children && pPr.children.length > 0) {
+                        const preNumPr = new Set([
+                            'w:keepNext',
+                            'w:keepLines',
+                            'w:pageBreakBefore',
+                            'w:framePr',
+                            'w:widowControl',
+                        ]);
                         let insertIdx = 0;
                         for (let i = 0; i < pPr.children.length; i++) {
                             const child = pPr.children[i];
-                            if (child && typeof child !== 'string') {
-                                if (child.name === 'w:keepNext' ||
-                                    child.name === 'w:keepLines' ||
-                                    child.name === 'w:pageBreakBefore') {
-                                    insertIdx = i + 1;
-                                }
+                            if (child && typeof child !== 'string' && preNumPr.has(child.name)) {
+                                insertIdx = i + 1;
                             }
                         }
                         pPr.children.splice(insertIdx, 0, numPrEl);
@@ -377,32 +429,145 @@ class Style {
                 }
             }
         }
-        return XMLBuilder_1.XMLBuilder.w('style', styleAttrs, styleChildren);
+        return XMLBuilder_js_1.XMLBuilder.w('style', styleAttrs, styleChildren);
     }
     generateParagraphProperties(formatting) {
         const pPrChildren = [];
-        if (formatting.keepNext) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('keepNext'));
+        const emitCtOnOff = (tag, value) => {
+            if (value === undefined)
+                return;
+            pPrChildren.push(value ? XMLBuilder_js_1.XMLBuilder.wSelf(tag) : XMLBuilder_js_1.XMLBuilder.wSelf(tag, { 'w:val': '0' }));
+        };
+        emitCtOnOff('keepNext', formatting.keepNext);
+        emitCtOnOff('keepLines', formatting.keepLines);
+        emitCtOnOff('pageBreakBefore', formatting.pageBreakBefore);
+        if (formatting.framePr) {
+            const f = formatting.framePr;
+            const attrs = {};
+            if (f.w !== undefined)
+                attrs['w:w'] = f.w.toString();
+            if (f.h !== undefined)
+                attrs['w:h'] = f.h.toString();
+            if (f.hRule)
+                attrs['w:hRule'] = f.hRule;
+            if (f.x !== undefined)
+                attrs['w:x'] = f.x.toString();
+            if (f.y !== undefined)
+                attrs['w:y'] = f.y.toString();
+            if (f.xAlign)
+                attrs['w:xAlign'] = f.xAlign;
+            if (f.yAlign)
+                attrs['w:yAlign'] = f.yAlign;
+            if (f.hAnchor)
+                attrs['w:hAnchor'] = f.hAnchor;
+            if (f.vAnchor)
+                attrs['w:vAnchor'] = f.vAnchor;
+            if (f.hSpace !== undefined)
+                attrs['w:hSpace'] = f.hSpace.toString();
+            if (f.vSpace !== undefined)
+                attrs['w:vSpace'] = f.vSpace.toString();
+            if (f.wrap)
+                attrs['w:wrap'] = f.wrap;
+            if (f.dropCap)
+                attrs['w:dropCap'] = f.dropCap;
+            if (f.lines !== undefined)
+                attrs['w:lines'] = f.lines.toString();
+            if (f.anchorLock !== undefined)
+                attrs['w:anchorLock'] = f.anchorLock ? '1' : '0';
+            if (Object.keys(attrs).length > 0) {
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('framePr', attrs));
+            }
+        }
+        emitCtOnOff('widowControl', formatting.widowControl);
+        emitCtOnOff('suppressLineNumbers', formatting.suppressLineNumbers);
+        if (formatting.borders) {
+            const borderChildren = [];
+            const b = formatting.borders;
+            const createBorder = (tag, def) => {
+                if (!def)
+                    return;
+                const attrs = { 'w:val': def.style ?? 'nil' };
+                if (def.size !== undefined)
+                    attrs['w:sz'] = def.size;
+                if (def.space !== undefined)
+                    attrs['w:space'] = def.space;
+                if (def.color)
+                    attrs['w:color'] = def.color;
+                if (def.themeColor)
+                    attrs['w:themeColor'] = def.themeColor;
+                if (def.themeTint)
+                    attrs['w:themeTint'] = def.themeTint;
+                if (def.themeShade)
+                    attrs['w:themeShade'] = def.themeShade;
+                if (def.shadow !== undefined)
+                    attrs['w:shadow'] = def.shadow ? '1' : '0';
+                if (def.frame !== undefined)
+                    attrs['w:frame'] = def.frame ? '1' : '0';
+                borderChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf(tag, attrs));
+            };
+            createBorder('top', b.top);
+            createBorder('left', b.left);
+            createBorder('bottom', b.bottom);
+            createBorder('right', b.right);
+            createBorder('between', b.between);
+            createBorder('bar', b.bar);
+            if (borderChildren.length > 0) {
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('pBdr', undefined, borderChildren));
+            }
         }
-        if (formatting.keepLines) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('keepLines'));
+        if (formatting.shading) {
+            const shdAttrs = (0, CommonTypes_js_1.buildShadingAttributes)(formatting.shading);
+            if (Object.keys(shdAttrs).length > 0) {
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('shd', shdAttrs));
+            }
         }
-        if (formatting.pageBreakBefore) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('pageBreakBefore'));
+        if (formatting.tabs && formatting.tabs.length > 0) {
+            const tabChildren = [];
+            for (const tab of formatting.tabs) {
+                const attrs = {
+                    'w:val': tab.val ?? 'left',
+                    'w:pos': tab.position,
+                };
+                if (tab.leader)
+                    attrs['w:leader'] = tab.leader;
+                tabChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tab', attrs));
+            }
+            if (tabChildren.length > 0) {
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('tabs', undefined, tabChildren));
+            }
         }
+        emitCtOnOff('suppressAutoHyphens', formatting.suppressAutoHyphens);
+        emitCtOnOff('kinsoku', formatting.kinsoku);
+        emitCtOnOff('wordWrap', formatting.wordWrap);
+        emitCtOnOff('overflowPunct', formatting.overflowPunct);
+        emitCtOnOff('topLinePunct', formatting.topLinePunct);
+        emitCtOnOff('autoSpaceDE', formatting.autoSpaceDE);
+        emitCtOnOff('autoSpaceDN', formatting.autoSpaceDN);
+        emitCtOnOff('bidi', formatting.bidi);
+        emitCtOnOff('adjustRightInd', formatting.adjustRightInd);
         if (formatting.spacing) {
             const spc = formatting.spacing;
             const attributes = {};
             if (spc.before !== undefined)
                 attributes['w:before'] = spc.before;
+            if (spc.beforeLines !== undefined)
+                attributes['w:beforeLines'] = spc.beforeLines;
+            if (spc.beforeAutospacing !== undefined) {
+                attributes['w:beforeAutospacing'] = spc.beforeAutospacing ? '1' : '0';
+            }
             if (spc.after !== undefined)
                 attributes['w:after'] = spc.after;
+            if (spc.afterLines !== undefined)
+                attributes['w:afterLines'] = spc.afterLines;
+            if (spc.afterAutospacing !== undefined) {
+                attributes['w:afterAutospacing'] = spc.afterAutospacing ? '1' : '0';
+            }
             if (spc.line !== undefined)
                 attributes['w:line'] = spc.line;
             if (spc.lineRule)
                 attributes['w:lineRule'] = spc.lineRule;
             if (Object.keys(attributes).length > 0) {
-                pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('spacing', attributes));
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('spacing', attributes));
             }
         }
         if (formatting.indentation) {
@@ -412,53 +577,80 @@ class Style {
                 attributes['w:left'] = ind.left;
             if (ind.right !== undefined)
                 attributes['w:right'] = ind.right;
-            if (ind.firstLine !== undefined)
-                attributes['w:firstLine'] = ind.firstLine;
-            if (ind.hanging !== undefined)
+            if (ind.hanging !== undefined) {
                 attributes['w:hanging'] = ind.hanging;
+            }
+            else if (ind.firstLine !== undefined) {
+                attributes['w:firstLine'] = ind.firstLine;
+            }
+            if (ind.leftChars !== undefined)
+                attributes['w:leftChars'] = ind.leftChars;
+            if (ind.rightChars !== undefined)
+                attributes['w:rightChars'] = ind.rightChars;
+            if (ind.hangingChars !== undefined) {
+                attributes['w:hangingChars'] = ind.hangingChars;
+            }
+            else if (ind.firstLineChars !== undefined) {
+                attributes['w:firstLineChars'] = ind.firstLineChars;
+            }
             if (Object.keys(attributes).length > 0) {
-                pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('ind', attributes));
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('ind', attributes));
             }
         }
-        if (formatting.contextualSpacing) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('contextualSpacing', { 'w:val': '1' }));
-        }
+        emitCtOnOff('contextualSpacing', formatting.contextualSpacing);
+        emitCtOnOff('mirrorIndents', formatting.mirrorIndents);
+        emitCtOnOff('suppressOverlap', formatting.suppressOverlap);
         if (formatting.alignment) {
             const alignmentValue = formatting.alignment === 'justify' ? 'both' : formatting.alignment;
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('jc', { 'w:val': alignmentValue }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('jc', { 'w:val': alignmentValue }));
+        }
+        if (formatting.textDirection) {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('textDirection', { 'w:val': formatting.textDirection }));
+        }
+        if (formatting.textAlignment) {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('textAlignment', { 'w:val': formatting.textAlignment }));
+        }
+        if (formatting.textboxTightWrap) {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('textboxTightWrap', { 'w:val': formatting.textboxTightWrap }));
         }
         if (formatting.outlineLevel !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('outlineLvl', { 'w:val': formatting.outlineLevel.toString() }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('outlineLvl', { 'w:val': formatting.outlineLevel.toString() }));
+        }
+        if (formatting.divId !== undefined) {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('divId', { 'w:val': formatting.divId.toString() }));
         }
-        return XMLBuilder_1.XMLBuilder.w('pPr', undefined, pPrChildren);
+        if (formatting.cnfStyle) {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cnfStyle', { 'w:val': formatting.cnfStyle }));
+        }
+        return XMLBuilder_js_1.XMLBuilder.w('pPr', undefined, pPrChildren);
     }
     generateRunProperties(formatting) {
-        const rPr = Run_1.Run.generateRunPropertiesXML(formatting);
-        return rPr || XMLBuilder_1.XMLBuilder.w('rPr', undefined, []);
+        const rPr = Run_js_1.Run.generateRunPropertiesXML(formatting);
+        return rPr || XMLBuilder_js_1.XMLBuilder.w('rPr', undefined, []);
     }
     generateTableProperties(formatting, tableStyle, isConditional = false) {
         const tblPrChildren = [];
         if (tableStyle.rowBandSize !== undefined) {
-            tblPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tblStyleRowBandSize', {
+            tblPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblStyleRowBandSize', {
                 'w:val': tableStyle.rowBandSize,
             }));
         }
         if (tableStyle.colBandSize !== undefined) {
-            tblPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tblStyleColBandSize', {
+            tblPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblStyleColBandSize', {
                 'w:val': tableStyle.colBandSize,
             }));
         }
         if (formatting.alignment) {
-            tblPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('jc', { 'w:val': formatting.alignment }));
+            tblPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('jc', { 'w:val': formatting.alignment }));
         }
         if (formatting.cellSpacing !== undefined) {
-            tblPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tblCellSpacing', {
+            tblPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblCellSpacing', {
                 'w:w': formatting.cellSpacing,
                 'w:type': 'dxa',
             }));
         }
         if (formatting.indent !== undefined) {
-            tblPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tblInd', {
+            tblPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblInd', {
                 'w:w': formatting.indent,
                 'w:type': formatting.indentType || 'dxa',
             }));
@@ -466,7 +658,7 @@ class Style {
         if (formatting.borders) {
             const borderElements = this.generateBorderElements(formatting.borders, false);
             if (borderElements.length > 0) {
-                tblPrChildren.push(XMLBuilder_1.XMLBuilder.w('tblBorders', undefined, borderElements));
+                tblPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('tblBorders', undefined, borderElements));
             }
         }
         if (formatting.shading && !isConditional) {
@@ -475,41 +667,41 @@ class Style {
         if (formatting.cellMargins) {
             const marginElements = [];
             if (formatting.cellMargins.top !== undefined) {
-                marginElements.push(XMLBuilder_1.XMLBuilder.wSelf('top', {
+                marginElements.push(XMLBuilder_js_1.XMLBuilder.wSelf('top', {
                     'w:w': formatting.cellMargins.top,
                     'w:type': 'dxa',
                 }));
             }
             if (formatting.cellMargins.left !== undefined) {
-                marginElements.push(XMLBuilder_1.XMLBuilder.wSelf('left', {
+                marginElements.push(XMLBuilder_js_1.XMLBuilder.wSelf('left', {
                     'w:w': formatting.cellMargins.left,
                     'w:type': 'dxa',
                 }));
             }
             if (formatting.cellMargins.bottom !== undefined) {
-                marginElements.push(XMLBuilder_1.XMLBuilder.wSelf('bottom', {
+                marginElements.push(XMLBuilder_js_1.XMLBuilder.wSelf('bottom', {
                     'w:w': formatting.cellMargins.bottom,
                     'w:type': 'dxa',
                 }));
             }
             if (formatting.cellMargins.right !== undefined) {
-                marginElements.push(XMLBuilder_1.XMLBuilder.wSelf('right', {
+                marginElements.push(XMLBuilder_js_1.XMLBuilder.wSelf('right', {
                     'w:w': formatting.cellMargins.right,
                     'w:type': 'dxa',
                 }));
             }
             if (marginElements.length > 0) {
-                tblPrChildren.push(XMLBuilder_1.XMLBuilder.w('tblCellMar', undefined, marginElements));
+                tblPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('tblCellMar', undefined, marginElements));
             }
         }
-        return XMLBuilder_1.XMLBuilder.w('tblPr', undefined, tblPrChildren);
+        return XMLBuilder_js_1.XMLBuilder.w('tblPr', undefined, tblPrChildren);
     }
     generateTableCellProperties(formatting) {
         const tcPrChildren = [];
         if (formatting.borders) {
             const borderElements = this.generateBorderElements(formatting.borders, true);
             if (borderElements.length > 0) {
-                tcPrChildren.push(XMLBuilder_1.XMLBuilder.w('tcBorders', undefined, borderElements));
+                tcPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('tcBorders', undefined, borderElements));
             }
         }
         if (formatting.shading) {
@@ -518,47 +710,47 @@ class Style {
         if (formatting.margins) {
             const marginElements = [];
             if (formatting.margins.top !== undefined) {
-                marginElements.push(XMLBuilder_1.XMLBuilder.wSelf('top', {
+                marginElements.push(XMLBuilder_js_1.XMLBuilder.wSelf('top', {
                     'w:w': formatting.margins.top,
                     'w:type': 'dxa',
                 }));
             }
             if (formatting.margins.left !== undefined) {
-                marginElements.push(XMLBuilder_1.XMLBuilder.wSelf('left', {
+                marginElements.push(XMLBuilder_js_1.XMLBuilder.wSelf('left', {
                     'w:w': formatting.margins.left,
                     'w:type': 'dxa',
                 }));
             }
             if (formatting.margins.bottom !== undefined) {
-                marginElements.push(XMLBuilder_1.XMLBuilder.wSelf('bottom', {
+                marginElements.push(XMLBuilder_js_1.XMLBuilder.wSelf('bottom', {
                     'w:w': formatting.margins.bottom,
                     'w:type': 'dxa',
                 }));
             }
             if (formatting.margins.right !== undefined) {
-                marginElements.push(XMLBuilder_1.XMLBuilder.wSelf('right', {
+                marginElements.push(XMLBuilder_js_1.XMLBuilder.wSelf('right', {
                     'w:w': formatting.margins.right,
                     'w:type': 'dxa',
                 }));
             }
             if (marginElements.length > 0) {
-                tcPrChildren.push(XMLBuilder_1.XMLBuilder.w('tcMar', undefined, marginElements));
+                tcPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('tcMar', undefined, marginElements));
             }
         }
         if (formatting.verticalAlignment) {
-            tcPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('vAlign', { 'w:val': formatting.verticalAlignment }));
+            tcPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('vAlign', { 'w:val': formatting.verticalAlignment }));
         }
-        return XMLBuilder_1.XMLBuilder.w('tcPr', undefined, tcPrChildren);
+        return XMLBuilder_js_1.XMLBuilder.w('tcPr', undefined, tcPrChildren);
     }
     generateTableRowProperties(formatting) {
         const trPrChildren = [];
         if (formatting.cantSplit) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('cantSplit'));
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cantSplit'));
         }
         if (formatting.isHeader) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tblHeader'));
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblHeader'));
         }
-        return XMLBuilder_1.XMLBuilder.w('trPr', undefined, trPrChildren);
+        return XMLBuilder_js_1.XMLBuilder.w('trPr', undefined, trPrChildren);
     }
     generateConditionalFormatting(conditional) {
         const tblStylePrChildren = [];
@@ -592,7 +784,7 @@ class Style {
                 tblStylePrChildren.push(tcPr);
             }
         }
-        return XMLBuilder_1.XMLBuilder.w('tblStylePr', { 'w:type': conditional.type }, tblStylePrChildren);
+        return XMLBuilder_js_1.XMLBuilder.w('tblStylePr', { 'w:type': conditional.type }, tblStylePrChildren);
     }
     generateBorderElements(borders, includeDiagonals) {
         const borderElements = [];
@@ -600,56 +792,61 @@ class Style {
         for (const prop of borderProps) {
             const border = borders[prop];
             if (border) {
-                const attrs = {};
-                if (border.style)
-                    attrs['w:val'] = border.style;
+                const attrs = { 'w:val': border.style ?? 'nil' };
                 if (border.size !== undefined)
                     attrs['w:sz'] = border.size;
                 if (border.space !== undefined)
                     attrs['w:space'] = border.space;
                 if (border.color)
                     attrs['w:color'] = border.color;
-                if (Object.keys(attrs).length > 0) {
-                    borderElements.push(XMLBuilder_1.XMLBuilder.wSelf(prop, attrs));
-                }
+                const b = border;
+                if (b.themeColor)
+                    attrs['w:themeColor'] = b.themeColor;
+                if (b.themeTint)
+                    attrs['w:themeTint'] = b.themeTint;
+                if (b.themeShade)
+                    attrs['w:themeShade'] = b.themeShade;
+                if (b.shadow !== undefined)
+                    attrs['w:shadow'] = b.shadow ? '1' : '0';
+                if (b.frame !== undefined)
+                    attrs['w:frame'] = b.frame ? '1' : '0';
+                borderElements.push(XMLBuilder_js_1.XMLBuilder.wSelf(prop, attrs));
             }
         }
+        const buildDiagonalAttrs = (b) => {
+            const attrs = { 'w:val': b.style ?? 'nil' };
+            if (b.size !== undefined)
+                attrs['w:sz'] = b.size;
+            if (b.space !== undefined)
+                attrs['w:space'] = b.space;
+            if (b.color)
+                attrs['w:color'] = b.color;
+            if (b.themeColor)
+                attrs['w:themeColor'] = b.themeColor;
+            if (b.themeTint)
+                attrs['w:themeTint'] = b.themeTint;
+            if (b.themeShade)
+                attrs['w:themeShade'] = b.themeShade;
+            if (b.shadow !== undefined)
+                attrs['w:shadow'] = b.shadow ? '1' : '0';
+            if (b.frame !== undefined)
+                attrs['w:frame'] = b.frame ? '1' : '0';
+            return attrs;
+        };
         if (includeDiagonals) {
             const cellBorders = borders;
             if (cellBorders.tl2br) {
-                const attrs = {};
-                if (cellBorders.tl2br.style)
-                    attrs['w:val'] = cellBorders.tl2br.style;
-                if (cellBorders.tl2br.size !== undefined)
-                    attrs['w:sz'] = cellBorders.tl2br.size;
-                if (cellBorders.tl2br.space !== undefined)
-                    attrs['w:space'] = cellBorders.tl2br.space;
-                if (cellBorders.tl2br.color)
-                    attrs['w:color'] = cellBorders.tl2br.color;
-                if (Object.keys(attrs).length > 0) {
-                    borderElements.push(XMLBuilder_1.XMLBuilder.wSelf('tl2br', attrs));
-                }
+                borderElements.push(XMLBuilder_js_1.XMLBuilder.wSelf('tl2br', buildDiagonalAttrs(cellBorders.tl2br)));
             }
             if (cellBorders.tr2bl) {
-                const attrs = {};
-                if (cellBorders.tr2bl.style)
-                    attrs['w:val'] = cellBorders.tr2bl.style;
-                if (cellBorders.tr2bl.size !== undefined)
-                    attrs['w:sz'] = cellBorders.tr2bl.size;
-                if (cellBorders.tr2bl.space !== undefined)
-                    attrs['w:space'] = cellBorders.tr2bl.space;
-                if (cellBorders.tr2bl.color)
-                    attrs['w:color'] = cellBorders.tr2bl.color;
-                if (Object.keys(attrs).length > 0) {
-                    borderElements.push(XMLBuilder_1.XMLBuilder.wSelf('tr2bl', attrs));
-                }
+                borderElements.push(XMLBuilder_js_1.XMLBuilder.wSelf('tr2bl', buildDiagonalAttrs(cellBorders.tr2bl)));
             }
         }
         return borderElements;
     }
     generateShadingElement(shading) {
-        const attrs = (0, CommonTypes_1.buildShadingAttributes)(shading);
-        return XMLBuilder_1.XMLBuilder.wSelf('shd', attrs);
+        const attrs = (0, CommonTypes_js_1.buildShadingAttributes)(shading);
+        return XMLBuilder_js_1.XMLBuilder.wSelf('shd', attrs);
     }
     static create(properties) {
         return new Style(properties);
@@ -894,7 +1091,7 @@ class Style {
         });
     }
     clone() {
-        const clonedProps = (0, deepClone_1.deepClone)(this.properties);
+        const clonedProps = (0, deepClone_js_1.deepClone)(this.properties);
         return new Style(clonedProps);
     }
     reset() {