@cj-tech-master/excelts 5.1.11 → 5.1.12

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

@@ -14,6 +14,7 @@ const encryptor_1 = require("./utils/encryptor.js");
 const utils_1 = require("../../utils/utils.js");
 const pivot_table_1 = require("./pivot-table.js");
 const copy_style_1 = require("./utils/copy-style.js");
+const merge_borders_1 = require("./utils/merge-borders.js");
 // Worksheet requirements
 //  Operate as sheet inside workbook or standalone
 //  Load and Save from file and stream
@@ -737,16 +738,25 @@ class Worksheet {
                 throw new Error("Cannot merge already merged cells");
             }
         });
-        // apply merge
+        const { top, left, bottom, right } = dimensions;
+        // Collect perimeter borders BEFORE merge overwrites slave styles
+        const collected = ignoreStyle
+            ? undefined
+            : (0, merge_borders_1.collectMergeBorders)(top, left, bottom, right, (r, c) => this.findCell(r, c));
+        // Apply merge — slave cells inherit the master's full style
         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++) {
-                // merge all but the master cell
-                if (i > dimensions.top || j > dimensions.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, ignoreStyle);
                 }
             }
         }
+        // Reconstruct position-aware borders (like Excel):
+        // outer borders survive, inner borders are cleared.
+        if (collected) {
+            (0, merge_borders_1.applyMergeBorders)(top, left, bottom, right, collected, (r, c) => this.getCell(r, c));
+        }
         // index merge
         this._merges[master.address] = dimensions;
     }

package/dist/cjs/utils/utils.base.js

@@ -13,6 +13,7 @@ exports.parseOoxmlDate = parseOoxmlDate;
 exports.xmlDecode = xmlDecode;
 exports.xmlEncode = xmlEncode;
 exports.validInt = validInt;
+exports.splitFormatSections = splitFormatSections;
 exports.isDateFmt = isDateFmt;
 exports.parseBoolean = parseBoolean;
 exports.range = range;
@@ -155,19 +156,63 @@ function validInt(value) {
     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;
     }
