docxmlater 10.4.0 → 11.0.4

package/dist/elements/Run.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Run = void 0;
-const deepClone_1 = require("../utils/deepClone");
-const dateFormatting_1 = require("../utils/dateFormatting");
-const formatting_1 = require("../utils/formatting");
-const diagnostics_1 = require("../utils/diagnostics");
-const logger_1 = require("../utils/logger");
-const validation_1 = require("../utils/validation");
-const units_1 = require("../utils/units");
-const textDiff_1 = require("../utils/textDiff");
-const cnfStyleDecoder_1 = require("../utils/cnfStyleDecoder");
-const XMLBuilder_1 = require("../xml/XMLBuilder");
-const CommonTypes_1 = require("./CommonTypes");
+const deepClone_js_1 = require("../utils/deepClone.js");
+const dateFormatting_js_1 = require("../utils/dateFormatting.js");
+const formatting_js_1 = require("../utils/formatting.js");
+const diagnostics_js_1 = require("../utils/diagnostics.js");
+const logger_js_1 = require("../utils/logger.js");
+const validation_js_1 = require("../utils/validation.js");
+const units_js_1 = require("../utils/units.js");
+const textDiff_js_1 = require("../utils/textDiff.js");
+const cnfStyleDecoder_js_1 = require("../processors/cnfStyleDecoder.js");
+const XMLBuilder_js_1 = require("../xml/XMLBuilder.js");
+const CommonTypes_js_1 = require("./CommonTypes.js");
 class Run {
     content;
     formatting;
@@ -20,12 +20,12 @@ class Run {
     _parentParagraph;
     constructor(text, formatting = {}) {
         if (text === undefined || text === null) {
-            logger_1.defaultLogger.warn(`DocXML Text Validation Warning [Run constructor]:\n` +
+            logger_js_1.defaultLogger.warn(`DocXML Text Validation Warning [Run constructor]:\n` +
                 `  - Received ${text === undefined ? 'undefined' : 'null'} text value\n` +
                 `  - Converting to empty string for Word compatibility`);
         }
         const shouldClean = formatting.cleanXmlFromText !== false;
-        const validation = (0, validation_1.validateRunText)(text, {
+        const validation = (0, validation_js_1.validateRunText)(text, {
             context: 'Run constructor',
             autoClean: shouldClean,
             warnToConsole: true,
@@ -128,21 +128,21 @@ class Run {
     equals(other) {
         if (this.getText() !== other.getText())
             return false;
-        return (0, formatting_1.isEqualFormatting)(this.getFormatting(), other.getFormatting());
+        return (0, formatting_js_1.isEqualFormatting)(this.getFormatting(), other.getFormatting());
     }
     hasSameFormatting(other) {
-        return (0, formatting_1.isEqualFormatting)(this.getFormatting(), other.getFormatting());
+        return (0, formatting_js_1.isEqualFormatting)(this.getFormatting(), other.getFormatting());
     }
     setText(text) {
         const oldText = this.getText();
         const oldContent = [...this.content];
         if (text === undefined || text === null) {
-            logger_1.defaultLogger.warn(`DocXML Text Validation Warning [Run.setText]:\n` +
+            logger_js_1.defaultLogger.warn(`DocXML Text Validation Warning [Run.setText]:\n` +
                 `  - Received ${text === undefined ? 'undefined' : 'null'} text value\n` +
                 `  - Converting to empty string for Word compatibility`);
         }
         const shouldClean = this.formatting.cleanXmlFromText !== false;
-        const validation = (0, validation_1.validateRunText)(text, {
+        const validation = (0, validation_js_1.validateRunText)(text, {
             context: 'Run.setText',
             autoClean: shouldClean,
             warnToConsole: true,
@@ -164,8 +164,8 @@ class Run {
                 c.type === 'fieldChar' ||
                 c.type === 'symbol' ||
                 c.type === 'embeddedObject');
-            const segments = hasNonTextContent ? [] : (0, textDiff_1.diffText)(oldText, normalizedText);
-            const useGranular = !hasNonTextContent && (0, textDiff_1.diffHasUnchangedParts)(segments);
+            const segments = hasNonTextContent ? [] : (0, textDiff_js_1.diffText)(oldText, normalizedText);
+            const useGranular = !hasNonTextContent && (0, textDiff_js_1.diffHasUnchangedParts)(segments);
             if (useGranular) {
                 const revManager = this.trackingContext.getRevisionManager();
                 const now = new Date();
@@ -293,7 +293,7 @@ class Run {
         const cnfStyle = para.getTableConditionalStyle();
         if (!cnfStyle)
             return undefined;
-        const activeConditionals = (0, cnfStyleDecoder_1.getActiveConditionalsInPriorityOrder)(cnfStyle);
+        const activeConditionals = (0, cnfStyleDecoder_js_1.getActiveConditionalsInPriorityOrder)(cnfStyle);
         const tableStyleId = cell.getTableStyleId();
         const stylesManager = para._getStylesManager();
         if (tableStyleId && stylesManager) {
@@ -468,7 +468,7 @@ class Run {
         return this;
     }
     setUnderlineColor(color) {
-        this.formatting.underlineColor = (0, validation_1.normalizeColor)(color);
+        this.formatting.underlineColor = (0, validation_js_1.normalizeColor)(color);
         return this;
     }
     setUnderlineThemeColor(themeColor, themeTint, themeShade) {
@@ -544,7 +544,7 @@ class Run {
     }
     setColor(color) {
         const previousValue = this.formatting.color;
-        const normalizedColor = (0, validation_1.normalizeColor)(color);
+        const normalizedColor = (0, validation_js_1.normalizeColor)(color);
         this.formatting.color = normalizedColor;
         if (this.trackingContext?.isEnabled() && previousValue !== normalizedColor) {
             this.trackingContext.trackRunPropertyChange(this, 'color', previousValue, normalizedColor);
@@ -768,11 +768,11 @@ class Run {
     }
     toXML() {
         const text = this.getText();
-        (0, diagnostics_1.logSerialization)(`Serializing run: "${text}"`, {
+        (0, diagnostics_js_1.logSerialization)(`Serializing run: "${text}"`, {
             rtl: this.formatting.rtl || false,
         });
         if (this.formatting.rtl) {
-            (0, diagnostics_1.logTextDirection)(`Run with RTL being serialized: "${text}"`);
+            (0, diagnostics_js_1.logTextDirection)(`Run with RTL being serialized: "${text}"`);
         }
         const runChildren = [];
         const rPr = Run.generateRunPropertiesXML(this.formatting);
@@ -788,7 +788,7 @@ class Run {
                         attributes: {
                             'w:id': this.propertyChangeRevision.id.toString(),
                             'w:author': this.propertyChangeRevision.author,
-                            'w:date': (0, dateFormatting_1.formatDateForXml)(this.propertyChangeRevision.date),
+                            'w:date': (0, dateFormatting_js_1.formatDateForXml)(this.propertyChangeRevision.date),
                         },
                         children: [prevRPr],
                     };
@@ -805,12 +805,12 @@ class Run {
         for (const contentElement of this.content) {
             switch (contentElement.type) {
                 case 'text':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.w('t', {
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.w('t', {
                         'xml:space': 'preserve',
                     }, [contentElement.value || '']));
                     break;
                 case 'tab':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tab'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tab'));
                     break;
                 case 'break':
                     {
@@ -821,20 +821,20 @@ class Run {
                         if (contentElement.breakClear) {
                             attrs['w:clear'] = contentElement.breakClear;
                         }
-                        runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('br', Object.keys(attrs).length > 0 ? attrs : undefined));
+                        runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('br', Object.keys(attrs).length > 0 ? attrs : undefined));
                     }
                     break;
                 case 'carriageReturn':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('cr'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cr'));
                     break;
                 case 'softHyphen':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('softHyphen'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('softHyphen'));
                     break;
                 case 'noBreakHyphen':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('noBreakHyphen'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('noBreakHyphen'));
                     break;
                 case 'instructionText':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.w('instrText', { 'xml:space': 'preserve' }, [contentElement.value || '']));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.w('instrText', { 'xml:space': 'preserve' }, [contentElement.value || '']));
                     break;
                 case 'fieldChar': {
                     if (!contentElement.fieldCharType) {
@@ -853,163 +853,180 @@ class Run {
                         const ffDataChildren = [];
                         const ffd = contentElement.formFieldData;
                         if (ffd.name !== undefined) {
-                            ffDataChildren.push(XMLBuilder_1.XMLBuilder.wSelf('name', { 'w:val': ffd.name }));
+                            ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('name', { 'w:val': ffd.name }));
                         }
                         if (ffd.enabled !== undefined) {
                             if (ffd.enabled) {
-                                ffDataChildren.push(XMLBuilder_1.XMLBuilder.wSelf('enabled'));
+                                ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('enabled'));
                             }
                             else {
-                                ffDataChildren.push(XMLBuilder_1.XMLBuilder.wSelf('enabled', { 'w:val': '0' }));
+                                ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('enabled', { 'w:val': '0' }));
                             }
                         }
                         if (ffd.calcOnExit !== undefined) {
-                            ffDataChildren.push(XMLBuilder_1.XMLBuilder.wSelf('calcOnExit', { 'w:val': ffd.calcOnExit ? '1' : '0' }));
+                            ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('calcOnExit', { 'w:val': ffd.calcOnExit ? '1' : '0' }));
                         }
                         if (ffd.helpText) {
-                            ffDataChildren.push(XMLBuilder_1.XMLBuilder.wSelf('helpText', { 'w:type': 'text', 'w:val': ffd.helpText }));
+                            ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('helpText', { 'w:type': 'text', 'w:val': ffd.helpText }));
                         }
                         if (ffd.statusText) {
-                            ffDataChildren.push(XMLBuilder_1.XMLBuilder.wSelf('statusText', { 'w:type': 'text', 'w:val': ffd.statusText }));
+                            ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('statusText', { 'w:type': 'text', 'w:val': ffd.statusText }));
                         }
                         if (ffd.entryMacro) {
-                            ffDataChildren.push(XMLBuilder_1.XMLBuilder.wSelf('entryMacro', { 'w:val': ffd.entryMacro }));
+                            ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('entryMacro', { 'w:val': ffd.entryMacro }));
                         }
                         if (ffd.exitMacro) {
-                            ffDataChildren.push(XMLBuilder_1.XMLBuilder.wSelf('exitMacro', { 'w:val': ffd.exitMacro }));
+                            ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('exitMacro', { 'w:val': ffd.exitMacro }));
                         }
                         if (ffd.fieldType) {
                             switch (ffd.fieldType.type) {
                                 case 'textInput': {
                                     const tiChildren = [];
                                     if (ffd.fieldType.inputType) {
-                                        tiChildren.push(XMLBuilder_1.XMLBuilder.wSelf('type', { 'w:val': ffd.fieldType.inputType }));
+                                        tiChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('type', { 'w:val': ffd.fieldType.inputType }));
                                     }
                                     if (ffd.fieldType.defaultValue !== undefined) {
-                                        tiChildren.push(XMLBuilder_1.XMLBuilder.wSelf('default', { 'w:val': ffd.fieldType.defaultValue }));
+                                        tiChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('default', { 'w:val': ffd.fieldType.defaultValue }));
                                     }
                                     if (ffd.fieldType.maxLength !== undefined) {
-                                        tiChildren.push(XMLBuilder_1.XMLBuilder.wSelf('maxLength', { 'w:val': ffd.fieldType.maxLength.toString() }));
+                                        tiChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('maxLength', { 'w:val': ffd.fieldType.maxLength.toString() }));
                                     }
                                     if (ffd.fieldType.format) {
-                                        tiChildren.push(XMLBuilder_1.XMLBuilder.wSelf('format', { 'w:val': ffd.fieldType.format }));
+                                        tiChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('format', { 'w:val': ffd.fieldType.format }));
                                     }
-                                    ffDataChildren.push(XMLBuilder_1.XMLBuilder.w('textInput', {}, tiChildren));
+                                    ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.w('textInput', {}, tiChildren));
                                     break;
                                 }
                                 case 'checkBox': {
                                     const cbChildren = [];
                                     if (ffd.fieldType.size !== undefined && ffd.fieldType.size !== 'auto') {
-                                        cbChildren.push(XMLBuilder_1.XMLBuilder.wSelf('size', { 'w:val': ffd.fieldType.size.toString() }));
+                                        cbChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('size', { 'w:val': ffd.fieldType.size.toString() }));
                                     }
                                     else {
-                                        cbChildren.push(XMLBuilder_1.XMLBuilder.wSelf('sizeAuto'));
+                                        cbChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('sizeAuto'));
                                     }
                                     if (ffd.fieldType.defaultChecked !== undefined) {
-                                        cbChildren.push(XMLBuilder_1.XMLBuilder.wSelf('default', {
+                                        cbChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('default', {
                                             'w:val': ffd.fieldType.defaultChecked ? '1' : '0',
                                         }));
                                     }
                                     if (ffd.fieldType.checked !== undefined) {
-                                        cbChildren.push(XMLBuilder_1.XMLBuilder.wSelf('checked', { 'w:val': ffd.fieldType.checked ? '1' : '0' }));
+                                        cbChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('checked', { 'w:val': ffd.fieldType.checked ? '1' : '0' }));
                                     }
-                                    ffDataChildren.push(XMLBuilder_1.XMLBuilder.w('checkBox', {}, cbChildren));
+                                    ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.w('checkBox', {}, cbChildren));
                                     break;
                                 }
                                 case 'dropDownList': {
                                     const ddChildren = [];
                                     if (ffd.fieldType.result !== undefined) {
-                                        ddChildren.push(XMLBuilder_1.XMLBuilder.wSelf('result', { 'w:val': ffd.fieldType.result.toString() }));
+                                        ddChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('result', { 'w:val': ffd.fieldType.result.toString() }));
                                     }
                                     if (ffd.fieldType.defaultResult !== undefined) {
-                                        ddChildren.push(XMLBuilder_1.XMLBuilder.wSelf('default', {
+                                        ddChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('default', {
                                             'w:val': ffd.fieldType.defaultResult.toString(),
                                         }));
                                     }
                                     if (ffd.fieldType.listEntries) {
                                         for (const entry of ffd.fieldType.listEntries) {
-                                            ddChildren.push(XMLBuilder_1.XMLBuilder.wSelf('listEntry', { 'w:val': entry }));
+                                            ddChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('listEntry', { 'w:val': entry }));
                                         }
                                     }
-                                    ffDataChildren.push(XMLBuilder_1.XMLBuilder.w('ddList', {}, ddChildren));
+                                    ffDataChildren.push(XMLBuilder_js_1.XMLBuilder.w('ddList', {}, ddChildren));
                                     break;
                                 }
                             }
                         }
-                        runChildren.push(XMLBuilder_1.XMLBuilder.w('fldChar', fldCharAttrs, [XMLBuilder_1.XMLBuilder.w('ffData', {}, ffDataChildren)]));
+                        if (ffDataChildren.length > 0) {
+                            runChildren.push(XMLBuilder_js_1.XMLBuilder.w('fldChar', fldCharAttrs, [XMLBuilder_js_1.XMLBuilder.w('ffData', {}, ffDataChildren)]));
+                        }
+                        else {
+                            runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('fldChar', Object.keys(fldCharAttrs).length > 0 ? fldCharAttrs : undefined));
+                        }
                     }
                     else {
-                        runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('fldChar', Object.keys(fldCharAttrs).length > 0 ? fldCharAttrs : undefined));
+                        runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('fldChar', Object.keys(fldCharAttrs).length > 0 ? fldCharAttrs : undefined));
                     }
                     break;
                 }
                 case 'lastRenderedPageBreak':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('lastRenderedPageBreak'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('lastRenderedPageBreak'));
                     break;
                 case 'separator':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('separator'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('separator'));
                     break;
                 case 'continuationSeparator':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('continuationSeparator'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('continuationSeparator'));
                     break;
                 case 'pageNumber':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('pgNum'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('pgNum'));
                     break;
                 case 'annotationRef':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('annotationRef'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('annotationRef'));
                     break;
                 case 'dayShort':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('dayShort'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('dayShort'));
                     break;
                 case 'dayLong':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('dayLong'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('dayLong'));
                     break;
                 case 'monthShort':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('monthShort'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('monthShort'));
                     break;
                 case 'monthLong':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('monthLong'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('monthLong'));
                     break;
                 case 'yearShort':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('yearShort'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('yearShort'));
                     break;
                 case 'yearLong':
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('yearLong'));
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('yearLong'));
                     break;
                 case 'symbol': {
-                    const symAttrs = {};
-                    if (contentElement.symbolFont)
-                        symAttrs['w:font'] = contentElement.symbolFont;
-                    if (contentElement.symbolChar)
-                        symAttrs['w:char'] = contentElement.symbolChar;
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('sym', symAttrs));
+                    if (!contentElement.symbolFont || !contentElement.symbolChar)
+                        break;
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('sym', {
+                        'w:font': contentElement.symbolFont,
+                        'w:char': contentElement.symbolChar,
+                    }));
                     break;
                 }
                 case 'positionTab': {
-                    const ptabAttrs = {};
-                    if (contentElement.ptabAlignment)
-                        ptabAttrs['w:alignment'] = contentElement.ptabAlignment;
-                    if (contentElement.ptabRelativeTo)
-                        ptabAttrs['w:relativeTo'] = contentElement.ptabRelativeTo;
-                    if (contentElement.ptabLeader)
-                        ptabAttrs['w:leader'] = contentElement.ptabLeader;
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('ptab', ptabAttrs));
+                    const ptabAttrs = {
+                        'w:alignment': contentElement.ptabAlignment ?? 'left',
+                        'w:relativeTo': contentElement.ptabRelativeTo ?? 'margin',
+                        'w:leader': contentElement.ptabLeader ?? 'none',
+                    };
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('ptab', ptabAttrs));
                     break;
                 }
                 case 'footnoteReference': {
-                    const fnAttrs = {};
-                    if (contentElement.footnoteId !== undefined)
-                        fnAttrs['w:id'] = contentElement.footnoteId;
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('footnoteReference', fnAttrs));
+                    if (contentElement.footnoteId === undefined)
+                        break;
+                    const fnAttrs = {
+                        'w:id': contentElement.footnoteId,
+                    };
+                    if (contentElement.customMarkFollows === true)
+                        fnAttrs['w:customMarkFollows'] = '1';
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('footnoteReference', fnAttrs));
                     break;
                 }
                 case 'endnoteReference': {
-                    const enAttrs = {};
-                    if (contentElement.endnoteId !== undefined)
-                        enAttrs['w:id'] = contentElement.endnoteId;
-                    runChildren.push(XMLBuilder_1.XMLBuilder.wSelf('endnoteReference', enAttrs));
+                    if (contentElement.endnoteId === undefined)
+                        break;
+                    const enAttrs = {
+                        'w:id': contentElement.endnoteId,
+                    };
+                    if (contentElement.customMarkFollows === true)
+                        enAttrs['w:customMarkFollows'] = '1';
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('endnoteReference', enAttrs));
                     break;
                 }
