@cj-tech-master/excelts 1.4.2 → 1.4.3

package/dist/browser/excelts.iife.js

@@ -1,5 +1,5 @@
 /*!
- * @cj-tech-master/excelts v1.4.2
+ * @cj-tech-master/excelts v1.4.3
  * TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.
  * (c) 2025 cjnoname
  * Released under the MIT License
@@ -5876,7 +5876,7 @@ var ExcelTS = (function(exports) {
 			if (isUndefined$2(ctx.colors)) ctx.colors = false;
 			if (isUndefined$2(ctx.customInspect)) ctx.customInspect = true;
 			if (ctx.colors) ctx.stylize = stylizeWithColor;
-			return formatValue(ctx, obj, ctx.depth);
+			return formatValue$1(ctx, obj, ctx.depth);
 		}
 		exports.inspect = inspect$1;
 		inspect$1.colors = {
@@ -5919,10 +5919,10 @@ var ExcelTS = (function(exports) {
 			});
 			return hash$4;
 		}
-		function formatValue(ctx, value, recurseTimes) {
+		function formatValue$1(ctx, value, recurseTimes) {
 			if (ctx.customInspect && value && isFunction$4(value.inspect) && value.inspect !== exports.inspect && !(value.constructor && value.constructor.prototype === value)) {
 				var ret = value.inspect(recurseTimes, ctx);
-				if (!isString$1(ret)) ret = formatValue(ctx, ret, recurseTimes);
+				if (!isString$1(ret)) ret = formatValue$1(ctx, ret, recurseTimes);
 				return ret;
 			}
 			var primitive = formatPrimitive(ctx, value);
@@ -5990,8 +5990,8 @@ var ExcelTS = (function(exports) {
 			else if (desc$1.set) str = ctx.stylize("[Setter]", "special");
 			if (!hasOwnProperty$3(visibleKeys, key$1)) name = "[" + key$1 + "]";
 			if (!str) if (ctx.seen.indexOf(desc$1.value) < 0) {
-				if (isNull$1(recurseTimes)) str = formatValue(ctx, desc$1.value, null);
-				else str = formatValue(ctx, desc$1.value, recurseTimes - 1);
+				if (isNull$1(recurseTimes)) str = formatValue$1(ctx, desc$1.value, null);
+				else str = formatValue$1(ctx, desc$1.value, recurseTimes - 1);
 				if (str.indexOf("\n") > -1) if (array) str = str.split("\n").map(function(line) {
 					return "  " + line;
 				}).join("\n").slice(2);
@@ -45096,7 +45096,7 @@ ${XMLNS_NAMESPACE}.`);
 	/**
 	* Check if format is a date format
 	*/
-	function isDateFormat(fmt) {
+	function isDateFormat$1(fmt) {
 		const cleaned = fmt.replace(/\[[^\]]*\]/g, "");
 		return /[ymdhs]/i.test(cleaned) && !/^[#0.,E%$\s()\-+]+$/i.test(cleaned);
 	}
@@ -45166,16 +45166,16 @@ ${XMLNS_NAMESPACE}.`);
 	* @param fmt Format string
 	*/
 	function formatDate(serial, fmt) {
+		const timeOfDay = Math.round(serial * 86400) % 86400;
+		const hours = Math.floor(timeOfDay / 3600);
+		const minutes = Math.floor(timeOfDay % 3600 / 60);
+		const seconds = timeOfDay % 60;
 		const date = excelToDate(serial, false);
-		const year = date.getFullYear();
-		const month = date.getMonth();
-		const day = date.getDate();
-		const hours = date.getHours();
-		const minutes = date.getMinutes();
-		const seconds = date.getSeconds();
-		const dayOfWeek = date.getDay();
-		const totalSeconds = serial * 86400;
-		const fractionalSeconds = totalSeconds - Math.floor(totalSeconds);
+		const year = date.getUTCFullYear();
+		const month = date.getUTCMonth();
+		const day = date.getUTCDate();
+		const dayOfWeek = date.getUTCDay();
+		const fractionalSeconds = serial * 86400 - Math.floor(serial * 86400);
 		const hasAmPm = /AM\/PM|A\/P/i.test(fmt);
 		const isPm = hours >= 12;
 		const hours12 = hours % 12 || 12;
@@ -45510,7 +45510,7 @@ ${XMLNS_NAMESPACE}.`);
 		cleanFmt = processPlaceholders(cleanFmt);
 		cleanFmt = processQuotedText(cleanFmt);
 		if (/\[[hms]+\]/i.test(cleanFmt)) return formatElapsedTime(numVal, cleanFmt);
-		if (isDateFormat(cleanFmt)) return formatDate(numVal, cleanFmt);
+		if (isDateFormat$1(cleanFmt)) return formatDate(numVal, cleanFmt);
 		if (cleanFmt.includes("%")) return formatPercentage(numVal, cleanFmt);
 		if (/E[+-]?/i.test(cleanFmt)) return formatScientific(numVal, cleanFmt);
 		if (/\?+\s*\/\s*[\d?]+/.test(cleanFmt)) return formatFraction(numVal, cleanFmt);