-    // must not be a string fmt
-    if (fmt.indexOf("@") > -1) {
+    // Only the first section (used for positive numbers / dates) determines
+    // whether the format represents a date.  The "@" text placeholder may
+    // legitimately appear in later sections as a text fallback (e.g. "mm/dd/yyyy;@").
+    const firstSection = splitFormatSections(fmt)[0];
+    // Strip bracket expressions [...] (locale/color tags) and quoted literals "..."
+    // before any further checks so that characters inside them are ignored.
+    const clean = firstSection.replace(STRIP_BRACKETS_QUOTES_RE, "");
+    // "@" in the cleaned section means it's a text format, not a date format.
+    if (clean.indexOf("@") > -1) {
         return false;
     }
-    // must remove all chars inside quotes and []
-    let cleanFmt = fmt.replace(/\[[^\]]*\]/g, "");
-    cleanFmt = cleanFmt.replace(/"[^"]*"/g, "");
-    // then check for date formatting chars
-    return cleanFmt.match(/[ymdhMsb]+/) !== null;
+    return DATE_FMT_RE.test(clean);
 }
 function parseBoolean(value) {
     return value === true || value === "true" || value === 1 || value === "1";

package/dist/cjs/utils/utils.browser.js

@@ -4,7 +4,7 @@
  * Re-exports shared utilities and adds browser-specific implementations
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringToUtf16Le = exports.uint8ArrayToBase64 = exports.base64ToUint8Array = exports.bufferToString = exports.toSortedArray = exports.range = exports.parseBoolean = exports.isDateFmt = exports.validInt = exports.xmlEncode = exports.xmlDecode = exports.parseOoxmlDate = exports.excelToDate = exports.dateToExcel = exports.delay = void 0;
+exports.stringToUtf16Le = exports.uint8ArrayToBase64 = exports.base64ToUint8Array = exports.bufferToString = exports.toSortedArray = exports.range = exports.parseBoolean = exports.splitFormatSections = exports.isDateFmt = exports.validInt = exports.xmlEncode = exports.xmlDecode = exports.parseOoxmlDate = exports.excelToDate = exports.dateToExcel = exports.delay = void 0;
 exports.fileExists = fileExists;
 // Re-export all shared utilities
 var utils_base_1 = require("./utils.base.js");
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "xmlDecode", { enumerable: true, get: function ()
 Object.defineProperty(exports, "xmlEncode", { enumerable: true, get: function () { return utils_base_1.xmlEncode; } });
 Object.defineProperty(exports, "validInt", { enumerable: true, get: function () { return utils_base_1.validInt; } });
 Object.defineProperty(exports, "isDateFmt", { enumerable: true, get: function () { return utils_base_1.isDateFmt; } });
+Object.defineProperty(exports, "splitFormatSections", { enumerable: true, get: function () { return utils_base_1.splitFormatSections; } });
 Object.defineProperty(exports, "parseBoolean", { enumerable: true, get: function () { return utils_base_1.parseBoolean; } });
 Object.defineProperty(exports, "range", { enumerable: true, get: function () { return utils_base_1.range; } });
 Object.defineProperty(exports, "toSortedArray", { enumerable: true, get: function () { return utils_base_1.toSortedArray; } });

package/dist/cjs/utils/utils.js

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringToUtf16Le = exports.uint8ArrayToBase64 = exports.base64ToUint8Array = exports.bufferToString = exports.toSortedArray = exports.range = exports.parseBoolean = exports.isDateFmt = exports.validInt = exports.xmlEncode = exports.xmlDecode = exports.parseOoxmlDate = exports.excelToDate = exports.dateToExcel = exports.delay = void 0;
+exports.stringToUtf16Le = exports.uint8ArrayToBase64 = exports.base64ToUint8Array = exports.bufferToString = exports.toSortedArray = exports.range = exports.parseBoolean = exports.splitFormatSections = exports.isDateFmt = exports.validInt = exports.xmlEncode = exports.xmlDecode = exports.parseOoxmlDate = exports.excelToDate = exports.dateToExcel = exports.delay = void 0;
 exports.fileExists = fileExists;
 const fs_1 = __importDefault(require("fs"));
 // Re-export all shared utilities
@@ -20,6 +20,7 @@ Object.defineProperty(exports, "xmlDecode", { enumerable: true, get: function ()
 Object.defineProperty(exports, "xmlEncode", { enumerable: true, get: function () { return utils_base_1.xmlEncode; } });
 Object.defineProperty(exports, "validInt", { enumerable: true, get: function () { return utils_base_1.validInt; } });
 Object.defineProperty(exports, "isDateFmt", { enumerable: true, get: function () { return utils_base_1.isDateFmt; } });
+Object.defineProperty(exports, "splitFormatSections", { enumerable: true, get: function () { return utils_base_1.splitFormatSections; } });
 Object.defineProperty(exports, "parseBoolean", { enumerable: true, get: function () { return utils_base_1.parseBoolean; } });
 Object.defineProperty(exports, "range", { enumerable: true, get: function () { return utils_base_1.range; } });
 Object.defineProperty(exports, "toSortedArray", { enumerable: true, get: function () { return utils_base_1.toSortedArray; } });

package/dist/esm/modules/excel/stream/worksheet-writer.js

@@ -9,6 +9,7 @@ import { Column } from "../column.js";
 import { SheetRelsWriter } from "./sheet-rels-writer.js";
 import { SheetCommentsWriter } from "./sheet-comments-writer.js";
 import { DataValidations } from "../data-validations.js";
+import { applyMergeBorders, collectMergeBorders } from "../utils/merge-borders.js";
 import { mediaRelTargetFromRels, worksheetPath } from "../utils/ooxml-paths.js";
 const xmlBuffer = new StringBuf();
 // ============================================================================================
@@ -384,15 +385,22 @@ class WorksheetWriter {
                 throw new Error("Cannot merge already merged cells");
             }
         });
-        // apply merge
-        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) {
+        const { top, left, bottom, right } = dimensions;
+        // Collect perimeter borders BEFORE merge overwrites slave styles
+        const collected = collectMergeBorders(top, left, bottom, right, (r, c) => this.findCell(r, c));
+        // Apply merge
+        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);
                 }
             }
         }