+                case 'footnoteRef':
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('footnoteRef'));
+                    break;
+                case 'endnoteRef':
+                    runChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('endnoteRef'));
+                    break;
                 case 'embeddedObject':
                     if (contentElement.rawXml) {
                         runChildren.push({
@@ -1028,7 +1045,7 @@ class Run {
                     break;
             }
         }
-        return XMLBuilder_1.XMLBuilder.w('r', undefined, runChildren);
+        return XMLBuilder_js_1.XMLBuilder.w('r', undefined, runChildren);
     }
     hasText() {
         const text = this.getText();
@@ -1071,7 +1088,7 @@ class Run {
     static generateRunPropertiesXML(formatting) {
         const rPrChildren = [];
         if (formatting.characterStyle) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('rStyle', {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('rStyle', {
                 'w:val': formatting.characterStyle,
             }));
         }
@@ -1106,56 +1123,56 @@ class Run {
                     delete rFontsAttrs[key];
             }
             if (Object.keys(rFontsAttrs).length > 0) {
-                rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('rFonts', rFontsAttrs));
+                rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('rFonts', rFontsAttrs));
             }
         }
         if (formatting.bold !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('b', { 'w:val': formatting.bold ? '1' : '0' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('b', { 'w:val': formatting.bold ? '1' : '0' }));
         }
         if (formatting.complexScriptBold !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('bCs', { 'w:val': formatting.complexScriptBold ? '1' : '0' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('bCs', { 'w:val': formatting.complexScriptBold ? '1' : '0' }));
         }
         if (formatting.italic !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('i', { 'w:val': formatting.italic ? '1' : '0' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('i', { 'w:val': formatting.italic ? '1' : '0' }));
         }
         if (formatting.complexScriptItalic !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('iCs', { 'w:val': formatting.complexScriptItalic ? '1' : '0' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('iCs', { 'w:val': formatting.complexScriptItalic ? '1' : '0' }));
         }
         if (formatting.allCaps !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('caps', { 'w:val': formatting.allCaps ? '1' : '0' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('caps', { 'w:val': formatting.allCaps ? '1' : '0' }));
         }
         if (formatting.smallCaps !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('smallCaps', { 'w:val': formatting.smallCaps ? '1' : '0' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('smallCaps', { 'w:val': formatting.smallCaps ? '1' : '0' }));
         }
         if (formatting.strike !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('strike', { 'w:val': formatting.strike ? '1' : '0' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('strike', { 'w:val': formatting.strike ? '1' : '0' }));
         }
         if (formatting.dstrike !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('dstrike', { 'w:val': formatting.dstrike ? '1' : '0' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('dstrike', { 'w:val': formatting.dstrike ? '1' : '0' }));
         }
-        if (formatting.outline) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('outline', { 'w:val': '1' }));
+        if (formatting.outline !== undefined) {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('outline', { 'w:val': formatting.outline ? '1' : '0' }));
         }
-        if (formatting.shadow) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('shadow', { 'w:val': '1' }));
+        if (formatting.shadow !== undefined) {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('shadow', { 'w:val': formatting.shadow ? '1' : '0' }));
         }
-        if (formatting.emboss) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('emboss', { 'w:val': '1' }));
+        if (formatting.emboss !== undefined) {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('emboss', { 'w:val': formatting.emboss ? '1' : '0' }));
         }
-        if (formatting.imprint) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('imprint', { 'w:val': '1' }));
+        if (formatting.imprint !== undefined) {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('imprint', { 'w:val': formatting.imprint ? '1' : '0' }));
         }
-        if (formatting.noProof) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('noProof', { 'w:val': '1' }));
+        if (formatting.noProof !== undefined) {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('noProof', { 'w:val': formatting.noProof ? '1' : '0' }));
         }
         if (formatting.snapToGrid !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('snapToGrid', { 'w:val': formatting.snapToGrid ? '1' : '0' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('snapToGrid', { 'w:val': formatting.snapToGrid ? '1' : '0' }));
         }
-        if (formatting.vanish) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('vanish', { 'w:val': '1' }));
+        if (formatting.vanish !== undefined) {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('vanish', { 'w:val': formatting.vanish ? '1' : '0' }));
         }
