docxmlater 10.4.1 → 11.0.4

package/dist/elements/TableRow.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableRow = void 0;
-const deepClone_1 = require("../utils/deepClone");
-const TableCell_1 = require("./TableCell");
-const XMLBuilder_1 = require("../xml/XMLBuilder");
-const logger_1 = require("../utils/logger");
+const deepClone_js_1 = require("../utils/deepClone.js");
+const TableCell_js_1 = require("./TableCell.js");
+const XMLBuilder_js_1 = require("../xml/XMLBuilder.js");
+const CommonTypes_js_1 = require("./CommonTypes.js");
+const logger_js_1 = require("../utils/logger.js");
 class TableRow {
     cells = [];
     formatting;
@@ -15,7 +16,7 @@ class TableRow {
         this.formatting = formatting;
         if (cellCount !== undefined && cellCount > 0) {
             for (let i = 0; i < cellCount; i++) {
-                const cell = new TableCell_1.TableCell();
+                const cell = new TableCell_js_1.TableCell();
                 cell._setParentRow(this);
                 this.cells.push(cell);
             }
@@ -33,13 +34,27 @@ class TableRow {
     clearTrPrChange() {
         this.trPrChange = undefined;
     }
+    getRowInsertion() {
+        return this.formatting.rowInsertion;
+    }
+    setRowInsertion(change) {
+        this.formatting.rowInsertion = change;
+        return this;
+    }
+    getRowDeletion() {
+        return this.formatting.rowDeletion;
+    }
+    setRowDeletion(change) {
+        this.formatting.rowDeletion = change;
+        return this;
+    }
     addCell(cell) {
         this.cells.push(cell);
         cell._setParentRow(this);
         return this;
     }
     createCell(text) {
-        const cell = new TableCell_1.TableCell();
+        const cell = new TableCell_js_1.TableCell();
         if (text) {
             cell.createParagraph(text);
         }
@@ -87,7 +102,7 @@ class TableRow {
             (actualSpan < expectedColumns
                 ? 'Missing cells or incorrect columnSpan values.'
                 : 'Extra cells or excessive columnSpan values.');
-        logger_1.defaultLogger.warn(`[TableRow] ${message}`);
+        logger_js_1.defaultLogger.warn(`[TableRow] ${message}`);
         return {
             isValid: false,
             actualSpan,
@@ -271,22 +286,24 @@ class TableRow {
     buildTablePropertyExceptionsXML(exceptions) {
         const children = [];
         if (exceptions.width !== undefined) {
-            children.push(XMLBuilder_1.XMLBuilder.wSelf('tblW', {
+            children.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblW', {
                 'w:w': exceptions.width,
                 'w:type': 'dxa',
             }));
         }
         if (exceptions.justification) {
-            children.push(XMLBuilder_1.XMLBuilder.wSelf('jc', { 'w:val': exceptions.justification }));
+            const jcMap = { start: 'left', end: 'right' };
+            const jcVal = jcMap[exceptions.justification] || exceptions.justification;
+            children.push(XMLBuilder_js_1.XMLBuilder.wSelf('jc', { 'w:val': jcVal }));
         }
         if (exceptions.cellSpacing !== undefined) {
-            children.push(XMLBuilder_1.XMLBuilder.wSelf('tblCellSpacing', {
+            children.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblCellSpacing', {
                 'w:w': exceptions.cellSpacing,
                 'w:type': 'dxa',
             }));
         }
         if (exceptions.indentation !== undefined) {
-            children.push(XMLBuilder_1.XMLBuilder.wSelf('tblInd', {
+            children.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblInd', {
                 'w:w': exceptions.indentation,
                 'w:type': 'dxa',
             }));
@@ -294,30 +311,12 @@ class TableRow {
         if (exceptions.borders) {
             const borderChildren = this.buildBordersXML(exceptions.borders);
             if (borderChildren.length > 0) {
-                children.push(XMLBuilder_1.XMLBuilder.w('tblBorders', undefined, borderChildren));
+                children.push(XMLBuilder_js_1.XMLBuilder.w('tblBorders', undefined, borderChildren));
             }
         }
         if (exceptions.shading) {
-            const shdAttrs = {};
-            if (exceptions.shading.pattern)
-                shdAttrs['w:val'] = exceptions.shading.pattern;
-            if (exceptions.shading.color)
-                shdAttrs['w:color'] = exceptions.shading.color;
-            if (exceptions.shading.fill)
-                shdAttrs['w:fill'] = exceptions.shading.fill;
-            if (exceptions.shading.themeColor)
-                shdAttrs['w:themeColor'] = exceptions.shading.themeColor;
-            if (exceptions.shading.themeFill)
-                shdAttrs['w:themeFill'] = exceptions.shading.themeFill;
-            if (exceptions.shading.themeFillShade)
-                shdAttrs['w:themeFillShade'] = exceptions.shading.themeFillShade;
-            if (exceptions.shading.themeFillTint)
-                shdAttrs['w:themeFillTint'] = exceptions.shading.themeFillTint;
-            if (exceptions.shading.themeShade)
-                shdAttrs['w:themeShade'] = exceptions.shading.themeShade;
-            if (exceptions.shading.themeTint)
-                shdAttrs['w:themeTint'] = exceptions.shading.themeTint;
-            children.push(XMLBuilder_1.XMLBuilder.w('shd', shdAttrs));
+            const shdAttrs = (0, CommonTypes_js_1.buildShadingAttributes)(exceptions.shading);
+            children.push(XMLBuilder_js_1.XMLBuilder.wSelf('shd', shdAttrs));
         }
         return children;
     }
@@ -335,17 +334,25 @@ class TableRow {
             const border = borders[name];
             if (border) {
                 const attrs = {};
-                if (border.style)
-                    attrs['w:val'] = border.style;
+                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) {
-                    children.push(XMLBuilder_1.XMLBuilder.wSelf(name, 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';
+                children.push(XMLBuilder_js_1.XMLBuilder.wSelf(name, attrs));
             }
         }
         return children;
@@ -353,31 +360,36 @@ class TableRow {
     toXML() {
         const trPrChildren = [];
         if (this.formatting.cnfStyle) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('cnfStyle', { 'w:val': this.formatting.cnfStyle }));
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cnfStyle', { 'w:val': this.formatting.cnfStyle }));
         }
         if (this.formatting.divId !== undefined) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('divId', { 'w:val': this.formatting.divId }));
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('divId', { 'w:val': this.formatting.divId }));
         }
         if (this.formatting.gridBefore !== undefined) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('gridBefore', { 'w:val': this.formatting.gridBefore }));
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('gridBefore', { 'w:val': this.formatting.gridBefore }));
         }
         if (this.formatting.gridAfter !== undefined) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('gridAfter', { 'w:val': this.formatting.gridAfter }));
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('gridAfter', { 'w:val': this.formatting.gridAfter }));
         }
         if (this.formatting.wBefore !== undefined) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('wBefore', {
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('wBefore', {
                 'w:w': this.formatting.wBefore,
                 'w:type': this.formatting.wBeforeType || 'dxa',
             }));
         }
         if (this.formatting.wAfter !== undefined) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('wAfter', {
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('wAfter', {
                 'w:w': this.formatting.wAfter,
                 'w:type': this.formatting.wAfterType || 'dxa',
             }));
         }
-        if (this.formatting.cantSplit) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('cantSplit'));
+        if (this.formatting.cantSplit !== undefined) {
+            if (this.formatting.cantSplit) {
+                trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cantSplit'));
+            }
+            else {
+                trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cantSplit', { 'w:val': 'off' }));
+            }
         }
         if (this.formatting.height !== undefined) {
             const attrs = {
@@ -386,13 +398,18 @@ class TableRow {
             if (this.formatting.heightRule) {
                 attrs['w:hRule'] = this.formatting.heightRule;
             }
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('trHeight', attrs));
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('trHeight', attrs));
         }
-        if (this.formatting.isHeader) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tblHeader'));
+        if (this.formatting.isHeader !== undefined) {
+            if (this.formatting.isHeader) {
+                trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblHeader'));
+            }
+            else {
+                trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblHeader', { 'w:val': 'off' }));
+            }
         }
         if (this.formatting.cellSpacing !== undefined) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tblCellSpacing', {
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblCellSpacing', {
                 'w:w': this.formatting.cellSpacing,
                 'w:type': this.formatting.cellSpacingType || 'dxa',
             }));
