@cj-tech-master/excelts 1.4.5 → 1.5.0-canary.20251213003400.6464c74

package/dist/browser/excelts.iife.js

@@ -1,5 +1,5 @@
 /*!
- * @cj-tech-master/excelts v1.4.5
+ * @cj-tech-master/excelts v1.5.0-canary.20251213003400.6464c74
  * TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.
  * (c) 2025 cjnoname
  * Released under the MIT License
@@ -282,10 +282,16 @@ var ExcelTS = (function(exports) {
 //#region src/doc/range.ts
 	var Range = class Range {
 		constructor(...args) {
+			this.model = {
+				top: 0,
+				left: 0,
+				bottom: 0,
+				right: 0
+			};
 			this.decode(args);
 		}
 		setTLBR(t, l, b, r, s) {
-			if (arguments.length < 4) {
+			if (typeof t === "string" && typeof l === "string") {
 				const tl = colCache.decodeAddress(t);
 				const br = colCache.decodeAddress(l);
 				this.model = {
@@ -293,10 +299,9 @@ var ExcelTS = (function(exports) {
 					left: Math.min(tl.col, br.col),
 					bottom: Math.max(tl.row, br.row),
 					right: Math.max(tl.col, br.col),
-					sheetName: b
+					sheetName: typeof b === "string" ? b : void 0
 				};
-				this.setTLBR(tl.row, tl.col, br.row, br.col, s);
-			} else this.model = {
+			} else if (typeof t === "number" && typeof l === "number" && typeof b === "number" && typeof r === "number") this.model = {
 				top: Math.min(t, b),
 				left: Math.min(l, r),
 				bottom: Math.max(t, b),
@@ -307,16 +312,16 @@ var ExcelTS = (function(exports) {
 		decode(argv$1) {
 			switch (argv$1.length) {
 				case 5:
-					this.setTLBR(argv$1[0], argv$1[1], argv$1[2], argv$1[3], argv$1[4]);
+					if (typeof argv$1[0] === "number" && typeof argv$1[1] === "number" && typeof argv$1[2] === "number" && typeof argv$1[3] === "number" && typeof argv$1[4] === "string") this.setTLBR(argv$1[0], argv$1[1], argv$1[2], argv$1[3], argv$1[4]);
 					break;
 				case 4:
-					this.setTLBR(argv$1[0], argv$1[1], argv$1[2], argv$1[3]);
+					if (typeof argv$1[0] === "number" && typeof argv$1[1] === "number" && typeof argv$1[2] === "number" && typeof argv$1[3] === "number") this.setTLBR(argv$1[0], argv$1[1], argv$1[2], argv$1[3]);
 					break;
 				case 3:
-					this.setTLBR(argv$1[0], argv$1[1], argv$1[2]);
+					if (typeof argv$1[0] === "string" && typeof argv$1[1] === "string" && typeof argv$1[2] === "string") this.setTLBR(argv$1[0], argv$1[1], argv$1[2]);
 					break;
 				case 2:
-					this.setTLBR(argv$1[0], argv$1[1]);
+					if (typeof argv$1[0] === "string" && typeof argv$1[1] === "string") this.setTLBR(argv$1[0], argv$1[1]);
 					break;
 				case 1: {
 					const value = argv$1[0];
@@ -327,29 +332,29 @@ var ExcelTS = (function(exports) {
 						right: value.model.right,
 						sheetName: value.sheetName
 					};
-					else if (value instanceof Array) this.decode(value);
-					else if (value.top && value.left && value.bottom && value.right) this.model = {
+					else if (Array.isArray(value)) this.decode(value);
+					else if (typeof value === "object" && "top" in value && "left" in value && "bottom" in value && "right" in value) this.model = {
 						top: value.top,
 						left: value.left,
 						bottom: value.bottom,
 						right: value.right,
 						sheetName: value.sheetName
 					};
-					else {
-						const tlbr = colCache.decodeEx(value);
-						if (tlbr.top) this.model = {
-							top: tlbr.top,
-							left: tlbr.left,
-							bottom: tlbr.bottom,
-							right: tlbr.right,
-							sheetName: tlbr.sheetName
+					else if (typeof value === "string") {
+						const decoded = colCache.decodeEx(value);
+						if ("top" in decoded) this.model = {
+							top: decoded.top,
+							left: decoded.left,
+							bottom: decoded.bottom,
+							right: decoded.right,
+							sheetName: decoded.sheetName
 						};
-						else this.model = {
-							top: tlbr.row,
-							left: tlbr.col,
-							bottom: tlbr.row,
-							right: tlbr.col,
-							sheetName: tlbr.sheetName
+						else if ("row" in decoded) this.model = {
+							top: decoded.row,
+							left: decoded.col,
+							bottom: decoded.row,
+							right: decoded.col,
+							sheetName: decoded.sheetName
 						};
 					}
 					break;
@@ -417,7 +422,7 @@ var ExcelTS = (function(exports) {
 		}
 		expandToAddress(addressStr) {
 			const address = colCache.decodeEx(addressStr);
-			this.expand(address.row, address.col, address.row, address.col);
+			if ("row" in address && "col" in address) this.expand(address.row, address.col, address.row, address.col);
 		}
 		get tl() {
 			return colCache.n2l(this.left) + this.top;
@@ -459,7 +464,8 @@ var ExcelTS = (function(exports) {
 		}
 		contains(addressStr) {
 			const address = colCache.decodeEx(addressStr);
-			return this.containsEx(address);
+			if ("row" in address && "col" in address) return this.containsEx(address);
+			return false;
 		}
 		containsEx(address) {
 			if (address.sheetName && this.sheetName && address.sheetName !== this.sheetName) return false;
@@ -857,11 +863,20 @@ var ExcelTS = (function(exports) {
 			this._value = Value.create(Value.getType(v), this, v);
 		}
 		get note() {
-			return this._comment && this._comment.note;
+			if (!this._comment) return;
+			return this._comment.note;
 		}
 		set note(note) {
 			this._comment = new Note(note);
 		}
+		get comment() {
+			return this._comment;
+		}
+		set comment(comment) {
+			if (comment === void 0) this._comment = void 0;
+			else if (comment instanceof Note) this._comment = comment;
+			else this._comment = new Note(comment);
+		}
 		get text() {
 			return this._value.toString();
 		}
@@ -873,7 +888,7 @@ var ExcelTS = (function(exports) {
 		}
 		_upgradeToHyperlink(hyperlink) {
 			if (this.type === Cell.Types.String) this._value = Value.create(Cell.Types.Hyperlink, this, {
-				text: this._value.value,
+				text: String(this._value.value),
 				hyperlink
 			});
 		}
@@ -1129,12 +1144,11 @@ var ExcelTS = (function(exports) {
 			if (value && value.tooltip) this.model.tooltip = value.tooltip;
 		}
 		get value() {
-			const v = {
-				text: this.model.text,
-				hyperlink: this.model.hyperlink
+			return {
+				text: this.model.text || "",
+				hyperlink: this.model.hyperlink || "",
+				tooltip: this.model.tooltip
 			};
-			if (this.model.tooltip) v.tooltip = this.model.tooltip;
-			return v;
 		}
 		set value(value) {
 			this.model.text = value.text;
@@ -1236,22 +1250,22 @@ var ExcelTS = (function(exports) {
 		}
 		_copyModel(model) {
 			const copy = {};
-			const cp = (name) => {
-				const value = model[name];
-				if (value) copy[name] = value;
-			};
-			cp("formula");
-			cp("result");
-			cp("ref");
-			cp("shareType");
-			cp("sharedFormula");
+			if (model.formula) copy.formula = model.formula;
+			if (model.result !== void 0) copy.result = model.result;
+			if (model.ref) copy.ref = model.ref;
+			if (model.shareType) copy.shareType = model.shareType;
+			if (model.sharedFormula) copy.sharedFormula = model.sharedFormula;
 			return copy;
 		}
 		get value() {
 			return this._copyModel(this.model);
 		}
 		set value(value) {
-			this.model = this._copyModel(value);
+			if (value.formula) this.model.formula = value.formula;
+			if (value.result !== void 0) this.model.result = value.result;
+			if (value.ref) this.model.ref = value.ref;
+			if (value.shareType) this.model.shareType = value.shareType;
+			if (value.sharedFormula) this.model.sharedFormula = value.sharedFormula;
 		}
 		validate(value) {
 			switch (Value.getType(value)) {
@@ -1296,8 +1310,7 @@ var ExcelTS = (function(exports) {
 			if (v instanceof String || typeof v === "string") return Enums.ValueType.String;
 			if (typeof v === "number") return Enums.ValueType.Number;
 			if (v instanceof Date) return Enums.ValueType.Date;
-			if (v.text && v.hyperlink) return Enums.ValueType.Hyperlink;
-			if (v.formula) return Enums.ValueType.Formula;
+			if (typeof v === "object" && "error" in v) return Enums.ValueType.Error;
 			return Enums.ValueType.Null;
 		}
 		get address() {
@@ -1467,11 +1480,13 @@ var ExcelTS = (function(exports) {
 			if (typeof value === "number") return Cell.Types.Number;
 			if (typeof value === "boolean") return Cell.Types.Boolean;
 			if (value instanceof Date) return Cell.Types.Date;
-			if (value.text && value.hyperlink) return Cell.Types.Hyperlink;
-			if (value.formula || value.sharedFormula) return Cell.Types.Formula;
-			if (value.richText) return Cell.Types.RichText;
-			if (value.sharedString) return Cell.Types.SharedString;
-			if (value.error) return Cell.Types.Error;
+			if (typeof value === "object") {
+				if ("text" in value && value.text && "hyperlink" in value && value.hyperlink) return Cell.Types.Hyperlink;
+				if ("formula" in value && value.formula || "sharedFormula" in value && value.sharedFormula) return Cell.Types.Formula;
+				if ("richText" in value && value.richText) return Cell.Types.RichText;
+				if ("sharedString" in value && value.sharedString) return Cell.Types.SharedString;
+				if ("error" in value && value.error) return Cell.Types.Error;
+			}
 			return Cell.Types.JSON;
 		},
 		types: [
@@ -1544,15 +1559,29 @@ var ExcelTS = (function(exports) {
 			this.style = {};
 			this.outlineLevel = 0;
 		}
+		/**
+		* The row number
+		*/
 		get number() {
 			return this._number;
 		}