+        // Reconstruct position-aware borders (like Excel)
+        if (collected) {
+            applyMergeBorders(top, left, bottom, right, collected, (r, c) => this.getCell(r, c));
+        }
         // index merge
         this._merges.push(dimensions);
     }

package/dist/esm/modules/excel/utils/cell-format.js

@@ -5,7 +5,7 @@
  * Supports: General, percentages, decimals, thousands separators, dates, currencies,
  * scientific notation, fractions, elapsed time, and more
  */
-import { excelToDate } from "../../../utils/utils.js";
+import { excelToDate, splitFormatSections } from "../../../utils/utils.js";
 // =============================================================================
 // Built-in Format Table (Excel numFmtId to format string mapping)
 // =============================================================================
@@ -633,7 +633,7 @@ function checkCondition(val, condition) {
 function chooseFormat(fmt, val) {
     if (typeof val === "string") {
         // For text, use the 4th section if available, or just return as-is
-        const sections = splitFormat(fmt);
+        const sections = splitFormatSections(fmt);
         if (sections.length >= 4 && sections[3]) {
             // Process quoted text and replace @ with the value
             const textFmt = processQuotedText(sections[3]);
@@ -644,7 +644,7 @@ function chooseFormat(fmt, val) {
     if (typeof val === "boolean") {
         return val ? "TRUE" : "FALSE";
     }
-    const sections = splitFormat(fmt);
+    const sections = splitFormatSections(fmt);
     // Check for conditional format in sections
     const condRegex = /\[(=|>|<|>=|<=|<>)-?\d+(?:\.\d*)?\]/;
     const hasCondition = (sections[0] && condRegex.test(sections[0])) || (sections[1] && condRegex.test(sections[1]));
@@ -679,42 +679,9 @@ function chooseFormat(fmt, val) {
  * 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")

package/dist/esm/modules/excel/utils/merge-borders.js

@@ -0,0 +1,105 @@
+import { copyStyle } from "./copy-style.js";
+/**
+ * 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.
+ */
+export 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;
+    // Top & bottom rows
+    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) {
+            const botBorder = findCell(bottom, j)?.style?.border;
+            bottomEdges[idx] = botBorder?.bottom || masterBorder?.bottom;
+        }
+        else {
+            bottomEdges[idx] = topBorder?.bottom || masterBorder?.bottom;
+        }
+        if (topEdges[idx] || bottomEdges[idx]) {
+            hasAny = true;
+        }
+    }
+    // Left & right columns
+    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) {
+            const rightBorder = findCell(i, right)?.style?.border;
+            rightEdges[idx] = rightBorder?.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 undefined;
+    }
+    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.
+ */
+export 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;
+        }
+    }
+}

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

@@ -11,6 +11,7 @@ import { Encryptor } from "./utils/encryptor.js";
 import { uint8ArrayToBase64 } from "../../utils/utils.js";
 import { makePivotTable } from "./pivot-table.js";
 import { copyStyle } from "./utils/copy-style.js";
+import { applyMergeBorders, collectMergeBorders } from "./utils/merge-borders.js";
 // Worksheet requirements
 //  Operate as sheet inside workbook or standalone
 //  Load and Save from file and stream
@@ -734,16 +735,25 @@ class Worksheet {
                 throw new Error("Cannot merge already merged cells");
             }
         });