-        if (formatting.webHidden) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('webHidden', { 'w:val': '1' }));
+        if (formatting.webHidden !== undefined) {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('webHidden', { 'w:val': formatting.webHidden ? '1' : '0' }));
         }
         if (formatting.color || formatting.themeColor) {
             const colorAttrs = {};
@@ -1175,32 +1192,32 @@ class Run {
                     .toUpperCase()
                     .padStart(2, '0');
             }
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('color', colorAttrs));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('color', colorAttrs));
         }
         if (formatting.characterSpacing !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('spacing', { 'w:val': formatting.characterSpacing }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('spacing', { 'w:val': formatting.characterSpacing }));
         }
         if (formatting.scaling !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('w', { 'w:val': formatting.scaling }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('w', { 'w:val': formatting.scaling }));
         }
         if (formatting.kerning !== undefined && formatting.kerning !== null) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('kern', { 'w:val': formatting.kerning }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('kern', { 'w:val': formatting.kerning }));
         }
         if (formatting.position !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('position', { 'w:val': formatting.position }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('position', { 'w:val': formatting.position }));
         }
         if (formatting.size !== undefined) {
-            const halfPoints = (0, units_1.pointsToHalfPoints)(formatting.size);
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('sz', { 'w:val': halfPoints }));
-            const csHalfPoints = formatting.sizeCs !== undefined ? (0, units_1.pointsToHalfPoints)(formatting.sizeCs) : halfPoints;
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('szCs', { 'w:val': csHalfPoints }));
+            const halfPoints = (0, units_js_1.pointsToHalfPoints)(formatting.size);
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('sz', { 'w:val': halfPoints }));
+            const csHalfPoints = formatting.sizeCs !== undefined ? (0, units_js_1.pointsToHalfPoints)(formatting.sizeCs) : halfPoints;
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('szCs', { 'w:val': csHalfPoints }));
         }
         else if (formatting.sizeCs !== undefined) {
-            const csHalfPoints = (0, units_1.pointsToHalfPoints)(formatting.sizeCs);
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('szCs', { 'w:val': csHalfPoints }));
+            const csHalfPoints = (0, units_js_1.pointsToHalfPoints)(formatting.sizeCs);
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('szCs', { 'w:val': csHalfPoints }));
         }
         if (formatting.highlight) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('highlight', { 'w:val': formatting.highlight }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('highlight', { 'w:val': formatting.highlight }));
         }
         if (formatting.underline) {
             const underlineValue = typeof formatting.underline === 'string' ? formatting.underline : 'single';
@@ -1219,54 +1236,62 @@ class Run {
                     .toString(16)
                     .toUpperCase()
                     .padStart(2, '0');
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('u', uAttrs));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('u', uAttrs));
         }
         else if (formatting.underline === false && formatting.characterStyle) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('u', { 'w:val': 'none' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('u', { 'w:val': 'none' }));
         }
         if (formatting.effect) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('effect', { 'w:val': formatting.effect }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('effect', { 'w:val': formatting.effect }));
         }
         if (formatting.border) {
-            const bdrAttrs = {};
-            if (formatting.border.style)
-                bdrAttrs['w:val'] = formatting.border.style;
-            if (formatting.border.size !== undefined)
-                bdrAttrs['w:sz'] = formatting.border.size;
-            if (formatting.border.color)
-                bdrAttrs['w:color'] = formatting.border.color;
-            if (formatting.border.space !== undefined)
-                bdrAttrs['w:space'] = formatting.border.space;
-            if (Object.keys(bdrAttrs).length > 0) {
-                rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('bdr', bdrAttrs));
-            }
+            const b = formatting.border;
+            const bdrAttrs = { 'w:val': b.style ?? 'nil' };
+            if (b.size !== undefined)
+                bdrAttrs['w:sz'] = b.size;
+            if (b.color)
+                bdrAttrs['w:color'] = b.color;
+            if (b.space !== undefined)
+                bdrAttrs['w:space'] = b.space;
+            const bb = b;
+            if (bb.themeColor)
+                bdrAttrs['w:themeColor'] = bb.themeColor;
+            if (bb.themeTint)
+                bdrAttrs['w:themeTint'] = bb.themeTint;
+            if (bb.themeShade)
+                bdrAttrs['w:themeShade'] = bb.themeShade;
+            if (bb.shadow !== undefined)
+                bdrAttrs['w:shadow'] = bb.shadow ? '1' : '0';
+            if (bb.frame !== undefined)
+                bdrAttrs['w:frame'] = bb.frame ? '1' : '0';
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('bdr', bdrAttrs));
         }
         if (formatting.shading) {
-            const shdAttrs = (0, CommonTypes_1.buildShadingAttributes)(formatting.shading);
+            const shdAttrs = (0, CommonTypes_js_1.buildShadingAttributes)(formatting.shading);
             if (Object.keys(shdAttrs).length > 0) {
-                rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('shd', shdAttrs));
+                rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('shd', shdAttrs));
             }
         }
         if (formatting.fitText !== undefined) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('fitText', { 'w:val': formatting.fitText }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('fitText', { 'w:val': formatting.fitText }));
         }
         if (formatting.subscript) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('vertAlign', { 'w:val': 'subscript' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('vertAlign', { 'w:val': 'subscript' }));
         }
         else if (formatting.superscript) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('vertAlign', { 'w:val': 'superscript' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('vertAlign', { 'w:val': 'superscript' }));
         }
         else if (formatting.vertAlignBaseline) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('vertAlign', { 'w:val': 'baseline' }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('vertAlign', { 'w:val': 'baseline' }));
         }
