@simplysm/excel 13.0.76 → 13.0.78

package/src/excel-worksheet.ts

@@ -1,6 +1,6 @@
 import type { Bytes } from "@simplysm/core-common";
 import "@simplysm/core-common";
-import { strIsNullOrEmpty } from "@simplysm/core-common";
+import { str } from "@simplysm/core-common";
 import mime from "mime";
 import type { ExcelCell } from "./excel-cell";
 import { ExcelCol } from "./excel-col";
@@ -109,21 +109,20 @@ export class ExcelWorksheet {
     const wsData = await this._getWsData();
     const range = wsData.range;
 
-    // Increment row index by 1 for all merge cells at or below targetR
-    const mergeCells = wsData.getMergeCells();
-    for (const mc of mergeCells) {
-      if (mc.s.r >= targetR) mc.s.r++;
-      if (mc.e.r >= targetR) mc.e.r++;
-    }
+    // Shift merge cells at or below targetR down by 1
+    wsData.shiftMergeCells(targetR, 1);
 
     // When srcR >= targetR, adjust for the shifted position of srcR
     const adjustedSrcR = srcR >= targetR ? srcR + 1 : srcR;
 
+    // Shift existing rows down (from bottom to top to avoid overwriting)
+    // Use skipMerge: true because merge cells are already shifted above
     for (let r = range.e.r; r >= targetR; r--) {
-      await this.copyRow(r, r + 1);
+      wsData.copyRow(r, r + 1, { skipMerge: true });
     }
 
-    await this.copyRow(adjustedSrcR, targetR);
+    // Copy source row to target position (includes merge handling)
+    wsData.copyRow(adjustedSrcR, targetR);
   }
 
   //#endregion
