@cj-tech-master/excelts 5.1.11 → 5.1.12

package/dist/iife/excelts.iife.js

@@ -1,5 +1,5 @@
 /*!
- * @cj-tech-master/excelts v5.1.11
+ * @cj-tech-master/excelts v5.1.12
  * TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.
  * (c) 2026 cjnoname
  * Released under the MIT License
@@ -3110,12 +3110,46 @@ var ExcelTS = (function(exports) {
 		const i = typeof value === "number" ? value : parseInt(value, 10);
 		return Number.isNaN(i) ? 0 : i;
 	}
+	/**
+	* Split an Excel numFmt string by semicolons, respecting quoted strings and brackets.
+	*
+	* Excel numFmt can have up to 4 sections: `positive ; negative ; zero ; text`.
+	* Semicolons inside `"..."` (literal text) or `[...]` (locale/color tags) must NOT
+	* be treated as section separators.
+	*/
+	function splitFormatSections(fmt) {
+		const sections = [];
+		let current = "";
+		let inQuote = false;
+		let inBracket = false;
+		for (let i = 0; i < fmt.length; i++) {
+			const char = fmt[i];
+			if (char === "\"" && !inBracket) {
+				inQuote = !inQuote;
+				current += char;
+			} else if (char === "[" && !inQuote) {
+				inBracket = true;
+				current += char;
+			} else if (char === "]" && !inQuote) {
+				inBracket = false;
+				current += char;
+			} else if (char === ";" && !inQuote && !inBracket) {
+				sections.push(current);
+				current = "";
+			} else current += char;
+		}
+		sections.push(current);
+		return sections;
+	}
+	/** Reusable regex — no capture groups, so safe for `test()`. */
+	const DATE_FMT_RE = /[ymdhMsb]/;
+	/** Strips bracket expressions `[...]` and quoted literals `"..."` from a format string. */
+	const STRIP_BRACKETS_QUOTES_RE = /\[[^\]]*\]|"[^"]*"/g;
 	function isDateFmt(fmt) {
 		if (!fmt) return false;
-		if (fmt.indexOf("@") > -1) return false;
-		let cleanFmt = fmt.replace(/\[[^\]]*\]/g, "");
-		cleanFmt = cleanFmt.replace(/"[^"]*"/g, "");
-		return cleanFmt.match(/[ymdhMsb]+/) !== null;
+		const clean = splitFormatSections(fmt)[0].replace(STRIP_BRACKETS_QUOTES_RE, "");
+		if (clean.indexOf("@") > -1) return false;
+		return DATE_FMT_RE.test(clean);
 	}
 	function parseBoolean(value) {
 		return value === true || value === "true" || value === 1 || value === "1";
@@ -5757,6 +5791,95 @@ var ExcelTS = (function(exports) {
 		return result;
 	}
 
+//#endregion
+//#region src/modules/excel/utils/merge-borders.ts
+/**
+	* Collect perimeter borders from cells before a merge is applied.
+	* Must be called BEFORE cell.merge() overwrites slave styles.
+	*
+	* Only iterates the four edges of the range, not the full rectangle.
+	* For perimeter edges where the cell has no border, falls back to the master's border.
+	*/
+	function collectMergeBorders(top, left, bottom, right, findCell) {
+		const masterBorder = findCell(top, left)?.style?.border;
+		const width = right - left + 1;
+		const height = bottom - top + 1;
+		const topEdges = new Array(width);
+		const bottomEdges = new Array(width);
+		const leftEdges = new Array(height);
+		const rightEdges = new Array(height);
+		let hasAny = false;
+		for (let j = left; j <= right; j++) {
+			const idx = j - left;
+			const topBorder = findCell(top, j)?.style?.border;
+			topEdges[idx] = topBorder?.top || masterBorder?.top;
+			if (bottom !== top) bottomEdges[idx] = (findCell(bottom, j)?.style?.border)?.bottom || masterBorder?.bottom;
+			else bottomEdges[idx] = topBorder?.bottom || masterBorder?.bottom;
+			if (topEdges[idx] || bottomEdges[idx]) hasAny = true;
+		}
+		for (let i = top; i <= bottom; i++) {
+			const idx = i - top;
+			const leftBorder = findCell(i, left)?.style?.border;
+			leftEdges[idx] = leftBorder?.left || masterBorder?.left;
+			if (right !== left) rightEdges[idx] = (findCell(i, right)?.style?.border)?.right || masterBorder?.right;
+			else rightEdges[idx] = leftBorder?.right || masterBorder?.right;
+			if (leftEdges[idx] || rightEdges[idx]) hasAny = true;
+		}
+		const diagonal = masterBorder?.diagonal;
+		const color = masterBorder?.color;
+		if (!hasAny && !diagonal) return;
+		return {
+			topEdges,
+			bottomEdges,
+			leftEdges,
+			rightEdges,
+			diagonal,
+			color
+		};
+	}
+	/**
+	* Apply position-aware borders to a merged cell range.
+	* Must be called AFTER cell.merge() so that the master style is available.
+	*
+	* Each cell receives a deep-copied style from the master so that
+	* later mutations to one cell do not leak to others.
+	*/
+	function applyMergeBorders(top, left, bottom, right, collected, getCell) {
+		const { topEdges, bottomEdges, leftEdges, rightEdges, diagonal, color } = collected;
+		const masterStyle = getCell(top, left).style;
+		for (let i = top; i <= bottom; i++) for (let j = left; j <= right; j++) {
+			const cell = getCell(i, j);
+			const style = copyStyle(masterStyle) || {};
+			const newBorder = {};
+			let hasBorder = false;
+			if (i === top && topEdges[j - left]) {
+				newBorder.top = topEdges[j - left];
+				hasBorder = true;
+			}
+			if (i === bottom && bottomEdges[j - left]) {
+				newBorder.bottom = bottomEdges[j - left];
+				hasBorder = true;
+			}
+			if (j === left && leftEdges[i - top]) {
+				newBorder.left = leftEdges[i - top];
+				hasBorder = true;
+			}
+			if (j === right && rightEdges[i - top]) {
+				newBorder.right = rightEdges[i - top];
+				hasBorder = true;
+			}
+			if (diagonal) {
+				newBorder.diagonal = diagonal;
+				hasBorder = true;
+			}
+			if (hasBorder) {
+				if (color) newBorder.color = color;
+				style.border = newBorder;
+			} else delete style.border;
+			cell.style = style;
+		}
+	}
+
 //#endregion
 //#region src/modules/excel/worksheet.ts
 	var Worksheet = class {
@@ -6273,8 +6396,11 @@ var ExcelTS = (function(exports) {
 			Object.values(this._merges).forEach((merge) => {
 				if (merge.intersects(dimensions)) throw new Error("Cannot merge already merged cells");
 			});
+			const { top, left, bottom, right } = dimensions;
+			const collected = ignoreStyle ? void 0 : collectMergeBorders(top, left, bottom, right, (r, c) => this.findCell(r, c));
 			const master = this.getCell(dimensions.top, dimensions.left);
-			for (let i = dimensions.top; i <= dimensions.bottom; i++) for (let j = dimensions.left; j <= dimensions.right; j++) if (i > dimensions.top || j > dimensions.left) this.getCell(i, j).merge(master, ignoreStyle);
+			for (let i = top; i <= bottom; i++) for (let j = left; j <= right; j++) if (i > top || j > left) this.getCell(i, j).merge(master, ignoreStyle);
+			if (collected) applyMergeBorders(top, left, bottom, right, collected, (r, c) => this.getCell(r, c));
 			this._merges[master.address] = dimensions;
 		}
 		_unMergeMaster(master) {
@@ -24301,8 +24427,11 @@ var ExcelTS = (function(exports) {
 			this._merges.forEach((merge) => {
 				if (merge.intersects(dimensions)) throw new Error("Cannot merge already merged cells");
 			});
-			const master = this.getCell(dimensions.top, dimensions.left);
-			for (let i = dimensions.top; i <= dimensions.bottom; i++) for (let j = dimensions.left; j <= dimensions.right; j++) if (i > dimensions.top || j > dimensions.left) this.getCell(i, j).merge(master);
+			const { top, left, bottom, right } = dimensions;
+			const collected = collectMergeBorders(top, left, bottom, right, (r, c) => this.findCell(r, c));
+			const master = this.getCell(top, left);
+			for (let i = top; i <= bottom; i++) for (let j = left; j <= right; j++) if (i > top || j > left) this.getCell(i, j).merge(master);
+			if (collected) applyMergeBorders(top, left, bottom, right, collected, (r, c) => this.getCell(r, c));
 			this._merges.push(dimensions);
 		}
 		addConditionalFormatting(cf) {
@@ -27474,12 +27603,12 @@ onmessage = async (ev) => {
 	*/
 	function chooseFormat(fmt, val) {
 		if (typeof val === "string") {
-			const sections = splitFormat(fmt);
+			const sections = splitFormatSections(fmt);
 			if (sections.length >= 4 && sections[3]) return processQuotedText(sections[3]).replace(/@/g, val);
 			return val;
 		}
 		if (typeof val === "boolean") return val ? "TRUE" : "FALSE";
-		const sections = splitFormat(fmt);
+		const sections = splitFormatSections(fmt);
 		const condRegex = /\[(=|>|<|>=|<=|<>)-?\d+(?:\.\d*)?\]/;
 		if ((sections[0] && condRegex.test(sections[0]) || sections[1] && condRegex.test(sections[1])) && sections.length >= 2) {
 			for (let i = 0; i < Math.min(sections.length, 2); i++) {
@@ -27498,37 +27627,10 @@ onmessage = async (ev) => {
 	* Check if format section is for negative values (2nd section in multi-section format)
 	*/
 	function isNegativeSection(fmt, selectedFmt) {
-		const sections = splitFormat(fmt);
+		const sections = splitFormatSections(fmt);
 		return sections.length >= 2 && sections[1] === selectedFmt;
 	}
 	/**
-	* Split format string by semicolons, respecting quoted strings and brackets
-	*/
-	function splitFormat(fmt) {
-		const sections = [];
-		let current = "";
-		let inQuote = false;
-		let inBracket = false;
-		for (let i = 0; i < fmt.length; i++) {
-			const char = fmt[i];
-			if (char === "\"" && !inBracket) {
-				inQuote = !inQuote;
-				current += char;
-			} else if (char === "[" && !inQuote) {
-				inBracket = true;
-				current += char;
-			} else if (char === "]" && !inQuote) {
-				inBracket = false;
-				current += char;
-			} else if (char === ";" && !inQuote && !inBracket) {
-				sections.push(current);
-				current = "";
-			} else current += char;
-		}
-		sections.push(current);
-		return sections;
-	}
-	/**
 	* Main format function - formats a value according to Excel numFmt
 	* @param fmt The Excel number format string (e.g., "0.00%", "#,##0", "yyyy-mm-dd")
 	* @param val The value to format