-        if (formatting.rtl) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('rtl', { 'w:val': '1' }));
+        if (formatting.rtl !== undefined) {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('rtl', { 'w:val': formatting.rtl ? '1' : '0' }));
         }
-        if (formatting.complexScript) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('cs', { 'w:val': '1' }));
+        if (formatting.complexScript !== undefined) {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cs', { 'w:val': formatting.complexScript ? '1' : '0' }));
         }
         if (formatting.emphasis) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('em', { 'w:val': formatting.emphasis }));
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('em', { 'w:val': formatting.emphasis }));
         }
         if (formatting.language) {
             const langAttrs = {};
@@ -1282,7 +1307,7 @@ class Run {
                     langAttrs['w:bidi'] = formatting.language.bidi;
             }
             if (Object.keys(langAttrs).length > 0) {
-                rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('lang', langAttrs));
+                rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('lang', langAttrs));
             }
         }
         if (formatting.eastAsianLayout) {
@@ -1290,20 +1315,21 @@ class Run {
             const attrs = {};
             if (layout.id !== undefined)
                 attrs['w:id'] = layout.id;
-            if (layout.vert)
-                attrs['w:vert'] = '1';
-            if (layout.vertCompress)
-                attrs['w:vertCompress'] = '1';
-            if (layout.combine)
-                attrs['w:combine'] = '1';
+            if (layout.vert !== undefined)
+                attrs['w:vert'] = layout.vert ? '1' : '0';
+            if (layout.vertCompress !== undefined) {
+                attrs['w:vertCompress'] = layout.vertCompress ? '1' : '0';
+            }
+            if (layout.combine !== undefined)
+                attrs['w:combine'] = layout.combine ? '1' : '0';
             if (layout.combineBrackets)
                 attrs['w:combineBrackets'] = layout.combineBrackets;
             if (Object.keys(attrs).length > 0) {
-                rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('eastAsianLayout', attrs));
+                rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('eastAsianLayout', attrs));
             }
         }