@@ -45542,16 +45542,78 @@ ${XMLNS_NAMESPACE}.`);
 	* Provides convenient helper functions for common spreadsheet operations
 	*/
 	/**
+	* Convert a Date object back to Excel serial number without timezone issues.
+	* This reverses the excelToDate conversion exactly.
+	* excelToDate uses: new Date(Math.round((v - 25569) * 24 * 3600 * 1000))
+	* So we reverse it: (date.getTime() / (24 * 3600 * 1000)) + 25569
+	*/
+	function dateToExcelSerial(d) {
+		return d.getTime() / (24 * 3600 * 1e3) + 25569;
+	}
+	/**
+	* Check if format is a pure time format (no date components like y, m for month, d)
+	* Time formats only contain: h, m (minutes in time context), s, AM/PM
+	* Excludes elapsed time formats like [h]:mm:ss which should keep full serial number
+	*/
+	function isTimeOnlyFormat(fmt) {
+		const cleaned = fmt.replace(/"[^"]*"/g, "");
+		if (/\[[hms]\]/i.test(cleaned)) return false;
+		const withoutBrackets = cleaned.replace(/\[[^\]]*\]/g, "");
+		const hasTimeComponents = /[hs]/i.test(withoutBrackets) || /AM\/PM|A\/P/i.test(withoutBrackets);
+		if (/[yd]/i.test(withoutBrackets)) return false;
+		if (/m/i.test(withoutBrackets) && !hasTimeComponents) return false;
+		return hasTimeComponents;
+	}
+	/**
+	* Check if format is a date format (contains y, d, or month-m)
+	* Used to determine if dateFormat override should be applied
+	*/
+	function isDateFormat(fmt) {
+		const cleaned = fmt.replace(/"[^"]*"/g, "");
+		if (/\[[hms]\]/i.test(cleaned)) return false;
+		const withoutBrackets = cleaned.replace(/\[[^\]]*\]/g, "");
+		if (/[yd]/i.test(withoutBrackets)) return true;
+		if (/m/i.test(withoutBrackets)) {
+			if (!(/[hs]/i.test(withoutBrackets) || /AM\/PM|A\/P/i.test(withoutBrackets))) return true;
+		}
+		return false;
+	}
+	/**
+	* Format a value (Date, number, boolean, string) according to the given format
+	* Handles timezone-independent conversion for Date objects
+	* @param value - The value to format
+	* @param fmt - The format string to use
+	* @param dateFormat - Optional override format for date values (not applied to time or elapsed time formats)
+	*/
+	function formatValue(value, fmt, dateFormat) {
+		if (value instanceof Date) {
+			let serial = dateToExcelSerial(value);
+			if (isTimeOnlyFormat(fmt)) {
+				serial = serial % 1;
+				if (serial < 0) serial += 1;
+				return format(fmt, serial);
+			}
+			return format(dateFormat && isDateFormat(fmt) ? dateFormat : fmt, serial);
+		}
+		return format(fmt, value);
+	}
+	/**
 	* Get formatted display text for a cell value
 	* Returns the value formatted according to the cell's numFmt
-	* This matches Excel's display exactly
+	* This matches Excel's display exactly (timezone-independent)
+	* @param cell - The cell to get display text for
+	* @param dateFormat - Optional override format for date values
 	*/
-	function getCellDisplayText(cell) {
+	function getCellDisplayText(cell, dateFormat) {
 		const value = cell.value;
 		const fmt = cell.numFmt || "General";
 		if (value == null) return "";
-		if (value instanceof Date) return format(fmt, dateToExcel(value, false));
-		if (typeof value === "number" || typeof value === "boolean" || typeof value === "string") return format(fmt, value);
+		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) {
+			const result = value.result;
+			if (result == null) return "";
+			if (result instanceof Date || typeof result === "number" || typeof result === "boolean" || typeof result === "string") return formatValue(result, fmt, dateFormat);
+		}
 		return cell.text;
 	}
 	/**
@@ -45741,7 +45803,7 @@ ${XMLNS_NAMESPACE}.`);
 				let isEmpty = true;
 				for (let col = startCol; col <= endCol; col++) {
 					const cell = worksheet.getCell(row, col);
-					const val = o.raw === false ? getCellDisplayText(cell).trim() : cell.value;
+					const val = o.raw === false ? getCellDisplayText(cell, o.dateFormat).trim() : cell.value;
 					if (val != null && val !== "") {
 						rowData[col - startCol] = val;
 						isEmpty = false;
@@ -45760,7 +45822,7 @@ ${XMLNS_NAMESPACE}.`);
 				let isEmpty = true;
 				for (let col = startCol; col <= endCol; col++) {
 					const cell = worksheet.getCell(row, col);
-					const val = o.raw === false ? getCellDisplayText(cell).trim() : cell.value;
+					const val = o.raw === false ? getCellDisplayText(cell, o.dateFormat).trim() : cell.value;
 					const key$1 = encodeCol(col - 1);
 					if (val != null && val !== "") {
 						rowData[key$1] = val;
@@ -45781,7 +45843,7 @@ ${XMLNS_NAMESPACE}.`);
 					const colIdx = col - startCol;
 					const key$1 = headerOpt[colIdx] ?? `__EMPTY_${colIdx}`;
 					const cell = worksheet.getCell(row, col);
-					const val = o.raw === false ? getCellDisplayText(cell).trim() : cell.value;
+					const val = o.raw === false ? getCellDisplayText(cell, o.dateFormat).trim() : cell.value;
 					if (val != null && val !== "") {
 						rowData[key$1] = val;
 						isEmpty = false;
@@ -45810,7 +45872,7 @@ ${XMLNS_NAMESPACE}.`);
 			let isEmpty = true;
 			for (let col = startCol; col <= endCol; col++) {
 				const cell = worksheet.getCell(row, col);
-				const val = o.raw === false ? getCellDisplayText(cell).trim() : cell.value;
+				const val = o.raw === false ? getCellDisplayText(cell, o.dateFormat).trim() : cell.value;
 				const key$1 = headers[col - startCol];
 				if (val != null && val !== "") {
 					rowData[key$1] = val;