@cj-tech-master/excelts 5.1.9 → 5.1.10-canary.20260306122956.f4bcbe6

package/dist/browser/modules/excel/cell.js

@@ -3,6 +3,11 @@ import { Enums } from "./enums.js";
 import { Note } from "./note.js";
 import { escapeHtml } from "./utils/under-dash.js";
 import { slideFormula } from "./utils/shared-formula.js";
+// Returns true if the value is a non-empty object (has at least one own key),
+// or any truthy non-object value. Returns false for undefined, null, false, 0,
+// empty string, and empty objects `{}`. This is used to prevent an empty `{}`
+// style property on a row from shadowing a real style property on a column.
+const hasOwnKeys = (v) => !!v && (typeof v !== "object" || Object.keys(v).length > 0);
 // Cell requirements
 //  Operate inside a worksheet
 //  Store and retrieve a value with a range of types: text, number, date, hyperlink, reference, formula, etc.
@@ -78,23 +83,28 @@ class Cell {
         if (numFmt) {
             style.numFmt = numFmt;
         }
-        const font = (rowStyle && rowStyle.font) || (colStyle && colStyle.font);
+        const font = (rowStyle && hasOwnKeys(rowStyle.font) && rowStyle.font) ||
+            (colStyle && hasOwnKeys(colStyle.font) && colStyle.font);
         if (font) {
             style.font = font;
         }
-        const alignment = (rowStyle && rowStyle.alignment) || (colStyle && colStyle.alignment);
+        const alignment = (rowStyle && hasOwnKeys(rowStyle.alignment) && rowStyle.alignment) ||
+            (colStyle && hasOwnKeys(colStyle.alignment) && colStyle.alignment);
         if (alignment) {
             style.alignment = alignment;
         }
-        const border = (rowStyle && rowStyle.border) || (colStyle && colStyle.border);
+        const border = (rowStyle && hasOwnKeys(rowStyle.border) && rowStyle.border) ||
+            (colStyle && hasOwnKeys(colStyle.border) && colStyle.border);
         if (border) {
             style.border = border;
         }
-        const fill = (rowStyle && rowStyle.fill) || (colStyle && colStyle.fill);
+        const fill = (rowStyle && hasOwnKeys(rowStyle.fill) && rowStyle.fill) ||
+            (colStyle && hasOwnKeys(colStyle.fill) && colStyle.fill);
         if (fill) {
             style.fill = fill;
         }
-        const protection = (rowStyle && rowStyle.protection) || (colStyle && colStyle.protection);
+        const protection = (rowStyle && hasOwnKeys(rowStyle.protection) && rowStyle.protection) ||
+            (colStyle && hasOwnKeys(colStyle.protection) && colStyle.protection);
         if (protection) {
             style.protection = protection;
         }

package/dist/browser/modules/excel/row.js

@@ -1,6 +1,7 @@
 import { Enums } from "./enums.js";
 import { colCache } from "./utils/col-cache.js";
 import { Cell } from "./cell.js";
+import { copyStyle } from "./utils/copy-style.js";
 class Row {
     constructor(worksheet, number) {
         this._worksheet = worksheet;
@@ -95,7 +96,7 @@ class Row {
                 if (cSrc) {
                     cDst = this.getCell(i);
                     cDst.value = cSrc.value;
-                    cDst.style = cSrc.style;
+                    cDst.style = copyStyle(cSrc.style) ?? {};
                     cDst.comment = cSrc.comment;
                 }
                 else if (cDst) {
@@ -112,7 +113,7 @@ class Row {
                 if (cSrc) {
                     cDst = this.getCell(i + nExpand);
                     cDst.value = cSrc.value;
-                    cDst.style = cSrc.style;
+                    cDst.style = copyStyle(cSrc.style) ?? {};
                     cDst.comment = cSrc.comment;
                 }
                 else {

package/dist/browser/modules/excel/table.js

@@ -207,7 +207,7 @@ class Table {
                 else {
                     cell.value = value;
                 }
-                assignStyle(cell, table.columns[j].style);
+                assignStyle(cell, table.columns[j]?.style);
             });
         });
         if (table.totalsRow) {

package/dist/browser/modules/excel/types.d.ts

@@ -468,6 +468,11 @@ export interface TableColumnProperties {
     totalsRowFunction?: "none" | "average" | "countNums" | "count" | "max" | "min" | "stdDev" | "var" | "sum" | "custom";
     totalsRowFormula?: string;
     totalsRowResult?: CellFormulaValue["result"];
+    /**
+     * Formula applied to every data row in this column.
+     * Corresponds to the OOXML `<calculatedColumnFormula>` element.
+     */
+    calculatedColumnFormula?: string;
     style?: Partial<Style>;
 }
 export interface TableProperties {

package/dist/browser/modules/excel/worksheet.js

@@ -508,10 +508,10 @@ class Worksheet {
         // now copy styles...
         for (let i = 0; i < count; i++) {
             const rDst = this._rows[rowNum + i];
-            rDst.style = rSrc.style;
+            rDst.style = copyStyle(rSrc.style) ?? {};
             rDst.height = rSrc.height;
             rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
-                rDst.getCell(colNumber).style = cell.style;
+                rDst.getCell(colNumber).style = copyStyle(cell.style) ?? {};
             });
         }
         // Duplicate single-row merges from source row into each new row
@@ -599,10 +599,10 @@ class Worksheet {
                 if (rSrc) {
                     const rDst = this.getRow(i + nExpand);
                     rDst.values = rSrc.values;
-                    rDst.style = rSrc.style;
+                    rDst.style = copyStyle(rSrc.style) ?? {};
                     rDst.height = rSrc.height;
                     rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
-                        rDst.getCell(colNumber).style = cell.style;
+                        rDst.getCell(colNumber).style = copyStyle(cell.style) ?? {};
                     });
                     this._rows[i - 1] = undefined;
                 }
@@ -618,10 +618,10 @@ class Worksheet {
                 if (rSrc) {
                     const rDst = this.getRow(i + nExpand);
                     rDst.values = rSrc.values;
-                    rDst.style = rSrc.style;
+                    rDst.style = copyStyle(rSrc.style) ?? {};
                     rDst.height = rSrc.height;
                     rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
-                        rDst.getCell(colNumber).style = cell.style;
+                        rDst.getCell(colNumber).style = copyStyle(cell.style) ?? {};
                     });
                 }
                 else {

package/dist/browser/modules/excel/xlsx/xform/table/table-column-xform.d.ts

@@ -4,17 +4,22 @@ interface TableColumnModel {
     name: string;
     totalsRowLabel?: string;
     totalsRowFunction?: string;
+    totalsRowFormula?: string;
+    calculatedColumnFormula?: string;
     dxfId?: string;
 }
 declare class TableColumnXform extends BaseXform<TableColumnModel> {
+    private _childTag;
+    private _childText;
     constructor();
     get tag(): string;
     prepare(model: TableColumnModel, options: {
         index: number;
     }): void;
+    private _renderAttributes;
     render(xmlStream: any, model: TableColumnModel): void;
     parseOpen(node: any): boolean;
-    parseText(): void;
-    parseClose(): boolean;
+    parseText(text: string): void;
+    parseClose(name: string): boolean;
 }
 export { TableColumnXform };

package/dist/browser/modules/excel/xlsx/xform/table/table-column-xform.js

@@ -2,6 +2,7 @@ import { BaseXform } from "../base-xform.js";
 class TableColumnXform extends BaseXform {
     constructor() {
         super();
+        this._childText = "";
         this.model = { name: "" };
     }
     get tag() {
@@ -10,15 +11,30 @@ class TableColumnXform extends BaseXform {
     prepare(model, options) {
         model.id = options.index + 1;
     }
-    render(xmlStream, model) {
-        xmlStream.leafNode(this.tag, {
+    _renderAttributes(model) {
+        return {
             id: model.id.toString(),
             name: model.name,
             totalsRowLabel: model.totalsRowLabel,
             // Excel doesn't output totalsRowFunction when value is 'none'
             totalsRowFunction: model.totalsRowFunction === "none" ? undefined : model.totalsRowFunction,
             dxfId: model.dxfId
-        });
+        };
+    }
+    render(xmlStream, model) {
+        if (model.calculatedColumnFormula || model.totalsRowFormula) {
+            xmlStream.openNode(this.tag, this._renderAttributes(model));
+            if (model.calculatedColumnFormula) {
+                xmlStream.leafNode("calculatedColumnFormula", undefined, model.calculatedColumnFormula);
+            }
+            if (model.totalsRowFormula) {
+                xmlStream.leafNode("totalsRowFormula", undefined, model.totalsRowFormula);
+            }
+            xmlStream.closeNode();
+        }
+        else {
+            xmlStream.leafNode(this.tag, this._renderAttributes(model));
+        }
     }
     parseOpen(node) {
         if (node.name === this.tag) {
@@ -31,11 +47,28 @@ class TableColumnXform extends BaseXform {
             };
             return true;
         }
-        return false;
+        // Recognise child elements whose text content we want to capture
+        if (node.name === "calculatedColumnFormula" || node.name === "totalsRowFormula") {
+            this._childTag = node.name;
+            this._childText = "";
+        }
+        return true;
+    }
+    parseText(text) {
+        if (this._childTag) {
+            this._childText += text;
+        }
     }
-    parseText() { }
-    parseClose() {
-        return false;
+    parseClose(name) {
+        if (name === this.tag) {
+            return false;
+        }
+        // Closing a recognised child element — store captured text
+        if (this._childTag && name === this._childTag) {
+            this.model[this._childTag] = this._childText;
+            this._childTag = undefined;
+        }
+        return true;
     }
 }
 export { TableColumnXform };

package/dist/cjs/modules/excel/cell.js

@@ -6,6 +6,11 @@ const enums_1 = require("./enums.js");
 const note_1 = require("./note.js");
 const under_dash_1 = require("./utils/under-dash.js");
 const shared_formula_1 = require("./utils/shared-formula.js");
+// Returns true if the value is a non-empty object (has at least one own key),
+// or any truthy non-object value. Returns false for undefined, null, false, 0,
+// empty string, and empty objects `{}`. This is used to prevent an empty `{}`
+// style property on a row from shadowing a real style property on a column.
+const hasOwnKeys = (v) => !!v && (typeof v !== "object" || Object.keys(v).length > 0);
 // Cell requirements
 //  Operate inside a worksheet
 //  Store and retrieve a value with a range of types: text, number, date, hyperlink, reference, formula, etc.
@@ -81,23 +86,28 @@ class Cell {
         if (numFmt) {
             style.numFmt = numFmt;
         }
-        const font = (rowStyle && rowStyle.font) || (colStyle && colStyle.font);
+        const font = (rowStyle && hasOwnKeys(rowStyle.font) && rowStyle.font) ||
+            (colStyle && hasOwnKeys(colStyle.font) && colStyle.font);
         if (font) {
             style.font = font;
         }
-        const alignment = (rowStyle && rowStyle.alignment) || (colStyle && colStyle.alignment);
+        const alignment = (rowStyle && hasOwnKeys(rowStyle.alignment) && rowStyle.alignment) ||
+            (colStyle && hasOwnKeys(colStyle.alignment) && colStyle.alignment);
         if (alignment) {
             style.alignment = alignment;
         }
-        const border = (rowStyle && rowStyle.border) || (colStyle && colStyle.border);
+        const border = (rowStyle && hasOwnKeys(rowStyle.border) && rowStyle.border) ||
+            (colStyle && hasOwnKeys(colStyle.border) && colStyle.border);
         if (border) {
             style.border = border;
         }
-        const fill = (rowStyle && rowStyle.fill) || (colStyle && colStyle.fill);
+        const fill = (rowStyle && hasOwnKeys(rowStyle.fill) && rowStyle.fill) ||
+            (colStyle && hasOwnKeys(colStyle.fill) && colStyle.fill);
         if (fill) {
             style.fill = fill;
         }
-        const protection = (rowStyle && rowStyle.protection) || (colStyle && colStyle.protection);
+        const protection = (rowStyle && hasOwnKeys(rowStyle.protection) && rowStyle.protection) ||
+            (colStyle && hasOwnKeys(colStyle.protection) && colStyle.protection);
         if (protection) {
             style.protection = protection;
         }

package/dist/cjs/modules/excel/row.js

@@ -4,6 +4,7 @@ exports.Row = void 0;
 const enums_1 = require("./enums.js");
 const col_cache_1 = require("./utils/col-cache.js");
 const cell_1 = require("./cell.js");
+const copy_style_1 = require("./utils/copy-style.js");
 class Row {
     constructor(worksheet, number) {
         this._worksheet = worksheet;
@@ -98,7 +99,7 @@ class Row {
                 if (cSrc) {
                     cDst = this.getCell(i);
                     cDst.value = cSrc.value;
-                    cDst.style = cSrc.style;
+                    cDst.style = (0, copy_style_1.copyStyle)(cSrc.style) ?? {};
                     cDst.comment = cSrc.comment;
                 }
                 else if (cDst) {
@@ -115,7 +116,7 @@ class Row {
                 if (cSrc) {
                     cDst = this.getCell(i + nExpand);
                     cDst.value = cSrc.value;
-                    cDst.style = cSrc.style;
+                    cDst.style = (0, copy_style_1.copyStyle)(cSrc.style) ?? {};
                     cDst.comment = cSrc.comment;
                 }
                 else {

package/dist/cjs/modules/excel/table.js

@@ -210,7 +210,7 @@ class Table {
                 else {
                     cell.value = value;
                 }
-                assignStyle(cell, table.columns[j].style);
+                assignStyle(cell, table.columns[j]?.style);
             });
         });
         if (table.totalsRow) {

package/dist/cjs/modules/excel/worksheet.js

@@ -511,10 +511,10 @@ class Worksheet {
         // now copy styles...
         for (let i = 0; i < count; i++) {
             const rDst = this._rows[rowNum + i];
-            rDst.style = rSrc.style;
+            rDst.style = (0, copy_style_1.copyStyle)(rSrc.style) ?? {};
             rDst.height = rSrc.height;
             rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
-                rDst.getCell(colNumber).style = cell.style;
+                rDst.getCell(colNumber).style = (0, copy_style_1.copyStyle)(cell.style) ?? {};
             });
         }
         // Duplicate single-row merges from source row into each new row
@@ -602,10 +602,10 @@ class Worksheet {
                 if (rSrc) {
                     const rDst = this.getRow(i + nExpand);
                     rDst.values = rSrc.values;
-                    rDst.style = rSrc.style;
+                    rDst.style = (0, copy_style_1.copyStyle)(rSrc.style) ?? {};
                     rDst.height = rSrc.height;
                     rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
-                        rDst.getCell(colNumber).style = cell.style;
+                        rDst.getCell(colNumber).style = (0, copy_style_1.copyStyle)(cell.style) ?? {};
                     });
                     this._rows[i - 1] = undefined;
                 }
@@ -621,10 +621,10 @@ class Worksheet {
                 if (rSrc) {
                     const rDst = this.getRow(i + nExpand);
                     rDst.values = rSrc.values;
-                    rDst.style = rSrc.style;
+                    rDst.style = (0, copy_style_1.copyStyle)(rSrc.style) ?? {};
                     rDst.height = rSrc.height;
                     rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
-                        rDst.getCell(colNumber).style = cell.style;
+                        rDst.getCell(colNumber).style = (0, copy_style_1.copyStyle)(cell.style) ?? {};
                     });
                 }
                 else {

package/dist/cjs/modules/excel/xlsx/xform/table/table-column-xform.js

@@ -5,6 +5,7 @@ const base_xform_1 = require("../base-xform.js");
 class TableColumnXform extends base_xform_1.BaseXform {
     constructor() {
         super();
+        this._childText = "";
         this.model = { name: "" };
     }
     get tag() {
@@ -13,15 +14,30 @@ class TableColumnXform extends base_xform_1.BaseXform {
     prepare(model, options) {
         model.id = options.index + 1;
     }
-    render(xmlStream, model) {
-        xmlStream.leafNode(this.tag, {
+    _renderAttributes(model) {
+        return {
             id: model.id.toString(),
             name: model.name,
             totalsRowLabel: model.totalsRowLabel,
             // Excel doesn't output totalsRowFunction when value is 'none'
             totalsRowFunction: model.totalsRowFunction === "none" ? undefined : model.totalsRowFunction,
             dxfId: model.dxfId
-        });
+        };
+    }
+    render(xmlStream, model) {
+        if (model.calculatedColumnFormula || model.totalsRowFormula) {
+            xmlStream.openNode(this.tag, this._renderAttributes(model));
+            if (model.calculatedColumnFormula) {
+                xmlStream.leafNode("calculatedColumnFormula", undefined, model.calculatedColumnFormula);
+            }
+            if (model.totalsRowFormula) {
+                xmlStream.leafNode("totalsRowFormula", undefined, model.totalsRowFormula);
+            }
+            xmlStream.closeNode();
+        }
+        else {
+            xmlStream.leafNode(this.tag, this._renderAttributes(model));
+        }
     }
     parseOpen(node) {
         if (node.name === this.tag) {
@@ -34,11 +50,28 @@ class TableColumnXform extends base_xform_1.BaseXform {
             };
             return true;
         }
-        return false;
+        // Recognise child elements whose text content we want to capture
+        if (node.name === "calculatedColumnFormula" || node.name === "totalsRowFormula") {
+            this._childTag = node.name;
+            this._childText = "";
+        }
+        return true;
+    }
+    parseText(text) {
+        if (this._childTag) {
+            this._childText += text;
+        }
     }
-    parseText() { }
-    parseClose() {
-        return false;
+    parseClose(name) {
+        if (name === this.tag) {
+            return false;
+        }
+        // Closing a recognised child element — store captured text
+        if (this._childTag && name === this._childTag) {
+            this.model[this._childTag] = this._childText;
+            this._childTag = undefined;
+        }
+        return true;
     }
 }
 exports.TableColumnXform = TableColumnXform;

package/dist/esm/modules/excel/cell.js

@@ -3,6 +3,11 @@ import { Enums } from "./enums.js";
 import { Note } from "./note.js";
 import { escapeHtml } from "./utils/under-dash.js";
 import { slideFormula } from "./utils/shared-formula.js";
+// Returns true if the value is a non-empty object (has at least one own key),
+// or any truthy non-object value. Returns false for undefined, null, false, 0,
+// empty string, and empty objects `{}`. This is used to prevent an empty `{}`
+// style property on a row from shadowing a real style property on a column.
+const hasOwnKeys = (v) => !!v && (typeof v !== "object" || Object.keys(v).length > 0);
 // Cell requirements
 //  Operate inside a worksheet
 //  Store and retrieve a value with a range of types: text, number, date, hyperlink, reference, formula, etc.
@@ -78,23 +83,28 @@ class Cell {
         if (numFmt) {
             style.numFmt = numFmt;
         }
-        const font = (rowStyle && rowStyle.font) || (colStyle && colStyle.font);
+        const font = (rowStyle && hasOwnKeys(rowStyle.font) && rowStyle.font) ||
+            (colStyle && hasOwnKeys(colStyle.font) && colStyle.font);
         if (font) {
             style.font = font;
         }
-        const alignment = (rowStyle && rowStyle.alignment) || (colStyle && colStyle.alignment);
+        const alignment = (rowStyle && hasOwnKeys(rowStyle.alignment) && rowStyle.alignment) ||
+            (colStyle && hasOwnKeys(colStyle.alignment) && colStyle.alignment);
         if (alignment) {
             style.alignment = alignment;
         }
-        const border = (rowStyle && rowStyle.border) || (colStyle && colStyle.border);
+        const border = (rowStyle && hasOwnKeys(rowStyle.border) && rowStyle.border) ||
+            (colStyle && hasOwnKeys(colStyle.border) && colStyle.border);
         if (border) {
             style.border = border;
         }
-        const fill = (rowStyle && rowStyle.fill) || (colStyle && colStyle.fill);
+        const fill = (rowStyle && hasOwnKeys(rowStyle.fill) && rowStyle.fill) ||
+            (colStyle && hasOwnKeys(colStyle.fill) && colStyle.fill);
         if (fill) {
             style.fill = fill;
         }
-        const protection = (rowStyle && rowStyle.protection) || (colStyle && colStyle.protection);
+        const protection = (rowStyle && hasOwnKeys(rowStyle.protection) && rowStyle.protection) ||
+            (colStyle && hasOwnKeys(colStyle.protection) && colStyle.protection);
         if (protection) {
             style.protection = protection;
         }

package/dist/esm/modules/excel/row.js

@@ -1,6 +1,7 @@
 import { Enums } from "./enums.js";
 import { colCache } from "./utils/col-cache.js";
 import { Cell } from "./cell.js";
+import { copyStyle } from "./utils/copy-style.js";
 class Row {
     constructor(worksheet, number) {
         this._worksheet = worksheet;
@@ -95,7 +96,7 @@ class Row {
                 if (cSrc) {
                     cDst = this.getCell(i);
                     cDst.value = cSrc.value;
-                    cDst.style = cSrc.style;
+                    cDst.style = copyStyle(cSrc.style) ?? {};
                     cDst.comment = cSrc.comment;
                 }
                 else if (cDst) {
@@ -112,7 +113,7 @@ class Row {
                 if (cSrc) {
                     cDst = this.getCell(i + nExpand);
                     cDst.value = cSrc.value;
-                    cDst.style = cSrc.style;
+                    cDst.style = copyStyle(cSrc.style) ?? {};
                     cDst.comment = cSrc.comment;
                 }
                 else {

package/dist/esm/modules/excel/table.js

@@ -207,7 +207,7 @@ class Table {
                 else {
                     cell.value = value;
                 }
-                assignStyle(cell, table.columns[j].style);
+                assignStyle(cell, table.columns[j]?.style);
             });
         });
         if (table.totalsRow) {

package/dist/esm/modules/excel/worksheet.js

@@ -508,10 +508,10 @@ class Worksheet {
         // now copy styles...
         for (let i = 0; i < count; i++) {
             const rDst = this._rows[rowNum + i];
-            rDst.style = rSrc.style;
+            rDst.style = copyStyle(rSrc.style) ?? {};
             rDst.height = rSrc.height;
             rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
-                rDst.getCell(colNumber).style = cell.style;
+                rDst.getCell(colNumber).style = copyStyle(cell.style) ?? {};
             });
         }
         // Duplicate single-row merges from source row into each new row
@@ -599,10 +599,10 @@ class Worksheet {
                 if (rSrc) {
                     const rDst = this.getRow(i + nExpand);
                     rDst.values = rSrc.values;
-                    rDst.style = rSrc.style;
+                    rDst.style = copyStyle(rSrc.style) ?? {};
                     rDst.height = rSrc.height;
                     rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
-                        rDst.getCell(colNumber).style = cell.style;
+                        rDst.getCell(colNumber).style = copyStyle(cell.style) ?? {};
                     });
                     this._rows[i - 1] = undefined;
                 }
@@ -618,10 +618,10 @@ class Worksheet {
                 if (rSrc) {
                     const rDst = this.getRow(i + nExpand);
                     rDst.values = rSrc.values;
-                    rDst.style = rSrc.style;
+                    rDst.style = copyStyle(rSrc.style) ?? {};
                     rDst.height = rSrc.height;
                     rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
-                        rDst.getCell(colNumber).style = cell.style;
+                        rDst.getCell(colNumber).style = copyStyle(cell.style) ?? {};
                     });
                 }
                 else {

package/dist/esm/modules/excel/xlsx/xform/table/table-column-xform.js

@@ -2,6 +2,7 @@ import { BaseXform } from "../base-xform.js";
 class TableColumnXform extends BaseXform {
     constructor() {
         super();
+        this._childText = "";
         this.model = { name: "" };
     }
     get tag() {
@@ -10,15 +11,30 @@ class TableColumnXform extends BaseXform {
     prepare(model, options) {
         model.id = options.index + 1;
     }
-    render(xmlStream, model) {
-        xmlStream.leafNode(this.tag, {
+    _renderAttributes(model) {
+        return {
             id: model.id.toString(),
             name: model.name,
             totalsRowLabel: model.totalsRowLabel,
             // Excel doesn't output totalsRowFunction when value is 'none'
             totalsRowFunction: model.totalsRowFunction === "none" ? undefined : model.totalsRowFunction,
             dxfId: model.dxfId
-        });
+        };
+    }
+    render(xmlStream, model) {
+        if (model.calculatedColumnFormula || model.totalsRowFormula) {
+            xmlStream.openNode(this.tag, this._renderAttributes(model));
+            if (model.calculatedColumnFormula) {
+                xmlStream.leafNode("calculatedColumnFormula", undefined, model.calculatedColumnFormula);
+            }
+            if (model.totalsRowFormula) {
+                xmlStream.leafNode("totalsRowFormula", undefined, model.totalsRowFormula);
+            }
+            xmlStream.closeNode();
+        }
+        else {
+            xmlStream.leafNode(this.tag, this._renderAttributes(model));
+        }
     }
     parseOpen(node) {
         if (node.name === this.tag) {
@@ -31,11 +47,28 @@ class TableColumnXform extends BaseXform {
             };
             return true;
         }
-        return false;
+        // Recognise child elements whose text content we want to capture
+        if (node.name === "calculatedColumnFormula" || node.name === "totalsRowFormula") {
+            this._childTag = node.name;
+            this._childText = "";
+        }
+        return true;
+    }
+    parseText(text) {
+        if (this._childTag) {
+            this._childText += text;
+        }
     }
-    parseText() { }
-    parseClose() {
-        return false;
+    parseClose(name) {
+        if (name === this.tag) {
+            return false;
+        }
+        // Closing a recognised child element — store captured text
+        if (this._childTag && name === this._childTag) {
+            this.model[this._childTag] = this._childText;
+            this._childTag = undefined;
+        }
+        return true;
     }
 }
 export { TableColumnXform };