@@ -400,10 +417,31 @@ class TableRow {
         if (this.formatting.justification) {
             const jcMap = { start: 'left', end: 'right' };
             const jcVal = jcMap[this.formatting.justification] || this.formatting.justification;
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('jc', { 'w:val': jcVal }));
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('jc', { 'w:val': jcVal }));
         }
-        if (this.formatting.hidden) {
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('hidden'));
+        if (this.formatting.hidden !== undefined) {
+            if (this.formatting.hidden) {
+                trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('hidden'));
+            }
+            else {
+                trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('hidden', { 'w:val': 'false' }));
+            }
+        }
+        if (this.formatting.rowInsertion) {
+            const ins = this.formatting.rowInsertion;
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('ins', {
+                'w:id': ins.id,
+                'w:author': ins.author,
+                'w:date': ins.date,
+            }));
+        }
+        if (this.formatting.rowDeletion) {
+            const del = this.formatting.rowDeletion;
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('del', {
+                'w:id': del.id,
+                'w:author': del.author,
+                'w:date': del.date,
+            }));
         }
         if (this.trPrChange) {
             const changeAttrs = {
@@ -415,72 +453,87 @@ class TableRow {
             const prev = this.trPrChange.previousProperties;
             if (prev) {
                 if (prev.cnfStyle) {
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('cnfStyle', { 'w:val': prev.cnfStyle }));
+                    prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cnfStyle', { 'w:val': prev.cnfStyle }));
                 }
                 if (prev.divId !== undefined) {
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('divId', { 'w:val': prev.divId }));
+                    prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('divId', { 'w:val': prev.divId }));
                 }
                 if (prev.gridBefore !== undefined) {
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('gridBefore', { 'w:val': prev.gridBefore }));
+                    prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('gridBefore', { 'w:val': prev.gridBefore }));
                 }
                 if (prev.gridAfter !== undefined) {
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('gridAfter', { 'w:val': prev.gridAfter }));
+                    prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('gridAfter', { 'w:val': prev.gridAfter }));
                 }
                 if (prev.wBefore !== undefined) {
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('wBefore', {
+                    prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('wBefore', {
                         'w:w': prev.wBefore,
                         'w:type': prev.wBeforeType || 'dxa',
                     }));
                 }
                 if (prev.wAfter !== undefined) {
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('wAfter', {
+                    prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('wAfter', {
                         'w:w': prev.wAfter,
                         'w:type': prev.wAfterType || 'dxa',
                     }));
                 }
-                if (prev.cantSplit) {
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('cantSplit'));
+                if (prev.cantSplit !== undefined) {
+                    if (prev.cantSplit) {
+                        prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cantSplit'));
+                    }
+                    else {
+                        prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cantSplit', { 'w:val': 'off' }));
+                    }
                 }
                 if (prev.height !== undefined) {
                     const heightAttrs = { 'w:val': prev.height };
                     if (prev.heightRule)
                         heightAttrs['w:hRule'] = prev.heightRule;
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('trHeight', heightAttrs));
+                    prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('trHeight', heightAttrs));
                 }