+		/**
+		* The worksheet that contains this row
+		*/
 		get worksheet() {
 			return this._worksheet;
 		}
+		/**
+		* Commit a completed row to stream.
+		* Inform Streaming Writer that this row (and all rows before it) are complete
+		* and ready to write. Has no effect on Worksheet document.
+		*/
 		commit() {
 			this._worksheet._commitRow(this);
 		}
+		/**
+		* Helps GC by breaking cyclic references
+		*/
 		destroy() {
 			delete this._worksheet;
 			delete this._cells;
@@ -1570,6 +1599,9 @@ var ExcelTS = (function(exports) {
 			}
 			return cell;
 		}
+		/**
+		* Get cell by number, column letter or column key
+		*/
 		getCell(col) {
 			let colNum;
 			if (typeof col === "string") {
@@ -1583,6 +1615,11 @@ var ExcelTS = (function(exports) {
 				col: colNum
 			});
 		}
+		/**
+		* Cut one or more cells (cells to the right are shifted left)
+		*
+		* Note: this operation will not affect other rows
+		*/
 		splice(start, count, ...inserts) {
 			const nKeep = start + count;
 			const nExpand = inserts.length - count;
@@ -1597,11 +1634,11 @@ var ExcelTS = (function(exports) {
 					cDst = this.getCell(i$1);
 					cDst.value = cSrc.value;
 					cDst.style = cSrc.style;
-					cDst._comment = cSrc._comment;
+					cDst.comment = cSrc.comment;
 				} else if (cDst) {
 					cDst.value = null;
 					cDst.style = {};
-					cDst._comment = void 0;
+					cDst.comment = void 0;
 				}
 			}
 			else if (nExpand > 0) for (i$1 = nEnd; i$1 >= nKeep; i$1--) {
@@ -1610,29 +1647,29 @@ var ExcelTS = (function(exports) {
 					cDst = this.getCell(i$1 + nExpand);
 					cDst.value = cSrc.value;
 					cDst.style = cSrc.style;
-					cDst._comment = cSrc._comment;
+					cDst.comment = cSrc.comment;
 				} else this._cells[i$1 + nExpand - 1] = void 0;
 			}
 			for (i$1 = 0; i$1 < inserts.length; i$1++) {
 				cDst = this.getCell(start + i$1);
 				cDst.value = inserts[i$1];
 				cDst.style = {};
-				cDst._comment = void 0;
+				cDst.comment = void 0;
 			}
 		}
-		eachCell(optionsOrIteratee, maybeIteratee) {
+		eachCell(optOrCallback, maybeCallback) {
 			let options = null;
-			let iteratee;
-			if (typeof optionsOrIteratee === "function") iteratee = optionsOrIteratee;
+			let callback;
+			if (typeof optOrCallback === "function") callback = optOrCallback;
 			else {
-				options = optionsOrIteratee;
-				iteratee = maybeIteratee;
+				options = optOrCallback;
+				callback = maybeCallback;
 			}
 			if (options && options.includeEmpty) {
 				const n = this._cells.length;
-				for (let i$1 = 1; i$1 <= n; i$1++) iteratee(this.getCell(i$1), i$1);
+				for (let i$1 = 1; i$1 <= n; i$1++) callback(this.getCell(i$1), i$1);
 			} else this._cells.forEach((cell, index) => {
-				if (cell && cell.type !== Enums.ValueType.Null) iteratee(cell, index + 1);
+				if (cell && cell.type !== Enums.ValueType.Null) callback(cell, index + 1);
 			});
 		}
 		addPageBreak(lft, rght) {
@@ -1647,6 +1684,9 @@ var ExcelTS = (function(exports) {
 			if (left) pb.min = left;
 			ws.rowBreaks.push(pb);
 		}
+		/**
+		* Get a row as a sparse array
+		*/
 		get values() {
 			const values = [];
 			this._cells.forEach((cell) => {
@@ -1654,6 +1694,9 @@ var ExcelTS = (function(exports) {
 			});
 			return values;
 		}
+		/**
+		* Set the values by contiguous or sparse array, or by key'd object literal
+		*/
 		set values(value) {
 			this._cells = [];
 			if (!value) {} else if (value instanceof Array) {
@@ -1674,12 +1717,21 @@ var ExcelTS = (function(exports) {
 				}).value = value[key];
 			});
 		}
+		/**
+		* Returns true if the row includes at least one cell with a value
+		*/
 		get hasValues() {
 			return this._cells.some((cell) => cell && cell.type !== Enums.ValueType.Null);
 		}
+		/**
+		* Number of cells including empty ones
+		*/
 		get cellCount() {
 			return this._cells.length;
 		}
+		/**
+		* Number of non-empty cells
+		*/
 		get actualCellCount() {
 			let count = 0;
 			this.eachCell(() => {
@@ -1687,6 +1739,9 @@ var ExcelTS = (function(exports) {
 			});
 			return count;
 		}
+		/**
+		* Get the min and max column number for the non-null cells in this row or null
+		*/
 		get dimensions() {
 			let min = 0;
 			let max$1 = 0;
@@ -1704,45 +1759,44 @@ var ExcelTS = (function(exports) {
 		_applyStyle(name, value) {
 			this.style[name] = value;
 			this._cells.forEach((cell) => {
-				if (cell) cell[name] = value;
+				if (cell) cell.style[name] = value;
 			});
-			return value;
 		}
 		get numFmt() {
 			return this.style.numFmt;
 		}
 		set numFmt(value) {
-			this._applyStyle("numFmt", value);
+			if (value !== void 0) this._applyStyle("numFmt", value);
 		}
 		get font() {
 			return this.style.font;
 		}
 		set font(value) {
-			this._applyStyle("font", value);
+			if (value !== void 0) this._applyStyle("font", value);
 		}
 		get alignment() {
 			return this.style.alignment;
 		}
 		set alignment(value) {
-			this._applyStyle("alignment", value);
+			if (value !== void 0) this._applyStyle("alignment", value);
 		}
 		get protection() {
 			return this.style.protection;
 		}
 		set protection(value) {
-			this._applyStyle("protection", value);
+			if (value !== void 0) this._applyStyle("protection", value);
 		}
 		get border() {
 			return this.style.border;
 		}
 		set border(value) {
-			this._applyStyle("border", value);
+			if (value !== void 0) this._applyStyle("border", value);
 		}
 		get fill() {
 			return this.style.fill;
 		}
 		set fill(value) {
-			this._applyStyle("fill", value);
+			if (value !== void 0) this._applyStyle("fill", value);
 		}
 		get hidden() {
 			return !!this._hidden;
@@ -1823,6 +1877,11 @@ var ExcelTS = (function(exports) {
 //#endregion
 //#region src/doc/column.ts
 	const DEFAULT_COLUMN_WIDTH = 9;
+	/**
+	* Column defines the column properties for 1 column.
+	* This includes header rows, widths, key, (style), etc.
+	* Worksheet will condense the columns as appropriate during serialization
+	*/
 	var Column = class Column {
 		constructor(worksheet, number, defn) {
 			this._worksheet = worksheet;
@@ -1835,6 +1894,9 @@ var ExcelTS = (function(exports) {
 		get worksheet() {
 			return this._worksheet;
 		}
+		/**
+		* Column letter key
+		*/
 		get letter() {
 			return colCache.n2l(this._number);
 		}
@@ -1869,8 +1931,13 @@ var ExcelTS = (function(exports) {
 			}
 		}
 		get headers() {
-			return this._header && this._header instanceof Array ? this._header : [this._header];
+			if (Array.isArray(this._header)) return this._header;
+			if (this._header !== void 0) return [this._header];
+			return [];
 		}
+		/**
+		* Can be a string to set one row high header or an array to set multi-row high header
+		*/
 		get header() {
 			return this._header;
 		}
@@ -1882,6 +1949,9 @@ var ExcelTS = (function(exports) {
 				});
 			} else this._header = void 0;
 		}
+		/**
+		* The name of the properties associated with this column in each row
+		*/
 		get key() {
 			return this._key;
 		}
@@ -1890,18 +1960,27 @@ var ExcelTS = (function(exports) {
 			this._key = value;
 			if (value) this._worksheet.setColumnKey(this._key, this);
 		}
+		/**
+		* Hides the column
+		*/
 		get hidden() {
 			return !!this._hidden;
 		}
 		set hidden(value) {
 			this._hidden = value;
 		}
+		/**
+		* Set an outline level for columns
+		*/
 		get outlineLevel() {
 			return this._outlineLevel || 0;
 		}
 		set outlineLevel(value) {
 			this._outlineLevel = value;
 		}
+		/**
+		* Indicate the collapsed state based on outlineLevel
+		*/
 		get collapsed() {
 			return !!(this._outlineLevel && this._outlineLevel >= this._worksheet.properties.outlineLevelCol);
 		}
@@ -1915,6 +1994,9 @@ var ExcelTS = (function(exports) {
 		equivalentTo(other) {
 			return this.width === other.width && this.hidden === other.hidden && this.outlineLevel === other.outlineLevel && isEqual(this.style, other.style);
 		}
+		equivalentToModel(model) {
+			return this.width === model.width && this.hidden === model.hidden && this.outlineLevel === model.outlineLevel && isEqual(this.style, model.style);
+		}
 		get isDefault() {
 			if (this.isCustomWidth) return false;
 			if (this.hidden) return false;
@@ -1926,16 +2008,24 @@ var ExcelTS = (function(exports) {
 		get headerCount() {
 			return this.headers.length;
 		}
-		eachCell(options, iteratee) {
+		eachCell(optionsOrCallback, maybeCallback) {
 			const colNumber = this.number;
-			if (!iteratee) {
-				iteratee = options;
+			let options;
+			let callback;
+			if (typeof optionsOrCallback === "function") {
 				options = {};
+				callback = optionsOrCallback;
+			} else {
+				options = optionsOrCallback;
+				callback = maybeCallback;
 			}
 			this._worksheet.eachRow(options, (row, rowNumber) => {
-				iteratee(row.getCell(colNumber), rowNumber);
+				callback(row.getCell(colNumber), rowNumber);
 			});
 		}
+		/**
+		* The cell values in the column
+		*/
 		get values() {
 			const v = [];
 			this.eachCell((cell, rowNumber) => {
@@ -1952,48 +2042,59 @@ var ExcelTS = (function(exports) {
 				this._worksheet.getCell(index + offset, colNumber).value = value;
 			});
 		}
-		_applyStyle(name, value) {
-			this.style[name] = value;
-			this.eachCell((cell) => {
-				cell[name] = value;
-			});
-			return value;
-		}
 		get numFmt() {
 			return this.style.numFmt;
 		}
 		set numFmt(value) {
-			this._applyStyle("numFmt", value);
+			this.style.numFmt = value;
+			this.eachCell((cell) => {
+				cell.numFmt = value;
+			});
 		}
 		get font() {
 			return this.style.font;
 		}
 		set font(value) {
-			this._applyStyle("font", value);
+			this.style.font = value;
+			this.eachCell((cell) => {
+				cell.font = value;
+			});
 		}
 		get alignment() {
 			return this.style.alignment;
 		}
 		set alignment(value) {
-			this._applyStyle("alignment", value);
+			this.style.alignment = value;
+			this.eachCell((cell) => {
+				cell.alignment = value;
+			});
 		}
 		get protection() {
 			return this.style.protection;
 		}
 		set protection(value) {
-			this._applyStyle("protection", value);
+			this.style.protection = value;
+			this.eachCell((cell) => {
+				cell.protection = value;
+			});
 		}
 		get border() {
 			return this.style.border;
 		}
 		set border(value) {
-			this._applyStyle("border", value);
+			this.style.border = value;
+			this.eachCell((cell) => {
+				cell.border = value;
+			});
 		}
 		get fill() {
 			return this.style.fill;
 		}
 		set fill(value) {
-			this._applyStyle("fill", value);
+			this.style.fill = value;
+			this.eachCell((cell) => {
+				cell.fill = value;
+			});
 		}
 		static toModel(columns) {
 			const cols = [];
@@ -2001,7 +2102,7 @@ var ExcelTS = (function(exports) {
 			if (columns) columns.forEach((column, index) => {
 				if (column.isDefault) {
 					if (col) col = null;
-				} else if (!col || !column.equivalentTo(col)) {
+				} else if (!col || !column.equivalentToModel(col)) {
 					col = {
 						min: index + 1,
 						max: index + 1,
@@ -2040,6 +2141,12 @@ var ExcelTS = (function(exports) {
 
 //#endregion
 //#region src/doc/anchor.ts
+	function isAnchorModel(value) {
+		return typeof value === "object" && "nativeCol" in value && "nativeRow" in value && "nativeColOff" in value && "nativeRowOff" in value;
+	}
+	function isSimpleAddress(value) {
+		return typeof value === "object" && "col" in value && "row" in value;
+	}
 	var Anchor = class Anchor {
 		constructor(worksheet, address, offset = 0) {
 			this.worksheet = worksheet;
@@ -2054,16 +2161,14 @@ var ExcelTS = (function(exports) {
 				this.nativeColOff = 0;
 				this.nativeRow = decoded.row + offset;
 				this.nativeRowOff = 0;
-			} else if (address.nativeCol !== void 0) {
-				const anchor = address;
-				this.nativeCol = anchor.nativeCol || 0;
-				this.nativeColOff = anchor.nativeColOff || 0;
-				this.nativeRow = anchor.nativeRow || 0;
-				this.nativeRowOff = anchor.nativeRowOff || 0;
-			} else if (address.col !== void 0) {
-				const simple = address;
-				this.col = simple.col + offset;
-				this.row = simple.row + offset;
+			} else if (isAnchorModel(address)) {
+				this.nativeCol = address.nativeCol || 0;
+				this.nativeColOff = address.nativeColOff || 0;
+				this.nativeRow = address.nativeRow || 0;
+				this.nativeRowOff = address.nativeRowOff || 0;
+			} else if (isSimpleAddress(address)) {
+				this.col = address.col + offset;
+				this.row = address.row + offset;
 			} else {
 				this.nativeCol = 0;
 				this.nativeColOff = 0;
@@ -2072,7 +2177,9 @@ var ExcelTS = (function(exports) {
 			}
 		}
 		static asInstance(model) {
-			return model instanceof Anchor || model == null ? model : new Anchor(void 0, model);
+			if (model == null) return null;
+			if (model instanceof Anchor) return model;
+			return new Anchor(void 0, model);
 		}
 		get col() {
 			return this.nativeCol + Math.min(this.colWidth - 1, this.nativeColOff) / this.colWidth;
@@ -2140,26 +2247,28 @@ var ExcelTS = (function(exports) {
 		set model({ type, imageId, range: range$1, hyperlinks }) {
 			this.type = type;
 			this.imageId = imageId;
-			if (type === "image") if (typeof range$1 === "string") {
-				const decoded = colCache.decode(range$1);
-				this.range = {
-					tl: new Anchor(this.worksheet, {
-						col: decoded.left,
-						row: decoded.top
-					}, -1),
-					br: new Anchor(this.worksheet, {
-						col: decoded.right,
-						row: decoded.bottom
-					}, 0),
-					editAs: "oneCell"
+			if (type === "image") {
+				if (typeof range$1 === "string") {
+					const decoded = colCache.decode(range$1);
+					if ("top" in decoded) this.range = {
+						tl: new Anchor(this.worksheet, {
+							col: decoded.left,
+							row: decoded.top
+						}, -1),
+						br: new Anchor(this.worksheet, {
+							col: decoded.right,
+							row: decoded.bottom
+						}, 0),
+						editAs: "oneCell"
+					};
+				} else if (range$1) this.range = {
+					tl: new Anchor(this.worksheet, range$1.tl, 0),
+					br: range$1.br ? new Anchor(this.worksheet, range$1.br, 0) : void 0,
+					ext: range$1.ext,
+					editAs: range$1.editAs,
+					hyperlinks: hyperlinks || ("hyperlinks" in range$1 ? range$1.hyperlinks : void 0)
 				};
-			} else this.range = {
-				tl: new Anchor(this.worksheet, range$1.tl, 0),
-				br: range$1.br && new Anchor(this.worksheet, range$1.br, 0),
-				ext: range$1.ext,
-				editAs: range$1.editAs,
-				hyperlinks: hyperlinks || range$1.hyperlinks
-			};
+			}
 		}
 	};
 
@@ -2291,9 +2400,7 @@ var ExcelTS = (function(exports) {
 		}
 		store() {
 			const assignStyle = (cell, style) => {
-				if (style) Object.keys(style).forEach((key) => {
-					cell.style[key] = style[key];
-				});
+				if (style) Object.assign(cell.style, style);
 			};
 			const { worksheet, table } = this;
 			const { row, col } = table.tl;
@@ -2470,10 +2577,10 @@ var ExcelTS = (function(exports) {
 			this._assign(this.table, "totalsRow", value);
 		}
 		get theme() {
-			return this.table.style.name;
+			return this.table.style.theme;
 		}
 		set theme(value) {
-			this.table.style.name = value;
+			this.table.style.theme = value;
 		}
 		get showFirstColumn() {
 			return this.table.style.showFirstColumn;
@@ -26537,15 +26644,24 @@ var ExcelTS = (function(exports) {
 				console.warn(`Worksheet name ${name} exceeds 31 chars. This will be truncated`);
 				name = name.substring(0, 31);
 			}
-			if (this._workbook._worksheets.find((ws) => ws && ws.name.toLowerCase() === name.toLowerCase())) throw new Error(`Worksheet name already exists: ${name}`);
+			if (this._workbook.worksheets.find((ws) => ws && ws.name.toLowerCase() === name.toLowerCase())) throw new Error(`Worksheet name already exists: ${name}`);
 			this._name = name;
 		}
+		/**
+		* The workbook that contains this worksheet
+		*/
 		get workbook() {
 			return this._workbook;
 		}
+		/**
+		* When you're done with this worksheet, call this to remove from workbook
+		*/
 		destroy() {
 			this._workbook.removeWorksheetEx(this);
 		}
+		/**
+		* Get the bounding range of the cells in this worksheet
+		*/
 		get dimensions() {
 			const dimensions = new Range();
 			this._rows.forEach((row) => {
@@ -26556,12 +26672,21 @@ var ExcelTS = (function(exports) {
 			});
 			return dimensions;
 		}
+		/**
+		* Get the current columns array
+		*/
 		get columns() {
 			return this._columns;
 		}
+		/**
+		* Add column headers and define column keys and widths.
+		*
+		* Note: these column structures are a workbook-building convenience only,
+		* apart from the column width, they will not be fully persisted.
+		*/
 		set columns(value) {
 			this._headerRowCount = value.reduce((pv, cv) => {
-				const headerCount = cv.header && 1 || cv.headers && cv.headers.length || 0;
+				const headerCount = Array.isArray(cv.header) ? cv.header.length : cv.header ? 1 : 0;
 				return Math.max(pv, headerCount);
 			}, 0);
 			let count = 1;
@@ -26584,6 +26709,9 @@ var ExcelTS = (function(exports) {
 		eachColumnKey(f) {
 			Object.keys(this._keys).forEach((key) => f(this._keys[key], key));
 		}
+		/**
+		* Access an individual column by key, letter and 1-based column number
+		*/
 		getColumn(c) {
 			let colNum;
 			if (typeof c === "string") {
@@ -26598,14 +26726,22 @@ var ExcelTS = (function(exports) {
 			}
 			return this._columns[colNum - 1];
 		}
+		/**
+		* Cut one or more columns (columns to the right are shifted left)
+		* and optionally insert more
+		*
+		* If column properties have been defined, they will be cut or moved accordingly
+		*
+		* Known Issue: If a splice causes any merged cells to move, the results may be unpredictable
+		*
+		* Also: If the worksheet has more rows than values in the column inserts,
+		* the rows will still be shifted as if the values existed
+		*/
 		spliceColumns(start, count, ...inserts) {
 			const nRows = this._rows.length;
 			if (inserts.length > 0) for (let i$1 = 0; i$1 < nRows; i$1++) {
-				const rowArguments = [start, count];
-				inserts.forEach((insert) => {
-					rowArguments.push(insert[i$1] || null);
-				});
-				this.getRow(i$1 + 1).splice(...rowArguments);
+				const insertValues = inserts.map((insert) => insert[i$1] || null);
+				this.getRow(i$1 + 1).splice(start, count, ...insertValues);
 			}
 			else this._rows.forEach((r) => {
 				if (r) r.splice(start, count);
@@ -26615,12 +26751,18 @@ var ExcelTS = (function(exports) {
 			const nEnd = this._columns ? this._columns.length : 0;
 			if (nExpand < 0) for (let i$1 = start + inserts.length; i$1 <= nEnd; i$1++) this.getColumn(i$1).defn = this.getColumn(i$1 - nExpand).defn;
 			else if (nExpand > 0) for (let i$1 = nEnd; i$1 >= nKeep; i$1--) this.getColumn(i$1 + nExpand).defn = this.getColumn(i$1).defn;
-			for (let i$1 = start; i$1 < start + inserts.length; i$1++) this.getColumn(i$1).defn = null;
+			for (let i$1 = start; i$1 < start + inserts.length; i$1++) this.getColumn(i$1).defn = void 0;
 			this.workbook.definedNames.spliceColumns(this.name, start, count, inserts.length);
 		}
+		/**
+		* Get the last column in a worksheet
+		*/
 		get lastColumn() {
 			return this.getColumn(this.columnCount);
 		}
+		/**
+		* The total column size of the document. Equal to the maximum cell count from all of the rows
+		*/
 		get columnCount() {
 			let maxCount = 0;
 			this.eachRow((row) => {
@@ -26628,6 +26770,9 @@ var ExcelTS = (function(exports) {
 			});
 			return maxCount;
 		}
+		/**
+		* A count of the number of columns that have values
+		*/
 		get actualColumnCount() {
 			const counts = [];
 			let count = 0;
@@ -26651,18 +26796,38 @@ var ExcelTS = (function(exports) {
 		get _nextRow() {
 			return this._lastRowNumber + 1;
 		}
+		/**
+		* Get the last editable row in a worksheet (or undefined if there are none)
+		*/
 		get lastRow() {
 			if (this._rows.length) return this._rows[this._rows.length - 1];
 		}
+		/**
+		* Tries to find and return row for row number, else undefined
+		*
+		* @param r - The 1-indexed row number
+		*/
 		findRow(r) {
 			return this._rows[r - 1];
 		}
+		/**
+		* Tries to find and return rows for row number start and length, else undefined
+		*
+		* @param start - The 1-indexed starting row number
+		* @param length - The length of the expected array
+		*/
 		findRows(start, length) {
 			return this._rows.slice(start - 1, start - 1 + length);
 		}
+		/**
+		* The total row size of the document. Equal to the row number of the last row that has values.
+		*/
 		get rowCount() {
 			return this._lastRowNumber;
 		}
+		/**
+		* A count of the number of rows that have values. If a mid-document row is empty, it will not be included in the count.
+		*/
 		get actualRowCount() {
 			let count = 0;
 			this.eachRow(() => {
@@ -26670,17 +26835,27 @@ var ExcelTS = (function(exports) {
 			});
 			return count;
 		}
+		/**
+		* Get or create row by 1-based index
+		*/
 		getRow(r) {
 			let row = this._rows[r - 1];
 			if (!row) row = this._rows[r - 1] = new Row(this, r);
 			return row;
 		}
+		/**
+		* Get or create rows by 1-based index
+		*/
 		getRows(start, length) {
 			if (length < 1) return;
 			const rows = [];
 			for (let i$1 = start; i$1 < start + length; i$1++) rows.push(this.getRow(i$1));
 			return rows;
 		}
+		/**
+		* Add a couple of Rows by key-value, after the last current row, using the column keys,
+		* or add a row by contiguous Array (assign to columns A, B & C)
+		*/
 		addRow(value, style = "n") {
 			const rowNo = this._nextRow;
 			const row = this.getRow(rowNo);
@@ -26688,6 +26863,9 @@ var ExcelTS = (function(exports) {
 			this._setStyleOption(rowNo, style[0] === "i" ? style : "n");
 			return row;
 		}
+		/**
+		* Add multiple rows by providing an array of arrays or key-value pairs
+		*/
 		addRows(value, style = "n") {
 			const rows = [];
 			value.forEach((row) => {
@@ -26695,11 +26873,19 @@ var ExcelTS = (function(exports) {
 			});
 			return rows;
 		}
+		/**
+		* Insert a Row by key-value, at the position (shifting down all rows from position),
+		* using the column keys, or add a row by contiguous Array (assign to columns A, B & C)
+		*/
 		insertRow(pos, value, style = "n") {
 			this.spliceRows(pos, 0, value);
 			this._setStyleOption(pos, style);
 			return this.getRow(pos);
 		}
+		/**
+		* Insert multiple rows at position (shifting down all rows from position)
+		* by providing an array of arrays or key-value pairs
+		*/
 		insertRows(pos, values, style = "n") {
 			this.spliceRows(pos, 0, ...values);
 			if (style !== "n") {
@@ -26721,6 +26907,9 @@ var ExcelTS = (function(exports) {
 			});
 			rDst.height = rSrc.height;
 		}
+		/**
+		* Duplicate rows and insert new rows
+		*/
 		duplicateRow(rowNum, count, insert = false) {
 			const rSrc = this._rows[rowNum - 1];
 			const inserts = Array.from({ length: count }).fill(rSrc.values);
@@ -26734,6 +26923,12 @@ var ExcelTS = (function(exports) {
 				});
 			}
 		}
+		/**
+		* Cut one or more rows (rows below are shifted up)
+		* and optionally insert more
+		*
+		* Known Issue: If a splice causes any merged cells to move, the results may be unpredictable
+		*/
 		spliceRows(start, count, ...inserts) {
 			const nKeep = start + count;
 			const nInserts = inserts.length;
@@ -26765,10 +26960,10 @@ var ExcelTS = (function(exports) {
 					rDst.height = rSrc.height;
 					rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
 						rDst.getCell(colNumber).style = cell.style;
-						if (cell._value.constructor.name === "MergeValue") {
-							const cellToBeMerged = this.getRow(cell._row._number + nInserts).getCell(colNumber);
-							const prevMaster = cell._value._master;
-							const newMaster = this.getRow(prevMaster._row._number + nInserts).getCell(prevMaster._column._number);
+						if (cell.type === Enums.ValueType.Merge) {
+							const cellToBeMerged = this.getRow(cell.row + nInserts).getCell(colNumber);
+							const prevMaster = cell.master;
+							const newMaster = this.getRow(prevMaster.row + nInserts).getCell(prevMaster.col);
 							cellToBeMerged.merge(newMaster);
 						}
 					});
@@ -26781,21 +26976,24 @@ var ExcelTS = (function(exports) {
 			}
 			this.workbook.definedNames.spliceRows(this.name, start, count, nInserts);
 		}
-		eachRow(optionsOrIteratee, maybeIteratee) {
+		eachRow(optOrCallback, maybeCallback) {
 			let options;
-			let iteratee;
-			if (typeof optionsOrIteratee === "function") iteratee = optionsOrIteratee;
+			let callback;
+			if (typeof optOrCallback === "function") callback = optOrCallback;
 			else {
-				options = optionsOrIteratee;
-				iteratee = maybeIteratee;
+				options = optOrCallback;
+				callback = maybeCallback;
 			}
 			if (options && options.includeEmpty) {
 				const n = this._rows.length;
-				for (let i$1 = 1; i$1 <= n; i$1++) iteratee(this.getRow(i$1), i$1);
+				for (let i$1 = 1; i$1 <= n; i$1++) callback(this.getRow(i$1), i$1);
 			} else this._rows.forEach((row) => {
-				if (row && row.hasValues) iteratee(row, row.number);
+				if (row && row.hasValues) callback(row, row.number);
 			});
 		}
+		/**
+		* Return all rows as sparse array
+		*/
 		getSheetValues() {
 			const rows = [];
 			this._rows.forEach((row) => {
@@ -26803,15 +27001,30 @@ var ExcelTS = (function(exports) {
 			});
 			return rows;
 		}
+		/**
+		* Returns the cell at [r,c] or address given by r. If not found, return undefined
+		*/
 		findCell(r, c) {
 			const address = colCache.getAddress(r, c);
 			const row = this._rows[address.row - 1];
 			return row ? row.findCell(address.col) : void 0;
 		}
+		/**
+		* Get or create cell at [r,c] or address given by r
+		*/
 		getCell(r, c) {
 			const address = colCache.getAddress(r, c);
 			return this.getRow(address.row).getCellEx(address);
 		}
+		/**
+		* Merge cells, either:
+		*
+		* tlbr string, e.g. `'A4:B5'`
+		*
+		* tl string, br string, e.g. `'G10', 'H11'`
+		*
+		* t, l, b, r numbers, e.g. `10,11,12,13`
+		*/
 		mergeCells(...cells) {
 			const dimensions = new Range(cells);
 			this._mergeCellsInternal(dimensions);
@@ -26838,6 +27051,11 @@ var ExcelTS = (function(exports) {
 		get hasMerges() {
 			return Object.values(this._merges).some(Boolean);
 		}
+		/**
+		* Scan the range and if any cell is part of a merge, un-merge the group.
+		* Note this function can affect multiple merges and merge-blocks are
+		* atomic - either they're all merged or all un-merged.
+		*/
 		unMergeCells(...cells) {
 			const dimensions = new Range(cells);
 			for (let i$1 = dimensions.top; i$1 <= dimensions.bottom; i$1++) for (let j = dimensions.left; j <= dimensions.right; j++) {
@@ -26860,7 +27078,8 @@ var ExcelTS = (function(exports) {
 			else getResult = () => void 0;
 			let first = true;
 			for (let r = top; r <= bottom; r++) for (let c = left; c <= right; c++) if (first) {
-				this.getCell(r, c).value = {
+				const cell = this.getCell(r, c);
+				cell.value = {
 					shareType,
 					formula,
 					ref: range$1,
@@ -26872,6 +27091,10 @@ var ExcelTS = (function(exports) {
 				result: getResult(r, c)
 			} : getResult(r, c);
 		}
+		/**
+		* Using the image id from `Workbook.addImage`,
+		* embed an image within the worksheet to cover a range
+		*/
 		addImage(imageId, range$1) {
 			const model = {
 				type: "image",
@@ -26883,6 +27106,9 @@ var ExcelTS = (function(exports) {
 		getImages() {
 			return this._media.filter((m) => m.type === "image");
 		}
+		/**
+		* Using the image id from `Workbook.addImage`, set the background to the worksheet
+		*/
 		addBackgroundImage(imageId) {
 			const model = {
 				type: "background",
@@ -26894,6 +27120,9 @@ var ExcelTS = (function(exports) {
 			const image = this._media.find((m) => m.type === "background");
 			return image && image.imageId;
 		}
+		/**
+		* Protect the worksheet with optional password and options
+		*/
 		protect(password, options) {
 			return new Promise((resolve) => {
 				this.sheetProtection = { sheet: true };
@@ -26914,17 +27143,29 @@ var ExcelTS = (function(exports) {
 		unprotect() {
 			this.sheetProtection = null;
 		}
+		/**
+		* Add a new table and return a reference to it
+		*/
 		addTable(model) {
 			const table = new Table(this, model);
 			this.tables[model.name] = table;
 			return table;
 		}
+		/**
+		* Fetch table by name
+		*/
 		getTable(name) {
 			return this.tables[name];
 		}
+		/**
+		* Delete table by name
+		*/
 		removeTable(name) {
 			delete this.tables[name];
 		}
+		/**
+		* Fetch all tables in the worksheet
+		*/
 		getTables() {
 			return Object.values(this.tables);
 		}
@@ -26936,9 +27177,15 @@ Please leave feedback at https://github.com/excelts/excelts/discussions/2575`);
 			this.workbook.pivotTables.push(pivotTable);
 			return pivotTable;
 		}
+		/**
+		* Add conditional formatting rules
+		*/
 		addConditionalFormatting(cf) {
 			this.conditionalFormattings.push(cf);
 		}
+		/**
+		* Delete conditional formatting rules
+		*/
 		removeConditionalFormatting(filter) {
 			if (typeof filter === "number") this.conditionalFormattings.splice(filter, 1);
 			else if (filter instanceof Function) this.conditionalFormattings = this.conditionalFormattings.filter(filter);
@@ -26962,7 +27209,7 @@ Please leave feedback at https://github.com/excelts/excelts/discussions/2575`);
 				pivotTables: this.pivotTables,
 				conditionalFormattings: this.conditionalFormattings
 			};
-			model.cols = Column.toModel(this.columns);
+			model.cols = Column.toModel(this.columns || []);
 			const rows = model.rows = [];
 			const dimensions = model.dimensions = new Range();
 			this._rows.forEach((row) => {
@@ -27150,11 +27397,12 @@ Please leave feedback at https://github.com/excelts/excelts/discussions/2575`);
 		}
 		add(locStr, name) {
 			const location = colCache.decodeEx(locStr);
+			if ("error" in location) return;
 			this.addEx(location, name);
 		}
 		addEx(location, name) {
 			const matrix = this.getMatrix(name);
-			if (location.top) for (let col = location.left; col <= location.right; col++) for (let row = location.top; row <= location.bottom; row++) {
+			if ("top" in location) for (let col = location.left; col <= location.right; col++) for (let row = location.top; row <= location.bottom; row++) {
 				const address = {
 					sheetName: location.sheetName,
 					address: colCache.n2l(col) + row,
@@ -27167,14 +27415,28 @@ Please leave feedback at https://github.com/excelts/excelts/discussions/2575`);
 		}
 		remove(locStr, name) {
 			const location = colCache.decodeEx(locStr);
+			if ("error" in location) return;
 			this.removeEx(location, name);
 		}
 		removeEx(location, name) {
-			this.getMatrix(name).removeCellEx(location);
+			const matrix = this.getMatrix(name);
+			if ("top" in location) for (let col = location.left; col <= location.right; col++) for (let row = location.top; row <= location.bottom; row++) matrix.removeCellEx({
+				sheetName: location.sheetName,
+				address: colCache.n2l(col) + row,
+				row,
+				col
+			});
+			else matrix.removeCellEx(location);
 		}
 		removeAllNames(location) {
 			Object.values(this.matrixMap).forEach((matrix) => {
-				matrix.removeCellEx(location);
+				if ("top" in location) for (let col = location.left; col <= location.right; col++) for (let row = location.top; row <= location.bottom; row++) matrix.removeCellEx({
+					sheetName: location.sheetName,
+					address: colCache.n2l(col) + row,
+					row,
+					col
+				});
+				else matrix.removeCellEx(location);
 			});
 		}
 		forEach(callback) {
@@ -27185,10 +27447,12 @@ Please leave feedback at https://github.com/excelts/excelts/discussions/2575`);
 			});
 		}
 		getNames(addressStr) {
-			return this.getNamesEx(colCache.decodeEx(addressStr));
+			const location = colCache.decodeEx(addressStr);
+			if ("error" in location || "top" in location) return [];
+			return this.getNamesEx(location);
 		}
 		getNamesEx(address) {
-			return Object.entries(this.matrixMap).map(([name, matrix]) => matrix.findCellEx(address, false) && name).filter(Boolean);
+			return Object.entries(this.matrixMap).map(([name, matrix]) => matrix.findCellEx(address, false) && name).filter((name) => Boolean(name));
 		}
 		_explore(matrix, cell) {
 			cell.mark = false;
@@ -27196,8 +27460,11 @@ Please leave feedback at https://github.com/excelts/excelts/discussions/2575`);
 			const range$1 = new Range(cell.row, cell.col, cell.row, cell.col, sheetName);
 			let x$1;
 			let y;
+			const getCell = (row, col) => {
+				return matrix.findCellAt(sheetName, row, col);
+			};
 			function vGrow(yy, edge) {
-				const c = matrix.findCellAt(sheetName, yy, cell.col);
+				const c = getCell(yy, cell.col);
 				if (!c || !c.mark) return false;
 				range$1[edge] = yy;
 				c.mark = false;
@@ -27208,7 +27475,7 @@ Please leave feedback at https://github.com/excelts/excelts/discussions/2575`);
 			function hGrow(xx, edge) {
 				const cells = [];
 				for (y = range$1.top; y <= range$1.bottom; y++) {
-					const c = matrix.findCellAt(sheetName, y, xx);
+					const c = getCell(y, xx);
 					if (c && c.mark) cells.push(c);
 					else return false;
 				}
@@ -50258,10 +50525,16 @@ ${XMLNS_NAMESPACE}.`);
 			this.pivotTables = [];
 			this._definedNames = new DefinedNames();
 		}
+		/**
+		* xlsx file format operations
+		*/
 		get xlsx() {
 			if (!this._xlsx) this._xlsx = new XLSX(this);
 			return this._xlsx;
 		}
+		/**
+		* csv file format operations
+		*/
 		get csv() {
 			if (!this._csv) this._csv = new CSV(this);
 			return this._csv;
@@ -50270,15 +50543,19 @@ ${XMLNS_NAMESPACE}.`);
 			for (let i$1 = 1; i$1 < this._worksheets.length; i$1++) if (!this._worksheets[i$1]) return i$1;
 			return this._worksheets.length || 1;
 		}
+		/**
+		* Add a new worksheet and return a reference to it
+		*/
 		addWorksheet(name, options) {
 			const id = this.nextId;
 			const lastOrderNo = this._worksheets.reduce((acc, ws) => (ws && ws.orderNo) > acc ? ws.orderNo : acc, 0);
-			const worksheet = new Worksheet(Object.assign({}, options, {
+			const worksheet = new Worksheet({
+				...options,
 				id,
 				name,
 				orderNo: lastOrderNo + 1,
 				workbook: this
-			}));
+			});
 			this._worksheets[id] = worksheet;
 			return worksheet;
 		}
@@ -50289,17 +50566,28 @@ ${XMLNS_NAMESPACE}.`);
 			const worksheet = this.getWorksheet(id);
 			if (worksheet) worksheet.destroy();
 		}
+		/**
+		* Fetch sheet by name or id
+		*/
 		getWorksheet(id) {
 			if (id === void 0) return this._worksheets.find(Boolean);
 			if (typeof id === "number") return this._worksheets[id];
 			if (typeof id === "string") return this._worksheets.find((worksheet) => worksheet && worksheet.name === id);
 		}
+		/**
+		* Return a clone of worksheets in order
+		*/
 		get worksheets() {
 			return this._worksheets.slice(1).sort((a, b) => a.orderNo - b.orderNo).filter(Boolean);
 		}
-		eachSheet(iteratee) {
+		/**
+		* Iterate over all sheets.
+		*
+		* Note: `workbook.worksheets.forEach` will still work but this is better.
+		*/
+		eachSheet(callback) {
 			this.worksheets.forEach((sheet) => {
-				iteratee(sheet, sheet.id);
+				callback(sheet, sheet.id);
 			});
 		}
 		get definedNames() {
@@ -50308,13 +50596,19 @@ ${XMLNS_NAMESPACE}.`);
 		clearThemes() {
 			this._themes = void 0;
 		}
+		/**
+		* Add Image to Workbook and return the id
+		*/
 		addImage(image) {
 			const id = this.media.length;
-			this.media.push(Object.assign({}, image, { type: "image" }));
+			this.media.push({
+				...image,
+				type: "image"
+			});
 			return id;
 		}
 		getImage(id) {
-			return this.media[id];
+			return this.media[Number(id)];
 		}
 		get model() {
 			return {
@@ -50963,7 +51257,8 @@ ${XMLNS_NAMESPACE}.`);
 	*/
 	function getCellDisplayText(cell, dateFormat) {
 		const value = cell.value;
-		const fmt = cell.numFmt || "General";
+		const numFmt = cell.numFmt;
+		const fmt = typeof numFmt === "string" ? numFmt : numFmt?.formatCode ?? "General";
 		if (value == null) return "";
 		if (value instanceof Date || typeof value === "number" || typeof value === "boolean" || typeof value === "string") return formatValue(value, fmt, dateFormat);
 		if (typeof value === "object" && "formula" in value) {