-        // apply merge
+        const { top, left, bottom, right } = dimensions;
+        // Collect perimeter borders BEFORE merge overwrites slave styles
+        const collected = ignoreStyle
+            ? undefined
+            : collectMergeBorders(top, left, bottom, right, (r, c) => this.findCell(r, c));
+        // Apply merge — slave cells inherit the master's full style
         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++) {
-                // merge all but the master cell
-                if (i > dimensions.top || j > dimensions.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, ignoreStyle);
                 }
             }
         }
+        // Reconstruct position-aware borders (like Excel):
+        // outer borders survive, inner borders are cleared.
+        if (collected) {
+            applyMergeBorders(top, left, bottom, right, collected, (r, c) => this.getCell(r, c));
+        }
         // index merge
         this._merges[master.address] = dimensions;
     }

package/dist/esm/utils/utils.base.js

@@ -138,19 +138,63 @@ export function validInt(value) {
     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.
+ */
+export 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;
 export function isDateFmt(fmt) {
     if (!fmt) {
         return false;
     }
-    // must not be a string fmt
-    if (fmt.indexOf("@") > -1) {
+    // Only the first section (used for positive numbers / dates) determines
+    // whether the format represents a date.  The "@" text placeholder may
+    // legitimately appear in later sections as a text fallback (e.g. "mm/dd/yyyy;@").
+    const firstSection = splitFormatSections(fmt)[0];
+    // Strip bracket expressions [...] (locale/color tags) and quoted literals "..."
+    // before any further checks so that characters inside them are ignored.
+    const clean = firstSection.replace(STRIP_BRACKETS_QUOTES_RE, "");
+    // "@" in the cleaned section means it's a text format, not a date format.
+    if (clean.indexOf("@") > -1) {
         return false;
     }
-    // must remove all chars inside quotes and []
-    let cleanFmt = fmt.replace(/\[[^\]]*\]/g, "");
-    cleanFmt = cleanFmt.replace(/"[^"]*"/g, "");
-    // then check for date formatting chars
-    return cleanFmt.match(/[ymdhMsb]+/) !== null;
+    return DATE_FMT_RE.test(clean);
 }
 export function parseBoolean(value) {
     return value === true || value === "true" || value === 1 || value === "1";

package/dist/esm/utils/utils.browser.js

@@ -3,7 +3,7 @@
  * Re-exports shared utilities and adds browser-specific implementations
  */
 // Re-export all shared utilities
-export { delay, dateToExcel, excelToDate, parseOoxmlDate, xmlDecode, xmlEncode, validInt, isDateFmt, parseBoolean, range, toSortedArray, bufferToString, base64ToUint8Array, uint8ArrayToBase64, stringToUtf16Le } from "./utils.base.js";
+export { delay, dateToExcel, excelToDate, parseOoxmlDate, xmlDecode, xmlEncode, validInt, isDateFmt, splitFormatSections, parseBoolean, range, toSortedArray, bufferToString, base64ToUint8Array, uint8ArrayToBase64, stringToUtf16Le } from "./utils.base.js";
 // =============================================================================
 // File system utilities (Browser stub - always returns false)
 // =============================================================================

package/dist/esm/utils/utils.js

@@ -4,7 +4,7 @@
  */
 import fs from "fs";
 // Re-export all shared utilities
-export { delay, dateToExcel, excelToDate, parseOoxmlDate, xmlDecode, xmlEncode, validInt, isDateFmt, parseBoolean, range, toSortedArray, bufferToString, base64ToUint8Array, uint8ArrayToBase64, stringToUtf16Le } from "./utils.base.js";
+export { delay, dateToExcel, excelToDate, parseOoxmlDate, xmlDecode, xmlEncode, validInt, isDateFmt, splitFormatSections, parseBoolean, range, toSortedArray, bufferToString, base64ToUint8Array, uint8ArrayToBase64, stringToUtf16Le } from "./utils.base.js";
 // =============================================================================
 // File system utilities (Node.js only)
 // =============================================================================