@@ -172,7 +171,7 @@ export class ExcelWorksheet {
     const startRow = opt?.headerRowIndex ?? range.s.r;
 
     for (let c = range.s.c; c <= range.e.c; c++) {
-      const headerName = await this.cell(startRow, c).getVal();
+      const headerName = await this.cell(startRow, c).getValue();
       if (typeof headerName === "string") {
         if (opt?.usableHeaderNameFn == null || opt.usableHeaderNameFn(headerName)) {
           headerMap.set(headerName, c);
@@ -183,7 +182,7 @@ export class ExcelWorksheet {
     for (let r = startRow + 1; r <= range.e.r; r++) {
       if (
         opt?.checkEndColIndex !== undefined &&
-        (await this.cell(r, opt.checkEndColIndex).getVal()) === undefined
+        (await this.cell(r, opt.checkEndColIndex).getValue()) === undefined
       ) {
         break;
       }
@@ -191,7 +190,7 @@ export class ExcelWorksheet {
       const record: Record<string, ExcelValueType> = {};
       for (const header of headerMap.keys()) {
         const c = headerMap.get(header)!;
-        record[header] = await this.cell(r, c).getVal();
+        record[header] = await this.cell(r, c).getValue();
       }
 
       result.push(record);
@@ -207,7 +206,7 @@ export class ExcelWorksheet {
   async setDataMatrix(matrix: ExcelValueType[][]): Promise<void> {
     for (let r = 0; r < matrix.length; r++) {
       for (let c = 0; c < matrix[r].length; c++) {
-        await this.cell(r, c).setVal(matrix[r][c]);
+        await this.cell(r, c).setValue(matrix[r][c]);
       }
     }
   }
@@ -220,15 +219,15 @@ export class ExcelWorksheet {
     const headers = records
       .flatMap((item) => Object.keys(item))
       .distinct()
-      .filter((item) => !strIsNullOrEmpty(item));
+      .filter((item) => !str.isNullOrEmpty(item));
 
     for (let c = 0; c < headers.length; c++) {
-      await this.cell(0, c).setVal(headers[c]);
+      await this.cell(0, c).setValue(headers[c]);
     }
 
     for (let r = 1; r < records.length + 1; r++) {
       for (let c = 0; c < headers.length; c++) {
-        await this.cell(r, c).setVal(records[r - 1][headers[c]]);
+        await this.cell(r, c).setValue(records[r - 1][headers[c]]);
       }
     }
   }
@@ -247,12 +246,12 @@ export class ExcelWorksheet {
   }
 
   /** Set freeze panes for rows/columns */
-  async setFix(point: { r?: number; c?: number }): Promise<void> {
+  async freezeAt(point: { r?: number; c?: number }): Promise<void> {
     const wbXml = await this._getWbData();
     wbXml.initializeView();
 
     const wsXml = await this._getWsData();
-    wsXml.setFix(point);
+    wsXml.freezeAt(point);
   }
 
   //#endregion

package/src/excel-wrapper.ts

@@ -1,5 +1,5 @@
 import type { Bytes } from "@simplysm/core-common";
-import { DateOnly, DateTime, numParseFloat, Time } from "@simplysm/core-common";
+import { DateOnly, DateTime, num, Time } from "@simplysm/core-common";
 import {
   type z,
   ZodBoolean,
@@ -98,7 +98,7 @@ export class ExcelWrapper<TSchema extends z.ZodObject<z.ZodRawShape>> {
    * @example
    * ```typescript
    * await using wb = await wrapper.write("Sheet1", records);
-   * const bytes = await wb.getBytes();
+   * const bytes = await wb.toBytes();
    * ```
    */
   async write(
@@ -107,7 +107,7 @@ export class ExcelWrapper<TSchema extends z.ZodObject<z.ZodRawShape>> {
     options?: { excludes?: (keyof z.infer<TSchema>)[] },
   ): Promise<ExcelWorkbook> {
     const wb = new ExcelWorkbook();
-    const ws = await wb.createWorksheet(wsName);
+    const ws = await wb.addWorksheet(wsName);
 
     const displayNameMap = this._getDisplayNameMap(options?.excludes as string[] | undefined);
     const keys = Object.keys(displayNameMap) as (keyof z.infer<TSchema>)[];
@@ -115,7 +115,7 @@ export class ExcelWrapper<TSchema extends z.ZodObject<z.ZodRawShape>> {
 
     // Write header row
     for (let c = 0; c < headers.length; c++) {
-      await ws.cell(0, c).setVal(headers[c]);
+      await ws.cell(0, c).setValue(headers[c]);
     }
 
     // Write data rows
@@ -123,7 +123,7 @@ export class ExcelWrapper<TSchema extends z.ZodObject<z.ZodRawShape>> {
       for (let c = 0; c < keys.length; c++) {
         const key = keys[c];
         const value = records[r][key] as ExcelValueType;
-        await ws.cell(r + 1, c).setVal(value);
+        await ws.cell(r + 1, c).setValue(value);
       }
     }
 
@@ -151,7 +151,7 @@ export class ExcelWrapper<TSchema extends z.ZodObject<z.ZodRawShape>> {
 
     // View settings
     await ws.setZoom(85);
-    await ws.setFix({ r: 0 });
+    await ws.freezeAt({ r: 0 });
 
     return wb;
   }
@@ -188,7 +188,7 @@ export class ExcelWrapper<TSchema extends z.ZodObject<z.ZodRawShape>> {
 
     if (innerSchema instanceof ZodNumber) {
       if (typeof rawValue === "number") return rawValue;
-      return numParseFloat(String(rawValue));
+      return num.parseFloat(String(rawValue));
     }
 
     if (innerSchema instanceof ZodBoolean) {

package/src/types.ts

@@ -143,7 +143,7 @@ export interface ExcelCellData {
   $: {
     r: string; // address (A~)
     s?: string; // styleId
-    t?: string; // type: s(sharedString)
+    t?: ExcelCellType; // type: s(sharedString)
   };
   v?: [string];
   f?: [string];

package/src/utils/excel-utils.ts

@@ -1,4 +1,4 @@
-import { numParseInt } from "@simplysm/core-common";
+import { num } from "@simplysm/core-common";
 import type { ExcelAddressPoint, ExcelAddressRangePoint, ExcelNumberFormat } from "../types";
 
 /**
@@ -35,18 +35,18 @@ export class ExcelUtils {
   }
 
   /** Extract row index from cell address (e.g. "A3" -> 2) */
-  static parseRowAddrCode(addrCode: string): number {
-    const rowAddrCode = /\d*$/.exec(addrCode)?.[0] ?? "";
-    const parsed = numParseInt(rowAddrCode);
+  static parseRowAddr(addr: string): number {
+    const rowAddrCode = /\d*$/.exec(addr)?.[0] ?? "";
+    const parsed = num.parseInt(rowAddrCode);
     if (parsed == null) {
-      throw new Error(`Invalid row address code: ${addrCode}`);
+      throw new Error(`Invalid row address code: ${rowAddrCode}`);
     }
     return parsed - 1;
   }
 
   /** Extract column index from cell address (e.g. "B3" -> 1) */
-  static parseColAddrCode(addrCode: string): number {
-    const colAddrCode = /^[a-zA-Z]*/.exec(addrCode)?.[0] ?? "";
+  static parseColAddr(addr: string): number {
+    const colAddrCode = /^[a-zA-Z]*/.exec(addr)?.[0] ?? "";
 
     let result = 0;
     const revAddr = Array.from(colAddrCode).reverse().join("");
@@ -58,19 +58,19 @@ export class ExcelUtils {
   }
 
   /** Convert cell address to coordinates (e.g. "B3" -> {r: 2, c: 1}) */
-  static parseCellAddrCode(addr: string): ExcelAddressPoint {
+  static parseCellAddr(addr: string): ExcelAddressPoint {
     return {
-      r: ExcelUtils.parseRowAddrCode(addr),
-      c: ExcelUtils.parseColAddrCode(addr),
+      r: ExcelUtils.parseRowAddr(addr),
+      c: ExcelUtils.parseColAddr(addr),
     };
   }
 
   /** Convert range address to coordinates (e.g. "A1:C3" -> {s: {r:0,c:0}, e: {r:2,c:2}}) */
-  static parseRangeAddrCode(rangeAddr: string): ExcelAddressRangePoint {
+  static parseRangeAddr(rangeAddr: string): ExcelAddressRangePoint {
     const parts = rangeAddr.split(":");
     return {
-      s: ExcelUtils.parseCellAddrCode(parts[0]),
-      e: ExcelUtils.parseCellAddrCode(parts[1] ?? parts[0]),
+      s: ExcelUtils.parseCellAddr(parts[0]),
+      e: ExcelUtils.parseCellAddr(parts[1] ?? parts[0]),
     };
   }
 
@@ -102,9 +102,9 @@ export class ExcelUtils {
    * Convert Excel date number to JavaScript timestamp (ms).
    * Excel counts 1900-01-01 as 1 (1899-12-30 is date 0).
    */
-  static convertNumberToTimeTick(num: number): number {
+  static convertNumberToTimeTick(value: number): number {
     const excelBaseDateNumberUtc = Date.UTC(1899, 11, 31);
-    const excelDateNumberUtc = (num - 1) * 24 * 60 * 60 * 1000;
+    const excelDateNumberUtc = (value - 1) * 24 * 60 * 60 * 1000;
     const dateNumberUtc = excelBaseDateNumberUtc + excelDateNumberUtc;
     const date = new Date(dateNumberUtc);
     date.setMinutes(date.getMinutes() + date.getTimezoneOffset());

package/src/utils/zip-cache.ts

@@ -1,5 +1,5 @@
 import type { Bytes } from "@simplysm/core-common";
-import { ZipArchive, xmlStringify, xmlParse } from "@simplysm/core-common";
+import { ZipArchive, xml as xmlU } from "@simplysm/core-common";
 import type {
   ExcelXml,
   ExcelXmlContentTypeData,
@@ -51,7 +51,7 @@ export class ZipCache {
 
     if (filePath.endsWith(".xml") || filePath.endsWith(".rels")) {
       const fileText = new TextDecoder().decode(fileData);
-      const xml = xmlParse(fileText, { stripTagPrefix: true });
+      const xml = xmlU.parse(fileText, { stripTagPrefix: true });
       if (filePath.endsWith(".rels")) {
         this._cache.set(filePath, new ExcelXmlRelationship(xml as ExcelXmlRelationshipData));
       } else if (filePath === "[Content_Types].xml") {
@@ -87,7 +87,7 @@ export class ZipCache {
 
       if ("cleanup" in content) {
         content.cleanup();
-        this._zip.write(filePath, new TextEncoder().encode(xmlStringify(content.data)));
+        this._zip.write(filePath, new TextEncoder().encode(xmlU.stringify(content.data)));
       } else {
         this._zip.write(filePath, content);
       }

package/src/xml/excel-xml-relationship.ts

@@ -1,5 +1,5 @@
 import "@simplysm/core-common";
-import { numParseInt } from "@simplysm/core-common";
+import { num } from "@simplysm/core-common";
 import type { ExcelRelationshipData, ExcelXml, ExcelXmlRelationshipData } from "../types";
 
 /**
@@ -84,6 +84,6 @@ export class ExcelXmlRelationship implements ExcelXml {
     if (match == null) {
       throw new Error(`Invalid relationship ID format: ${rel.$.Id}`);
     }
-    return numParseInt(match[0])!;
+    return num.parseInt(match[0])!;
   }
 }

package/src/xml/excel-xml-style.ts

@@ -9,7 +9,7 @@ import type {
   ExcelXmlStyleDataXf,
 } from "../types";
 import "@simplysm/core-common";
-import { numParseInt, objClone, objEqual } from "@simplysm/core-common";
+import { num, obj } from "@simplysm/core-common";
 
 export interface ExcelStyle {
   numFmtId?: string;
@@ -106,7 +106,7 @@ export class ExcelXmlStyle implements ExcelXml {
   }
 
   addWithClone(id: string, style: ExcelStyle): string {
-    const idNum = numParseInt(id);
+    const idNum = num.parseInt(id);
     if (idNum == null) {
       throw new Error(`Invalid style ID: ${id}`);
     }
@@ -115,7 +115,7 @@ export class ExcelXmlStyle implements ExcelXml {
       throw new Error(`Non-existent style ID: ${id} (Range: 0-${xfArray.length - 1})`);
     }
     const prevXf = xfArray[idNum];
-    const cloneXf = objClone(prevXf);
+    const cloneXf = obj.clone(prevXf);
 
     if (style.numFmtId !== undefined) {
       cloneXf.$.numFmtId = style.numFmtId;
@@ -127,12 +127,12 @@ export class ExcelXmlStyle implements ExcelXml {
     }
 
     if (style.background !== undefined) {
-      const fillIdNum = cloneXf.$.fillId !== undefined ? numParseInt(cloneXf.$.fillId) : undefined;
+      const fillIdNum = cloneXf.$.fillId !== undefined ? num.parseInt(cloneXf.$.fillId) : undefined;
       const prevFill =
         fillIdNum !== undefined ? this.data.styleSheet.fills[0].fill[fillIdNum] : undefined;
 
       if (prevFill != null) {
-        const cloneFill = objClone(prevFill);
+        const cloneFill = obj.clone(prevFill);
         cloneFill.patternFill[0].$.patternType = "solid";
 
         if (cloneFill.patternFill[0].fgColor == null) {
@@ -159,12 +159,12 @@ export class ExcelXmlStyle implements ExcelXml {
 
     if (style.border !== undefined) {
       const borderIdNum =
-        cloneXf.$.borderId !== undefined ? numParseInt(cloneXf.$.borderId) : undefined;
+        cloneXf.$.borderId !== undefined ? num.parseInt(cloneXf.$.borderId) : undefined;
       const prevBorder =
         borderIdNum !== undefined ? this.data.styleSheet.borders[0].border[borderIdNum] : undefined;
 
       if (prevBorder != null) {
-        const cloneBorder = objClone(prevBorder);
+        const cloneBorder = obj.clone(prevBorder);
         this._applyBorderPosition(cloneBorder, "left", style.border.includes("left"));
         this._applyBorderPosition(cloneBorder, "right", style.border.includes("right"));
         this._applyBorderPosition(cloneBorder, "top", style.border.includes("top"));
@@ -185,7 +185,7 @@ export class ExcelXmlStyle implements ExcelXml {
   }
 
   get(id: string): ExcelStyle {
-    const idNum = numParseInt(id);
+    const idNum = num.parseInt(id);
     if (idNum == null) {
       throw new Error(`Invalid style ID: ${id}`);
     }
@@ -197,7 +197,7 @@ export class ExcelXmlStyle implements ExcelXml {
       result.numFmtId = xf.$.numFmtId;
 
       if (xf.$.fillId !== undefined) {
-        const fillIdNum = numParseInt(xf.$.fillId);
+        const fillIdNum = num.parseInt(xf.$.fillId);
         if (fillIdNum != null) {
           const fill = this.data.styleSheet.fills[0].fill[fillIdNum] as
             | ExcelXmlStyleDataFill
@@ -212,7 +212,7 @@ export class ExcelXmlStyle implements ExcelXml {
       }
 
       if (xf.$.borderId !== undefined) {
-        const borderIdNum = numParseInt(xf.$.borderId);
+        const borderIdNum = num.parseInt(xf.$.borderId);
         if (borderIdNum == null) {
           throw new Error(`Invalid border ID: ${xf.$.borderId}`);
         }
@@ -303,9 +303,9 @@ export class ExcelXmlStyle implements ExcelXml {
     const numFmts = this.data.styleSheet.numFmts[0].numFmt;
     const maxItem =
       numFmts.length > 0
-        ? numFmts.orderByDesc((item) => numParseInt(item.$.numFmtId) ?? 180).first()
+        ? numFmts.orderByDesc((item) => num.parseInt(item.$.numFmtId) ?? 180).first()
         : undefined;
-    const maxId = maxItem ? (numParseInt(maxItem.$.numFmtId) ?? 180) : 180;
+    const maxId = maxItem ? (num.parseInt(maxItem.$.numFmtId) ?? 180) : 180;
     const nextNumFmtId = (maxId + 1).toString();
     this.data.styleSheet.numFmts[0].numFmt.push({
       $: {
@@ -314,7 +314,7 @@ export class ExcelXmlStyle implements ExcelXml {
       },
     });
     this.data.styleSheet.numFmts[0].$.count = (
-      (numParseInt(this.data.styleSheet.numFmts[0].$.count) ?? 0) + 1
+      (num.parseInt(this.data.styleSheet.numFmts[0].$.count) ?? 0) + 1
     ).toString();
 
     return nextNumFmtId;
@@ -377,7 +377,7 @@ export class ExcelXmlStyle implements ExcelXml {
   }
 
   private _getSameOrCreateXf(xfItem: ExcelXmlStyleDataXf): string {
-    const prevSameXf = this.data.styleSheet.cellXfs[0].xf.single((item) => objEqual(item, xfItem));
+    const prevSameXf = this.data.styleSheet.cellXfs[0].xf.single((item) => obj.equal(item, xfItem));
 
     if (prevSameXf != null) {
       return this.data.styleSheet.cellXfs[0].xf.indexOf(prevSameXf).toString();
@@ -391,7 +391,7 @@ export class ExcelXmlStyle implements ExcelXml {
 
   private _getSameOrCreateFill(fillItem: ExcelXmlStyleDataFill): string {
     const prevSameFill = this.data.styleSheet.fills[0].fill.single((item) =>
-      objEqual(item, fillItem),
+      obj.equal(item, fillItem),
     );
 
     if (prevSameFill != null) {
@@ -405,7 +405,7 @@ export class ExcelXmlStyle implements ExcelXml {
 
   private _getSameOrCreateBorder(borderItem: ExcelXmlStyleDataBorder): string {
     const prevSameBorder = this.data.styleSheet.borders[0].border.single((item) =>
-      objEqual(item, borderItem),
+      obj.equal(item, borderItem),
     );
 
     if (prevSameBorder != null) {

package/src/xml/excel-xml-workbook.ts

@@ -1,5 +1,5 @@
 import "@simplysm/core-common";
-import { numParseInt } from "@simplysm/core-common";
+import { num } from "@simplysm/core-common";
 import type { ExcelXml, ExcelXmlWorkbookData } from "../types";
 
 /**
@@ -27,8 +27,8 @@ export class ExcelXmlWorkbook implements ExcelXml {
   get lastWsRelId(): number | undefined {
     const sheets = this.data.workbook.sheets?.[0].sheet;
     if (!sheets || sheets.length === 0) return undefined;
-    const maxSheet = sheets.orderByDesc((sheet) => numParseInt(sheet.$["r:id"])!).first();
-    return maxSheet ? numParseInt(maxSheet.$["r:id"]) : undefined;
+    const maxSheet = sheets.orderByDesc((sheet) => num.parseInt(sheet.$["r:id"])!).first();
+    return maxSheet ? num.parseInt(maxSheet.$["r:id"]) : undefined;
   }
 
   get sheetNames(): string[] {
@@ -81,7 +81,7 @@ export class ExcelXmlWorkbook implements ExcelXml {
   }
 
   getWsRelIdByName(name: string): number | undefined {
-    return numParseInt(
+    return num.parseInt(
       (this.data.workbook.sheets?.[0].sheet ?? []).single((item) => item.$.name === name)?.$[
         "r:id"
       ],
@@ -89,7 +89,7 @@ export class ExcelXmlWorkbook implements ExcelXml {
   }
 
   getWsRelIdByIndex(index: number): number | undefined {
-    return numParseInt(this.data.workbook.sheets?.[0].sheet[index]?.$["r:id"]);
+    return num.parseInt(this.data.workbook.sheets?.[0].sheet[index]?.$["r:id"]);
   }
 
   getWorksheetNameById(id: number): string | undefined {
@@ -107,7 +107,7 @@ export class ExcelXmlWorkbook implements ExcelXml {
 
   private _getSheetDataById(id: number) {
     return (this.data.workbook.sheets?.[0].sheet ?? []).single(
-      (item) => numParseInt(item.$["r:id"]) === id,
+      (item) => num.parseInt(item.$["r:id"]) === id,
     );
   }
 

package/src/xml/excel-xml-worksheet.ts

@@ -7,7 +7,7 @@ import type {
   ExcelXmlWorksheetData,
 } from "../types";
 import { ExcelUtils } from "../utils/excel-utils";
-import { numParseInt, objClone } from "@simplysm/core-common";
+import { num, obj } from "@simplysm/core-common";
 import "@simplysm/core-common";
 
 interface RowInfo {
@@ -46,11 +46,11 @@ export class ExcelXmlWorksheet implements ExcelXml {
     }
 
     this._dataMap = (this.data.worksheet.sheetData[0].row ?? []).toMap(
-      (row) => ExcelUtils.parseRowAddrCode(row.$.r),
+      (row) => ExcelUtils.parseRowAddr(row.$.r),
       (row) => ({
         data: row,
         cellMap: (row.c ?? []).toMap(
-          (cell) => ExcelUtils.parseColAddrCode(cell.$.r),
+          (cell) => ExcelUtils.parseColAddr(cell.$.r),
           (cell) => cell,
         ),
       }),
@@ -85,7 +85,7 @@ export class ExcelXmlWorksheet implements ExcelXml {
   }
 
   getCellType(addr: { r: number; c: number }): ExcelCellType | undefined {
-    return this._getCellData(addr)?.$.t as ExcelCellType | undefined;
+    return this._getCellData(addr)?.$.t;
   }
 
   setCellVal(addr: { r: number; c: number }, val: string | undefined): void {
@@ -164,7 +164,7 @@ export class ExcelXmlWorksheet implements ExcelXml {
     // Check for merge overlap
     const existingMergeCells = mergeCells[0].mergeCell;
     for (const mergeCell of existingMergeCells) {
-      const existingRange = ExcelUtils.parseRangeAddrCode(mergeCell.$.ref);
+      const existingRange = ExcelUtils.parseRangeAddr(mergeCell.$.ref);
 
       if (
         newRange.s.r <= existingRange.e.r &&
@@ -195,7 +195,7 @@ export class ExcelXmlWorksheet implements ExcelXml {
   getMergeCells(): { s: { r: number; c: number }; e: { r: number; c: number } }[] {
     const mergeCells = this.data.worksheet.mergeCells;
     if (mergeCells === undefined) return [];
-    return mergeCells[0].mergeCell.map((item) => ExcelUtils.parseRangeAddrCode(item.$.ref));
+    return mergeCells[0].mergeCell.map((item) => ExcelUtils.parseRangeAddr(item.$.ref));
   }
 
   removeMergeCells(fromAddr: { r: number; c: number }, toAddr: { r: number; c: number }): void {
@@ -204,7 +204,7 @@ export class ExcelXmlWorksheet implements ExcelXml {
     const range = { s: fromAddr, e: toAddr };
 
     const filteredMergeCells = this.data.worksheet.mergeCells[0].mergeCell.filter((item) => {
-      const rangeAddr = ExcelUtils.parseRangeAddrCode(item.$.ref);
+      const rangeAddr = ExcelUtils.parseRangeAddr(item.$.ref);
       return !(
         rangeAddr.s.r >= range.s.r &&
         rangeAddr.e.r <= range.e.r &&
@@ -221,6 +221,24 @@ export class ExcelXmlWorksheet implements ExcelXml {
     }
   }
 
+  shiftMergeCells(fromRow: number, delta: number): void {
+    const mergeCells = this.data.worksheet.mergeCells;
+    if (mergeCells === undefined) return;
+
+    for (const mergeCell of mergeCells[0].mergeCell) {
+      const range = ExcelUtils.parseRangeAddr(mergeCell.$.ref);
+
+      if (range.s.r >= fromRow) {
+        range.s.r += delta;
+      }
+      if (range.e.r >= fromRow) {
+        range.e.r += delta;
+      }
+
+      mergeCell.$.ref = ExcelUtils.stringifyRangeAddr(range);
+    }
+  }
+
   /**
    * Set width of a specific column.
    *
@@ -231,7 +249,7 @@ export class ExcelXmlWorksheet implements ExcelXml {
    * @param width Width to set
    */
   setColWidth(colIndex: string, width: string): void {
-    const colIndexNumber = numParseInt(colIndex);
+    const colIndexNumber = num.parseInt(colIndex);
     if (colIndexNumber == null) {
       throw new Error(`Invalid column index: ${colIndex}`);
     }
@@ -242,8 +260,8 @@ export class ExcelXmlWorksheet implements ExcelXml {
     const col = cols
       ? cols.col.single(
           (item) =>
-            (numParseInt(item.$.min) ?? 0) <= colIndexNumber &&
-            (numParseInt(item.$.max) ?? 0) >= colIndexNumber,
+            (num.parseInt(item.$.min) ?? 0) <= colIndexNumber &&
+            (num.parseInt(item.$.max) ?? 0) >= colIndexNumber,
         )
       : undefined;
 
@@ -257,8 +275,8 @@ export class ExcelXmlWorksheet implements ExcelXml {
         // Multi-column range: split the range and apply new width only to target column
         // e.g.: existing [1~5, width=10], target=3, new width=20
         //     -> [1~2, width=10], [3, width=20], [4~5, width=10]
-        const minNumber = numParseInt(col.$.min) ?? 0;
-        const maxNumber = numParseInt(col.$.max) ?? 0;
+        const minNumber = num.parseInt(col.$.min) ?? 0;
+        const maxNumber = num.parseInt(col.$.max) ?? 0;
 
         let insertIndex = cols.col.indexOf(col);
 
@@ -324,7 +342,7 @@ export class ExcelXmlWorksheet implements ExcelXml {
     this.data.worksheet.sheetViews[0].sheetView[0].$.zoomScale = percent.toString();
   }
 
-  setFix(point: { r?: number; c?: number }): void {
+  freezeAt(point: { r?: number; c?: number }): void {
     this.data.worksheet.sheetViews = this.data.worksheet.sheetViews ?? [
       { sheetView: [{ $: { workbookViewId: "0" } }] },
     ];
@@ -353,13 +371,13 @@ export class ExcelXmlWorksheet implements ExcelXml {
     ];
   }
 
-  copyRow(sourceR: number, targetR: number): void {
+  copyRow(sourceR: number, targetR: number, options?: { skipMerge?: boolean }): void {
     // Clone source ROW data
     const sourceRowInfo = this._dataMap.get(sourceR);
 
     if (sourceRowInfo != null) {
       // Clone rowData
-      const newRowData: ExcelRowData = objClone(sourceRowInfo.data);
+      const newRowData: ExcelRowData = obj.clone(sourceRowInfo.data);
 
       // Update ROW address
       newRowData.$.r = ExcelUtils.stringifyRowAddr(targetR);
@@ -367,7 +385,7 @@ export class ExcelXmlWorksheet implements ExcelXml {
       // Update each CELL address
       if (newRowData.c != null) {
         for (const cellData of newRowData.c) {
-          const colAddr = ExcelUtils.parseColAddrCode(cellData.$.r);
+          const colAddr = ExcelUtils.parseColAddr(cellData.$.r);
           cellData.$.r = ExcelUtils.stringifyAddr({ r: targetR, c: colAddr });
         }
       }
@@ -377,13 +395,20 @@ export class ExcelXmlWorksheet implements ExcelXml {
       this._deleteRow(targetR);
     }
 
+    // Skip merge handling if skipMerge option is true
+    if (options?.skipMerge === true) {
+      return;
+    }
+
+    const allMergeCells = this.getMergeCells();
+
     // Copy and store source row merge cell info first
-    const sourceMergeCells = this.getMergeCells()
+    const sourceMergeCells = allMergeCells
       .filter((mc) => mc.s.r <= sourceR && mc.e.r >= sourceR)
       .map((mc) => ({ s: { ...mc.s }, e: { ...mc.e } }));
 
     // Remove existing merge cells in target row
-    for (const mergeCell of this.getMergeCells()) {
+    for (const mergeCell of allMergeCells) {
       if (mergeCell.s.r <= targetR && mergeCell.e.r >= targetR) {
         this.removeMergeCells(mergeCell.s, mergeCell.e);
       }
@@ -402,7 +427,7 @@ export class ExcelXmlWorksheet implements ExcelXml {
     const sourceCellData = this._getCellData(sourceAddr);
 
     if (sourceCellData != null) {
-      const newCellData = objClone(sourceCellData);
+      const newCellData = obj.clone(sourceCellData);
       newCellData.$.r = ExcelUtils.stringifyAddr(targetAddr);
       this._replaceCellData(targetAddr, newCellData);
     } else {
@@ -445,14 +470,14 @@ export class ExcelXmlWorksheet implements ExcelXml {
 
     // Sort ROWs
     const rowsData = (result.sheetData[0].row = result.sheetData[0].row ?? []);
-    rowsData.sort((a, b) => (numParseInt(a.$.r) ?? 0) - (numParseInt(b.$.r) ?? 0));
+    rowsData.sort((a, b) => (num.parseInt(a.$.r) ?? 0) - (num.parseInt(b.$.r) ?? 0));
 
     // Sort CELLs
     for (const rowData of rowsData) {
       const cellsData = rowData.c;
       if (cellsData == null) continue;
       cellsData.sort(
-        (a, b) => ExcelUtils.parseCellAddrCode(a.$.r).c - ExcelUtils.parseCellAddrCode(b.$.r).c,
+        (a, b) => ExcelUtils.parseCellAddr(a.$.r).c - ExcelUtils.parseCellAddr(b.$.r).c,
       );
     }
 
@@ -506,7 +531,7 @@ export class ExcelXmlWorksheet implements ExcelXml {
     const rowInfo = {
       data: rowData,
       cellMap: (rowData.c ?? []).toMap(
-        (cell) => ExcelUtils.parseColAddrCode(cell.$.r),
+        (cell) => ExcelUtils.parseColAddr(cell.$.r),
         (cell) => cell,
       ),
     };