-        if (formatting.specVanish) {
-            rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('specVanish', { 'w:val': '1' }));
+        if (formatting.specVanish !== undefined) {
+            rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('specVanish', { 'w:val': formatting.specVanish ? '1' : '0' }));
         }
         if (formatting.rawW14Properties && formatting.rawW14Properties.length > 0) {
             for (const rawXml of formatting.rawW14Properties) {
@@ -1313,14 +1339,14 @@ class Run {
         if (rPrChildren.length === 0) {
             return null;
         }
-        return XMLBuilder_1.XMLBuilder.w('rPr', undefined, rPrChildren);
+        return XMLBuilder_js_1.XMLBuilder.w('rPr', undefined, rPrChildren);
     }
     static create(text, formatting) {
         return new Run(text, formatting);
     }
     clone() {
-        const clonedContent = (0, deepClone_1.deepClone)(this.content);
-        const clonedFormatting = (0, deepClone_1.deepClone)(this.formatting);
+        const clonedContent = (0, deepClone_js_1.deepClone)(this.content);
+        const clonedFormatting = (0, deepClone_js_1.deepClone)(this.formatting);
         return Run.createFromContent(clonedContent, clonedFormatting);
     }
     insertText(index, text) {
@@ -1348,12 +1374,12 @@ class Run {
     splitAt(offset) {
         const totalLength = this.getText().length;
         if (offset >= totalLength) {
-            return Run.createFromContent([], (0, deepClone_1.deepClone)(this.formatting));
+            return Run.createFromContent([], (0, deepClone_js_1.deepClone)(this.formatting));
         }
         if (offset <= 0) {
             const allContent = this.content;
             this.content = [];
-            return Run.createFromContent(allContent, (0, deepClone_1.deepClone)(this.formatting));
+            return Run.createFromContent(allContent, (0, deepClone_js_1.deepClone)(this.formatting));
         }
         const beforeContent = [];
         const afterContent = [];
@@ -1361,16 +1387,16 @@ class Run {
         let splitDone = false;
         for (const item of this.content) {
             if (splitDone) {
-                afterContent.push((0, deepClone_1.deepClone)(item));
+                afterContent.push((0, deepClone_js_1.deepClone)(item));
                 continue;
             }
             const itemLength = this.getContentItemLength(item);
             if (charPos + itemLength <= offset) {
-                beforeContent.push((0, deepClone_1.deepClone)(item));
+                beforeContent.push((0, deepClone_js_1.deepClone)(item));
                 charPos += itemLength;
             }
             else if (charPos >= offset) {
-                afterContent.push((0, deepClone_1.deepClone)(item));
+                afterContent.push((0, deepClone_js_1.deepClone)(item));
                 splitDone = true;
             }
             else {
@@ -1380,13 +1406,13 @@ class Run {
                     afterContent.push({ type: 'text', value: item.value.slice(splitIndex) });
                 }
                 else {
-                    afterContent.push((0, deepClone_1.deepClone)(item));
+                    afterContent.push((0, deepClone_js_1.deepClone)(item));
                 }
                 splitDone = true;
             }
         }
         this.content = beforeContent;
-        return Run.createFromContent(afterContent, (0, deepClone_1.deepClone)(this.formatting));
+        return Run.createFromContent(afterContent, (0, deepClone_js_1.deepClone)(this.formatting));
     }
     getContentItemLength(item) {
         switch (item.type) {