-                if (prev.isHeader) {
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tblHeader'));
+                if (prev.isHeader !== undefined) {
+                    if (prev.isHeader) {
+                        prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblHeader'));
+                    }
+                    else {
+                        prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblHeader', { 'w:val': 'off' }));
+                    }
                 }
                 if (prev.cellSpacing !== undefined) {
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tblCellSpacing', {
+                    prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tblCellSpacing', {
                         'w:w': prev.cellSpacing,
                         'w:type': prev.cellSpacingType || 'dxa',
                     }));
                 }
                 if (prev.justification) {
                     const jcPrevMap = { start: 'left', end: 'right' };
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('jc', { 'w:val': jcPrevMap[prev.justification] || prev.justification }));
+                    prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('jc', { 'w:val': jcPrevMap[prev.justification] || prev.justification }));
                 }
-                if (prev.hidden) {
-                    prevTrPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('hidden'));
+                if (prev.hidden !== undefined) {
+                    if (prev.hidden) {
+                        prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('hidden'));
+                    }
+                    else {
+                        prevTrPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('hidden', { 'w:val': 'false' }));
+                    }
                 }
             }
-            const prevTrPr = XMLBuilder_1.XMLBuilder.w('trPr', undefined, prevTrPrChildren);
-            trPrChildren.push(XMLBuilder_1.XMLBuilder.w('trPrChange', changeAttrs, [prevTrPr]));
+            const prevTrPr = XMLBuilder_js_1.XMLBuilder.w('trPr', undefined, prevTrPrChildren);
+            trPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('trPrChange', changeAttrs, [prevTrPr]));
         }
         const rowChildren = [];
         if (this.formatting.tablePropertyExceptions) {
             const tblPrExChildren = this.buildTablePropertyExceptionsXML(this.formatting.tablePropertyExceptions);
             if (tblPrExChildren.length > 0) {
-                rowChildren.push(XMLBuilder_1.XMLBuilder.w('tblPrEx', undefined, tblPrExChildren));
+                rowChildren.push(XMLBuilder_js_1.XMLBuilder.w('tblPrEx', undefined, tblPrExChildren));
             }
         }
         if (trPrChildren.length > 0) {
-            rowChildren.push(XMLBuilder_1.XMLBuilder.w('trPr', undefined, trPrChildren));
+            rowChildren.push(XMLBuilder_js_1.XMLBuilder.w('trPr', undefined, trPrChildren));
         }
         for (const cell of this.cells) {
             rowChildren.push(cell.toXML());
         }
-        return XMLBuilder_1.XMLBuilder.w('tr', undefined, rowChildren);
+        return XMLBuilder_js_1.XMLBuilder.w('tr', undefined, rowChildren);
     }
     toArray() {
         return this.cells.map((cell) => cell.getText());
@@ -489,12 +542,12 @@ class TableRow {
         return this.cells.map((cell) => cell.getText()).join(separator);
     }
     clone() {
-        const clonedRow = new TableRow(0, (0, deepClone_1.deepClone)(this.formatting));
+        const clonedRow = new TableRow(0, (0, deepClone_js_1.deepClone)(this.formatting));
         for (const cell of this.cells) {
             clonedRow.addCell(cell.clone());
         }
         if (this.trPrChange) {
-            clonedRow.setTrPrChange((0, deepClone_1.deepClone)(this.trPrChange));
+            clonedRow.setTrPrChange((0, deepClone_js_1.deepClone)(this.trPrChange));
         }
         return clonedRow;
     }