@js-ak/excel-toolbox 1.2.4 → 1.2.6

package/build/cjs/lib/merge-sheets-to-base-file-process.js

@@ -15,15 +15,25 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeSheetsToBaseFileProcess = void 0;
+exports.mergeSheetsToBaseFileProcess = mergeSheetsToBaseFileProcess;
 const Utils = __importStar(require("./utils/index.js"));
 const Xml = __importStar(require("./xml/index.js"));
 /**
@@ -48,7 +58,7 @@ function mergeSheetsToBaseFileProcess(data) {
     if (!baseFiles[basePath]) {
         throw new Error(`Base file does not contain ${basePath}`);
     }
-    const { lastRowNumber, mergeCells: baseMergeCells, rows: baseRows, } = Xml.extractRowsFromSheet(baseFiles[basePath]);
+    const { lastRowNumber, mergeCells: baseMergeCells, rows: baseRows, xml, } = Xml.extractRowsFromSheet(baseFiles[basePath]);
     const allRows = [...baseRows];
     const allMergeCells = [...baseMergeCells];
     let currentRowOffset = lastRowNumber + gap;
@@ -74,23 +84,22 @@ function mergeSheetsToBaseFileProcess(data) {
             currentRowOffset += Utils.getMaxRowNumber(rows) + gap;
         }
     }
-    const mergedXml = Xml.buildMergedSheet(baseFiles[basePath], allRows, allMergeCells);
+    const mergedXml = Xml.buildMergedSheet(xml, allRows, allMergeCells);
     baseFiles[basePath] = mergedXml;
     for (const sheetIndex of sheetsToRemove) {
         const sheetPath = `xl/worksheets/sheet${sheetIndex}.xml`;
         delete baseFiles[sheetPath];
         if (baseFiles["xl/workbook.xml"]) {
-            baseFiles["xl/workbook.xml"] = Utils.removeSheetFromWorkbook(baseFiles["xl/workbook.xml"], sheetIndex);
+            baseFiles["xl/workbook.xml"] = Buffer.from(Utils.removeSheetFromWorkbook(baseFiles["xl/workbook.xml"].toString(), sheetIndex));
         }
         if (baseFiles["xl/_rels/workbook.xml.rels"]) {
-            baseFiles["xl/_rels/workbook.xml.rels"] = Utils.removeSheetFromRels(baseFiles["xl/_rels/workbook.xml.rels"], sheetIndex);
+            baseFiles["xl/_rels/workbook.xml.rels"] = Buffer.from(Utils.removeSheetFromRels(baseFiles["xl/_rels/workbook.xml.rels"].toString(), sheetIndex));
         }
         if (baseFiles["[Content_Types].xml"]) {
-            baseFiles["[Content_Types].xml"] = Utils.removeSheetFromContentTypes(baseFiles["[Content_Types].xml"], sheetIndex);
+            baseFiles["[Content_Types].xml"] = Buffer.from(Utils.removeSheetFromContentTypes(baseFiles["[Content_Types].xml"].toString(), sheetIndex));
         }
     }
     for (const sheetName of sheetNamesToRemove) {
         Utils.removeSheetByName(baseFiles, sheetName);
     }
 }
-exports.mergeSheetsToBaseFileProcess = mergeSheetsToBaseFileProcess;

package/build/cjs/lib/merge-sheets-to-base-file-sync.js

@@ -15,15 +15,25 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeSheetsToBaseFileSync = void 0;
+exports.mergeSheetsToBaseFileSync = mergeSheetsToBaseFileSync;
 const Utils = __importStar(require("./utils/index.js"));
 const Zip = __importStar(require("./zip/index.js"));
 const merge_sheets_to_base_file_process_js_1 = require("./merge-sheets-to-base-file-process.js");
@@ -65,4 +75,3 @@ function mergeSheetsToBaseFileSync(data) {
     });
     return Zip.createSync(baseFiles);
 }
-exports.mergeSheetsToBaseFileSync = mergeSheetsToBaseFileSync;

package/build/cjs/lib/merge-sheets-to-base-file.js

@@ -15,15 +15,25 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeSheetsToBaseFile = void 0;
+exports.mergeSheetsToBaseFile = mergeSheetsToBaseFile;
 const Utils = __importStar(require("./utils/index.js"));
 const Zip = __importStar(require("./zip/index.js"));
 const merge_sheets_to_base_file_process_js_1 = require("./merge-sheets-to-base-file-process.js");
@@ -65,4 +75,3 @@ async function mergeSheetsToBaseFile(data) {
     });
     return Zip.create(baseFiles);
 }
-exports.mergeSheetsToBaseFile = mergeSheetsToBaseFile;

package/build/cjs/lib/utils/get-max-row-number.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMaxRowNumber = void 0;
+exports.getMaxRowNumber = getMaxRowNumber;
 /**
  * Finds the maximum row number in a list of <row> elements.
  * @param {string[]} rows - An array of strings, each representing a <row> element.
@@ -20,4 +20,3 @@ function getMaxRowNumber(rows) {
     }
     return max;
 }
-exports.getMaxRowNumber = getMaxRowNumber;

package/build/cjs/lib/utils/is-same-buffer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSameBuffer = void 0;
+exports.isSameBuffer = isSameBuffer;
 /**
  * Checks if two Buffers are the same
  * @param {Buffer} buf1 - the first Buffer
@@ -10,4 +10,3 @@ exports.isSameBuffer = void 0;
 function isSameBuffer(buf1, buf2) {
     return buf1.equals(buf2);
 }
-exports.isSameBuffer = isSameBuffer;

package/build/cjs/lib/utils/remove-sheet-by-name.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSheetByName = void 0;
+exports.removeSheetByName = removeSheetByName;
 /**
  * Removes a sheet from the Excel workbook by name.
  * @param {Object.<string, string | Buffer>} files - The dictionary of files in the workbook.
@@ -8,8 +8,8 @@ exports.removeSheetByName = void 0;
  * @returns {void}
  */
 function removeSheetByName(files, sheetName) {
-    const workbookXml = files["xl/workbook.xml"];
-    const relsXml = files["xl/_rels/workbook.xml.rels"];
+    const workbookXml = files["xl/workbook.xml"]?.toString();
+    const relsXml = files["xl/_rels/workbook.xml.rels"]?.toString();
     if (!workbookXml || !relsXml) {
         return;
     }
@@ -34,12 +34,13 @@ function removeSheetByName(files, sheetName) {
         return;
     }
     const targetPath = `xl/${targetMatch[1]}`.replace(/\\/g, "/");
-    delete files[targetPath];
-    files["xl/workbook.xml"] = workbookXml.replace(sheetTag, "");
-    files["xl/_rels/workbook.xml.rels"] = relsXml.replace(relTag, "");
-    const contentTypes = files["[Content_Types].xml"];
+    if (targetPath) {
+        delete files[targetPath];
+    }
+    files["xl/workbook.xml"] = Buffer.from(workbookXml.replace(sheetTag, ""));
+    files["xl/_rels/workbook.xml.rels"] = Buffer.from(relsXml.replace(relTag, ""));
+    const contentTypes = files["[Content_Types].xml"]?.toString();
     if (contentTypes) {
-        files["[Content_Types].xml"] = contentTypes.replace(new RegExp(`<Override[^>]+PartName=["']/${targetPath}["'][^>]*/>`, "g"), "");
+        files["[Content_Types].xml"] = Buffer.from(contentTypes.replace(new RegExp(`<Override[^>]+PartName=["']/${targetPath}["'][^>]*/>`, "g"), ""));
     }
 }
-exports.removeSheetByName = removeSheetByName;

package/build/cjs/lib/utils/remove-sheet-from-content-types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSheetFromContentTypes = void 0;
+exports.removeSheetFromContentTypes = removeSheetFromContentTypes;
 /**
  * Removes the specified sheet from the Content_Types.xml file.
  * @param {string} xml - The Content_Types.xml file contents as a string
@@ -10,4 +10,3 @@ exports.removeSheetFromContentTypes = void 0;
 function removeSheetFromContentTypes(xml, sheetIndex) {
     return xml.replace(new RegExp(`<Override[^>]+PartName=["']/xl/worksheets/sheet${sheetIndex}\\.xml["'][^>]*/>`, "g"), "");
 }
-exports.removeSheetFromContentTypes = removeSheetFromContentTypes;

package/build/cjs/lib/utils/remove-sheet-from-rels.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSheetFromRels = void 0;
+exports.removeSheetFromRels = removeSheetFromRels;
 /**
  * Removes the specified sheet from the workbook relationships file (xl/_rels/workbook.xml.rels).
  * @param {string} xml - The workbook relationships file contents as a string
@@ -10,4 +10,3 @@ exports.removeSheetFromRels = void 0;
 function removeSheetFromRels(xml, sheetIndex) {
     return xml.replace(new RegExp(`<Relationship[^>]+Target=["']worksheets/sheet${sheetIndex}\\.xml["'][^>]*/>`, "g"), "");
 }
-exports.removeSheetFromRels = removeSheetFromRels;

package/build/cjs/lib/utils/remove-sheet-from-workbook.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSheetFromWorkbook = void 0;
+exports.removeSheetFromWorkbook = removeSheetFromWorkbook;
 /**
  * Removes the specified sheet from the workbook (xl/workbook.xml).
  * @param {string} xml - The workbook file contents as a string
@@ -10,4 +10,3 @@ exports.removeSheetFromWorkbook = void 0;
 function removeSheetFromWorkbook(xml, sheetIndex) {
     return xml.replace(new RegExp(`<sheet[^>]+sheetId=["']${sheetIndex}["'][^>]*/>`, "g"), "");
 }
-exports.removeSheetFromWorkbook = removeSheetFromWorkbook;

package/build/cjs/lib/utils/shift-cell-ref.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shiftCellRef = void 0;
+exports.shiftCellRef = shiftCellRef;
 /**
  * Shifts the row number in a cell reference by the specified number of rows.
  * The function takes a cell reference string in the format "A1" and a row shift value.
@@ -23,4 +23,3 @@ function shiftCellRef(cellRef, rowShift) {
     const row = parseInt(match[2], 10);
     return `${col}${row + rowShift}`;
 }
-exports.shiftCellRef = shiftCellRef;

package/build/cjs/lib/xml/build-merged-sheet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildMergedSheet = void 0;
+exports.buildMergedSheet = buildMergedSheet;
 /**
  * Builds a new XML string for a merged Excel sheet by combining the original XML
  * with merged rows and optional cell merge information.
@@ -12,7 +12,7 @@ exports.buildMergedSheet = void 0;
  * @param {string[]} mergedRows - Array of XML strings representing each row in the merged sheet.
  * @param {Object[]} [mergeCells] - Optional array of merge cell definitions.
  *        Each object should have a 'ref' property specifying the merge range (e.g., "A1:B2").
- * @returns {string} - The reconstructed XML string with merged content.
+ * @returns {Buffer} - The reconstructed XML string with merged content.
  */
 function buildMergedSheet(originalXml, mergedRows, mergeCells = []) {
     // Remove any existing <mergeCells> section from the XML
@@ -27,6 +27,5 @@ function buildMergedSheet(originalXml, mergedRows, mergeCells = []) {
         // Insert <mergeCells> after </sheetData> and before the next XML tag
         xmlData = xmlData.replace(/(<\/sheetData>)(\s*<)/, `$1\n${mergeCellsXml}\n$2`);
     }
-    return xmlData;
+    return Buffer.from(xmlData);
 }
-exports.buildMergedSheet = buildMergedSheet;

package/build/cjs/lib/xml/extract-rows-from-sheet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractRowsFromSheet = void 0;
+exports.extractRowsFromSheet = extractRowsFromSheet;
 const extract_xml_from_sheet_js_1 = require("./extract-xml-from-sheet.js");
 /**
  * Parses a worksheet (either as Buffer or string) to extract row data,
@@ -60,6 +60,6 @@ function extractRowsFromSheet(sheet) {
         lastRowNumber,
         mergeCells,
         rows,
+        xml,
     };
 }
-exports.extractRowsFromSheet = extractRowsFromSheet;

package/build/cjs/lib/xml/extract-xml-from-sheet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractXmlFromSheet = void 0;
+exports.extractXmlFromSheet = extractXmlFromSheet;
 const pako_1 = require("pako");
 /**
  * Extracts and parses XML content from an Excel worksheet file (e.g., xl/worksheets/sheet1.xml).
@@ -46,4 +46,3 @@ function extractXmlFromSheet(buffer) {
     xml = xml.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, "");
     return xml;
 }
-exports.extractXmlFromSheet = extractXmlFromSheet;

package/build/cjs/lib/xml/shift-row-indices.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shiftRowIndices = void 0;
+exports.shiftRowIndices = shiftRowIndices;
 /**
  * Adjusts row indices in Excel XML row elements by a specified offset.
  * Handles both row element attributes and cell references within rows.
@@ -33,4 +33,3 @@ function shiftRowIndices(rows, offset) {
         return adjustedRow;
     });
 }
-exports.shiftRowIndices = shiftRowIndices;

package/build/cjs/lib/zip/create-sync.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSync = void 0;
+exports.createSync = createSync;
 const node_buffer_1 = require("node:buffer");
 const node_zlib_1 = require("node:zlib");
 const utils_js_1 = require("./utils.js");
@@ -81,4 +81,3 @@ function createSync(files) {
     ]);
     return node_buffer_1.Buffer.concat(fileEntries.concat(centralDirectory).concat([endRecord]));
 }
-exports.createSync = createSync;

package/build/cjs/lib/zip/create.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
+exports.create = create;
 const node_buffer_1 = require("node:buffer");
 const node_util_1 = __importDefault(require("node:util"));
 const node_zlib_1 = __importDefault(require("node:zlib"));
@@ -86,4 +86,3 @@ async function create(files) {
     ]);
     return node_buffer_1.Buffer.concat(fileEntries.concat(centralDirectory).concat([endRecord]));
 }
-exports.create = create;

package/build/cjs/lib/zip/read-sync.js

@@ -1,45 +1,45 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readSync = void 0;
-const node_zlib_1 = require("node:zlib");
+exports.readSync = readSync;
+const node_zlib_1 = __importDefault(require("node:zlib"));
 /**
  * Parses a ZIP archive from a buffer and extracts the files within.
  *
  * @param {Buffer} buffer - The buffer containing the ZIP archive data.
- * @returns {Object.<string, string>} - An object where keys are file names and values are file contents.
+ * @returns {Object.<string, Buffer>} - An object where keys are file names and values are file contents as Buffers.
  * @throws {Error} - Throws an error if an unsupported compression method is encountered or if decompression fails.
  */
 function readSync(buffer) {
     const files = {};
     let offset = 0;
-    while (offset + 4 <= buffer.length) {
+    while (offset + 30 <= buffer.length) {
         const signature = buffer.readUInt32LE(offset);
         if (signature !== 0x04034b50)
-            break;
+            break; // not a local file header
+        const generalPurposeBitFlag = buffer.readUInt16LE(offset + 6);
         const compressionMethod = buffer.readUInt16LE(offset + 8);
         const fileNameLength = buffer.readUInt16LE(offset + 26);
-        const extraLength = buffer.readUInt16LE(offset + 28);
+        const extraFieldLength = buffer.readUInt16LE(offset + 28);
         const fileNameStart = offset + 30;
         const fileNameEnd = fileNameStart + fileNameLength;
         const fileName = buffer.subarray(fileNameStart, fileNameEnd).toString();
-        const dataStart = fileNameEnd + extraLength;
-        let nextOffset = dataStart;
-        while (nextOffset + 4 <= buffer.length) {
-            if (buffer.readUInt32LE(nextOffset) === 0x04034b50)
-                break;
-            nextOffset++;
-        }
-        if (nextOffset + 4 > buffer.length) {
-            nextOffset = buffer.length;
+        const dataStart = fileNameEnd + extraFieldLength;
+        const compressedSize = buffer.readUInt32LE(offset + 18);
+        const useDataDescriptor = (generalPurposeBitFlag & 0x08) !== 0;
+        if (useDataDescriptor) {
+            throw new Error(`File ${fileName} uses data descriptor. Not supported in this minimal parser.`);
         }
-        const compressedData = buffer.subarray(dataStart, nextOffset);
-        let content = "";
+        const compressedData = buffer.subarray(dataStart, dataStart + compressedSize);
+        let content;
         try {
             if (compressionMethod === 0) {
-                content = compressedData.toString();
+                content = compressedData;
             }
             else if (compressionMethod === 8) {
-                content = (0, node_zlib_1.inflateRawSync)(new Uint8Array(compressedData)).toString();
+                content = node_zlib_1.default.inflateRawSync(compressedData);
             }
             else {
                 throw new Error(`Unsupported compression method ${compressionMethod}`);
@@ -50,8 +50,7 @@ function readSync(buffer) {
             throw new Error(`Error unpacking file ${fileName}: ${message}`);
         }
         files[fileName] = content;
-        offset = nextOffset;
+        offset = dataStart + compressedSize;
     }
     return files;
 }
-exports.readSync = readSync;

package/build/cjs/lib/zip/read.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.read = void 0;
+exports.read = read;
 const node_util_1 = __importDefault(require("node:util"));
 const node_zlib_1 = __importDefault(require("node:zlib"));
 const inflateRaw = node_util_1.default.promisify(node_zlib_1.default.inflateRaw);
@@ -11,40 +11,37 @@ const inflateRaw = node_util_1.default.promisify(node_zlib_1.default.inflateRaw)
  * Parses a ZIP archive from a buffer and extracts the files within.
  *
  * @param {Buffer} buffer - The buffer containing the ZIP archive data.
- * @returns {Object.<string, string>} - An object where keys are file names and values are file contents.
+ * @returns {Object.<string, Buffer>} - An object where keys are file names and values are file contents as Buffers.
  * @throws {Error} - Throws an error if an unsupported compression method is encountered or if decompression fails.
  */
 async function read(buffer) {
     const files = {};
     let offset = 0;
-    while (offset + 4 <= buffer.length) {
+    while (offset + 30 <= buffer.length) {
         const signature = buffer.readUInt32LE(offset);
         if (signature !== 0x04034b50)
-            break;
+            break; // not a local file header
+        const generalPurposeBitFlag = buffer.readUInt16LE(offset + 6);
         const compressionMethod = buffer.readUInt16LE(offset + 8);
         const fileNameLength = buffer.readUInt16LE(offset + 26);
-        const extraLength = buffer.readUInt16LE(offset + 28);
+        const extraFieldLength = buffer.readUInt16LE(offset + 28);
         const fileNameStart = offset + 30;
         const fileNameEnd = fileNameStart + fileNameLength;
         const fileName = buffer.subarray(fileNameStart, fileNameEnd).toString();
-        const dataStart = fileNameEnd + extraLength;
-        let nextOffset = dataStart;
-        while (nextOffset + 4 <= buffer.length) {
-            if (buffer.readUInt32LE(nextOffset) === 0x04034b50)
-                break;
-            nextOffset++;
-        }
-        if (nextOffset + 4 > buffer.length) {
-            nextOffset = buffer.length;
+        const dataStart = fileNameEnd + extraFieldLength;
+        const compressedSize = buffer.readUInt32LE(offset + 18);
+        const useDataDescriptor = (generalPurposeBitFlag & 0x08) !== 0;
+        if (useDataDescriptor) {
+            throw new Error(`File ${fileName} uses data descriptor. Not supported in this minimal parser.`);
         }
-        const compressedData = buffer.subarray(dataStart, nextOffset);
-        let content = "";
+        const compressedData = buffer.subarray(dataStart, dataStart + compressedSize);
+        let content;
         try {
             if (compressionMethod === 0) {
-                content = compressedData.toString();
+                content = compressedData;
             }
             else if (compressionMethod === 8) {
-                content = (await inflateRaw(new Uint8Array(compressedData))).toString();
+                content = await inflateRaw(compressedData);
             }
             else {
                 throw new Error(`Unsupported compression method ${compressionMethod}`);
@@ -55,8 +52,7 @@ async function read(buffer) {
             throw new Error(`Error unpacking file ${fileName}: ${message}`);
         }
         files[fileName] = content;
-        offset = nextOffset;
+        offset = dataStart + compressedSize;
     }
     return files;
 }
-exports.read = read;

package/build/cjs/lib/zip/utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBytes = exports.dosTime = exports.crc32 = void 0;
+exports.crc32 = crc32;
+exports.dosTime = dosTime;
+exports.toBytes = toBytes;
 const node_buffer_1 = require("node:buffer");
 /**
  * Precomputed CRC-32 lookup table for optimized checksum calculation.
@@ -75,7 +77,6 @@ function crc32(buf) {
      */
     return ~crc >>> 0;
 }
-exports.crc32 = crc32;
 /**
  * Converts a JavaScript Date object to a 4-byte Buffer in MS-DOS date/time format
  * as specified in the ZIP file format specification (PKZIP APPNOTE.TXT).
@@ -121,7 +122,6 @@ function dosTime(date) {
         ...toBytes(day, 2), // Convert date to 2 bytes (LSB first)
     ]);
 }
-exports.dosTime = dosTime;
 /**
  * Converts a numeric value into a fixed-length Buffer representation,
  * storing the value in little-endian format with right-padding of zeros.
@@ -155,4 +155,3 @@ function toBytes(value, len) {
     }
     return buf;
 }
-exports.toBytes = toBytes;

package/build/cjs/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

package/build/esm/lib/merge-sheets-to-base-file-process.js

@@ -22,7 +22,7 @@ export function mergeSheetsToBaseFileProcess(data) {
     if (!baseFiles[basePath]) {
         throw new Error(`Base file does not contain ${basePath}`);
     }
-    const { lastRowNumber, mergeCells: baseMergeCells, rows: baseRows, } = Xml.extractRowsFromSheet(baseFiles[basePath]);
+    const { lastRowNumber, mergeCells: baseMergeCells, rows: baseRows, xml, } = Xml.extractRowsFromSheet(baseFiles[basePath]);
     const allRows = [...baseRows];
     const allMergeCells = [...baseMergeCells];
     let currentRowOffset = lastRowNumber + gap;
@@ -48,19 +48,19 @@ export function mergeSheetsToBaseFileProcess(data) {
             currentRowOffset += Utils.getMaxRowNumber(rows) + gap;
         }
     }
-    const mergedXml = Xml.buildMergedSheet(baseFiles[basePath], allRows, allMergeCells);
+    const mergedXml = Xml.buildMergedSheet(xml, allRows, allMergeCells);
     baseFiles[basePath] = mergedXml;
     for (const sheetIndex of sheetsToRemove) {
         const sheetPath = `xl/worksheets/sheet${sheetIndex}.xml`;
         delete baseFiles[sheetPath];
         if (baseFiles["xl/workbook.xml"]) {
-            baseFiles["xl/workbook.xml"] = Utils.removeSheetFromWorkbook(baseFiles["xl/workbook.xml"], sheetIndex);
+            baseFiles["xl/workbook.xml"] = Buffer.from(Utils.removeSheetFromWorkbook(baseFiles["xl/workbook.xml"].toString(), sheetIndex));
         }
         if (baseFiles["xl/_rels/workbook.xml.rels"]) {
-            baseFiles["xl/_rels/workbook.xml.rels"] = Utils.removeSheetFromRels(baseFiles["xl/_rels/workbook.xml.rels"], sheetIndex);
+            baseFiles["xl/_rels/workbook.xml.rels"] = Buffer.from(Utils.removeSheetFromRels(baseFiles["xl/_rels/workbook.xml.rels"].toString(), sheetIndex));
         }
         if (baseFiles["[Content_Types].xml"]) {
-            baseFiles["[Content_Types].xml"] = Utils.removeSheetFromContentTypes(baseFiles["[Content_Types].xml"], sheetIndex);
+            baseFiles["[Content_Types].xml"] = Buffer.from(Utils.removeSheetFromContentTypes(baseFiles["[Content_Types].xml"].toString(), sheetIndex));
         }
     }
     for (const sheetName of sheetNamesToRemove) {

package/build/esm/lib/utils/remove-sheet-by-name.js

@@ -5,8 +5,8 @@
  * @returns {void}
  */
 export function removeSheetByName(files, sheetName) {
-    const workbookXml = files["xl/workbook.xml"];
-    const relsXml = files["xl/_rels/workbook.xml.rels"];
+    const workbookXml = files["xl/workbook.xml"]?.toString();
+    const relsXml = files["xl/_rels/workbook.xml.rels"]?.toString();
     if (!workbookXml || !relsXml) {
         return;
     }
@@ -31,11 +31,13 @@ export function removeSheetByName(files, sheetName) {
         return;
     }
     const targetPath = `xl/${targetMatch[1]}`.replace(/\\/g, "/");
-    delete files[targetPath];
-    files["xl/workbook.xml"] = workbookXml.replace(sheetTag, "");
-    files["xl/_rels/workbook.xml.rels"] = relsXml.replace(relTag, "");
-    const contentTypes = files["[Content_Types].xml"];
+    if (targetPath) {
+        delete files[targetPath];
+    }
+    files["xl/workbook.xml"] = Buffer.from(workbookXml.replace(sheetTag, ""));
+    files["xl/_rels/workbook.xml.rels"] = Buffer.from(relsXml.replace(relTag, ""));
+    const contentTypes = files["[Content_Types].xml"]?.toString();
     if (contentTypes) {
-        files["[Content_Types].xml"] = contentTypes.replace(new RegExp(`<Override[^>]+PartName=["']/${targetPath}["'][^>]*/>`, "g"), "");
+        files["[Content_Types].xml"] = Buffer.from(contentTypes.replace(new RegExp(`<Override[^>]+PartName=["']/${targetPath}["'][^>]*/>`, "g"), ""));
     }
 }

package/build/esm/lib/xml/build-merged-sheet.js

@@ -9,7 +9,7 @@
  * @param {string[]} mergedRows - Array of XML strings representing each row in the merged sheet.
  * @param {Object[]} [mergeCells] - Optional array of merge cell definitions.
  *        Each object should have a 'ref' property specifying the merge range (e.g., "A1:B2").
- * @returns {string} - The reconstructed XML string with merged content.
+ * @returns {Buffer} - The reconstructed XML string with merged content.
  */
 export function buildMergedSheet(originalXml, mergedRows, mergeCells = []) {
     // Remove any existing <mergeCells> section from the XML
@@ -24,5 +24,5 @@ export function buildMergedSheet(originalXml, mergedRows, mergeCells = []) {
         // Insert <mergeCells> after </sheetData> and before the next XML tag
         xmlData = xmlData.replace(/(<\/sheetData>)(\s*<)/, `$1\n${mergeCellsXml}\n$2`);
     }
-    return xmlData;
+    return Buffer.from(xmlData);
 }

package/build/esm/lib/xml/extract-rows-from-sheet.js

@@ -57,5 +57,6 @@ export function extractRowsFromSheet(sheet) {
         lastRowNumber,
         mergeCells,
         rows,
+        xml,
     };
 }

package/build/esm/lib/zip/read-sync.js

@@ -1,42 +1,39 @@
-import { inflateRawSync } from "node:zlib";
+import zlib from "node:zlib";
 /**
  * Parses a ZIP archive from a buffer and extracts the files within.
  *
  * @param {Buffer} buffer - The buffer containing the ZIP archive data.
- * @returns {Object.<string, string>} - An object where keys are file names and values are file contents.
+ * @returns {Object.<string, Buffer>} - An object where keys are file names and values are file contents as Buffers.
  * @throws {Error} - Throws an error if an unsupported compression method is encountered or if decompression fails.
  */
 export function readSync(buffer) {
     const files = {};
     let offset = 0;
-    while (offset + 4 <= buffer.length) {
+    while (offset + 30 <= buffer.length) {
         const signature = buffer.readUInt32LE(offset);
         if (signature !== 0x04034b50)
-            break;
+            break; // not a local file header
+        const generalPurposeBitFlag = buffer.readUInt16LE(offset + 6);
         const compressionMethod = buffer.readUInt16LE(offset + 8);
         const fileNameLength = buffer.readUInt16LE(offset + 26);
-        const extraLength = buffer.readUInt16LE(offset + 28);
+        const extraFieldLength = buffer.readUInt16LE(offset + 28);
         const fileNameStart = offset + 30;
         const fileNameEnd = fileNameStart + fileNameLength;
         const fileName = buffer.subarray(fileNameStart, fileNameEnd).toString();
-        const dataStart = fileNameEnd + extraLength;
-        let nextOffset = dataStart;
-        while (nextOffset + 4 <= buffer.length) {
-            if (buffer.readUInt32LE(nextOffset) === 0x04034b50)
-                break;
-            nextOffset++;
+        const dataStart = fileNameEnd + extraFieldLength;
+        const compressedSize = buffer.readUInt32LE(offset + 18);
+        const useDataDescriptor = (generalPurposeBitFlag & 0x08) !== 0;
+        if (useDataDescriptor) {
+            throw new Error(`File ${fileName} uses data descriptor. Not supported in this minimal parser.`);
         }
-        if (nextOffset + 4 > buffer.length) {
-            nextOffset = buffer.length;
-        }
-        const compressedData = buffer.subarray(dataStart, nextOffset);
-        let content = "";
+        const compressedData = buffer.subarray(dataStart, dataStart + compressedSize);
+        let content;
         try {
             if (compressionMethod === 0) {
-                content = compressedData.toString();
+                content = compressedData;
             }
             else if (compressionMethod === 8) {
-                content = inflateRawSync(new Uint8Array(compressedData)).toString();
+                content = zlib.inflateRawSync(compressedData);
             }
             else {
                 throw new Error(`Unsupported compression method ${compressionMethod}`);
@@ -47,7 +44,7 @@ export function readSync(buffer) {
             throw new Error(`Error unpacking file ${fileName}: ${message}`);
         }
         files[fileName] = content;
-        offset = nextOffset;
+        offset = dataStart + compressedSize;
     }
     return files;
 }

package/build/esm/lib/zip/read.js

@@ -5,40 +5,37 @@ const inflateRaw = util.promisify(zlib.inflateRaw);
  * Parses a ZIP archive from a buffer and extracts the files within.
  *
  * @param {Buffer} buffer - The buffer containing the ZIP archive data.
- * @returns {Object.<string, string>} - An object where keys are file names and values are file contents.
+ * @returns {Object.<string, Buffer>} - An object where keys are file names and values are file contents as Buffers.
  * @throws {Error} - Throws an error if an unsupported compression method is encountered or if decompression fails.
  */
 export async function read(buffer) {
     const files = {};
     let offset = 0;
-    while (offset + 4 <= buffer.length) {
+    while (offset + 30 <= buffer.length) {
         const signature = buffer.readUInt32LE(offset);
         if (signature !== 0x04034b50)
-            break;
+            break; // not a local file header
+        const generalPurposeBitFlag = buffer.readUInt16LE(offset + 6);
         const compressionMethod = buffer.readUInt16LE(offset + 8);
         const fileNameLength = buffer.readUInt16LE(offset + 26);
-        const extraLength = buffer.readUInt16LE(offset + 28);
+        const extraFieldLength = buffer.readUInt16LE(offset + 28);
         const fileNameStart = offset + 30;
         const fileNameEnd = fileNameStart + fileNameLength;
         const fileName = buffer.subarray(fileNameStart, fileNameEnd).toString();
-        const dataStart = fileNameEnd + extraLength;
-        let nextOffset = dataStart;
-        while (nextOffset + 4 <= buffer.length) {
-            if (buffer.readUInt32LE(nextOffset) === 0x04034b50)
-                break;
-            nextOffset++;
+        const dataStart = fileNameEnd + extraFieldLength;
+        const compressedSize = buffer.readUInt32LE(offset + 18);
+        const useDataDescriptor = (generalPurposeBitFlag & 0x08) !== 0;
+        if (useDataDescriptor) {
+            throw new Error(`File ${fileName} uses data descriptor. Not supported in this minimal parser.`);
         }
-        if (nextOffset + 4 > buffer.length) {
-            nextOffset = buffer.length;
-        }
-        const compressedData = buffer.subarray(dataStart, nextOffset);
-        let content = "";
+        const compressedData = buffer.subarray(dataStart, dataStart + compressedSize);
+        let content;
         try {
             if (compressionMethod === 0) {
-                content = compressedData.toString();
+                content = compressedData;
             }
             else if (compressionMethod === 8) {
-                content = (await inflateRaw(new Uint8Array(compressedData))).toString();
+                content = await inflateRaw(compressedData);
             }
             else {
                 throw new Error(`Unsupported compression method ${compressionMethod}`);
@@ -49,7 +46,7 @@ export async function read(buffer) {
             throw new Error(`Error unpacking file ${fileName}: ${message}`);
         }
         files[fileName] = content;
-        offset = nextOffset;
+        offset = dataStart + compressedSize;
     }
     return files;
 }

package/build/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/build/types/lib/merge-sheets-to-base-file-process.d.ts

@@ -16,10 +16,10 @@
  */
 export declare function mergeSheetsToBaseFileProcess(data: {
     additions: {
-        files: Record<string, string>;
+        files: Record<string, Buffer>;
         sheetIndexes: number[];
     }[];
-    baseFiles: Record<string, string>;
+    baseFiles: Record<string, Buffer>;
     baseSheetIndex: number;
     gap: number;
     sheetNamesToRemove: string[];

package/build/types/lib/merge-sheets-to-base-file-sync.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 /**
  * Merge rows from other Excel files into a base Excel file.
  * The output is a new Excel file with the merged content.

package/build/types/lib/merge-sheets-to-base-file.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 /**
  * Merge rows from other Excel files into a base Excel file.
  * The output is a new Excel file with the merged content.

package/build/types/lib/utils/is-same-buffer.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 /**
  * Checks if two Buffers are the same
  * @param {Buffer} buf1 - the first Buffer

package/build/types/lib/utils/remove-sheet-by-name.d.ts

@@ -4,4 +4,4 @@
  * @param {string} sheetName - The name of the sheet to remove.
  * @returns {void}
  */
-export declare function removeSheetByName(files: Record<string, string>, sheetName: string): void;
+export declare function removeSheetByName(files: Record<string, Buffer>, sheetName: string): void;

package/build/types/lib/xml/build-merged-sheet.d.ts

@@ -9,8 +9,8 @@
  * @param {string[]} mergedRows - Array of XML strings representing each row in the merged sheet.
  * @param {Object[]} [mergeCells] - Optional array of merge cell definitions.
  *        Each object should have a 'ref' property specifying the merge range (e.g., "A1:B2").
- * @returns {string} - The reconstructed XML string with merged content.
+ * @returns {Buffer} - The reconstructed XML string with merged content.
  */
 export declare function buildMergedSheet(originalXml: string, mergedRows: string[], mergeCells?: {
     ref: string;
-}[]): string;
+}[]): Buffer;

package/build/types/lib/xml/extract-rows-from-sheet.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 /**
  * Parses a worksheet (either as Buffer or string) to extract row data,
  * last row number, and merge cell information from Excel XML format.
@@ -26,4 +24,5 @@ export declare function extractRowsFromSheet(sheet: Buffer | string): {
     mergeCells: {
         ref: string;
     }[];
+    xml: string;
 };

package/build/types/lib/xml/extract-xml-from-sheet.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 /**
  * Extracts and parses XML content from an Excel worksheet file (e.g., xl/worksheets/sheet1.xml).
  * Handles both compressed (raw deflate) and uncompressed (plain XML) formats.

package/build/types/lib/xml/extract-xml-from-system-content.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 /**
  * Extracts and decompresses XML content from Excel system files (e.g., workbook.xml, [Content_Types].xml).
  * Handles both compressed (raw DEFLATE) and uncompressed (plain XML) formats with comprehensive error handling.

package/build/types/lib/zip/constants.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Buffer } from "node:buffer";
 /**
  * ZIP file signature constants in Buffer format.
@@ -13,7 +11,7 @@ import { Buffer } from "node:buffer";
  * Format: 'PK\01\02'
  * Found in the central directory that appears at the end of the ZIP file.
  */
-export declare const CENTRAL_DIR_HEADER_SIG: Buffer;
+export declare const CENTRAL_DIR_HEADER_SIG: Buffer<ArrayBuffer>;
 /**
  * End of Central Directory Record signature (0x504b0506).
  * Marks the end of the central directory and contains global information
@@ -21,11 +19,11 @@ export declare const CENTRAL_DIR_HEADER_SIG: Buffer;
  * Format: 'PK\05\06'
  * This is the last record in a valid ZIP file.
  */
-export declare const END_OF_CENTRAL_DIR_SIG: Buffer;
+export declare const END_OF_CENTRAL_DIR_SIG: Buffer<ArrayBuffer>;
 /**
  * Local File Header signature (0x504b0304).
  * Marks the beginning of a file entry within the ZIP archive.
  * Format: 'PK\03\04' (ASCII letters PK followed by version numbers)
  * Appears before each file's compressed data.
  */
-export declare const LOCAL_FILE_HEADER_SIG: Buffer;
+export declare const LOCAL_FILE_HEADER_SIG: Buffer<ArrayBuffer>;

package/build/types/lib/zip/create-sync.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Buffer } from "node:buffer";
 /**
  * Creates a ZIP archive from a collection of files.

package/build/types/lib/zip/create.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Buffer } from "node:buffer";
 /**
  * Creates a ZIP archive from a collection of files.

package/build/types/lib/zip/read-sync.d.ts

@@ -1,10 +1,8 @@
-/// <reference types="node" />
-/// <reference types="node" />
 /**
  * Parses a ZIP archive from a buffer and extracts the files within.
  *
  * @param {Buffer} buffer - The buffer containing the ZIP archive data.
- * @returns {Object.<string, string>} - An object where keys are file names and values are file contents.
+ * @returns {Object.<string, Buffer>} - An object where keys are file names and values are file contents as Buffers.
  * @throws {Error} - Throws an error if an unsupported compression method is encountered or if decompression fails.
  */
-export declare function readSync(buffer: Buffer): Record<string, string>;
+export declare function readSync(buffer: Buffer): Record<string, Buffer>;

package/build/types/lib/zip/read.d.ts

@@ -1,10 +1,8 @@
-/// <reference types="node" />
-/// <reference types="node" />
 /**
  * Parses a ZIP archive from a buffer and extracts the files within.
  *
  * @param {Buffer} buffer - The buffer containing the ZIP archive data.
- * @returns {Object.<string, string>} - An object where keys are file names and values are file contents.
+ * @returns {Object.<string, Buffer>} - An object where keys are file names and values are file contents as Buffers.
  * @throws {Error} - Throws an error if an unsupported compression method is encountered or if decompression fails.
  */
-export declare function read(buffer: Buffer): Promise<Record<string, string>>;
+export declare function read(buffer: Buffer): Promise<Record<string, Buffer>>;

package/build/types/lib/zip/utils.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Buffer } from "node:buffer";
 /**
  * Computes a CRC-32 checksum for the given Buffer using the standard IEEE 802.3 polynomial.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@js-ak/excel-toolbox",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "excel-toolbox",
   "publishConfig": {
     "access": "public",
@@ -12,9 +12,10 @@
   "types": "build/types/index.d.ts",
   "exports": {
     ".": {
+      "types": "./build/types/index.d.ts",
       "require": "./build/cjs/index.js",
       "import": "./build/esm/index.js",
-      "types": "./build/types/index.d.ts"
+      "default": "./build/esm/index.js"
     },
     "./cjs": {
       "require": "./build/cjs/index.js"
@@ -26,8 +27,10 @@
   "files": [
     "build/esm/lib",
     "build/esm/index.js",
+    "build/esm/package.json",
     "build/cjs/lib",
     "build/cjs/index.js",
+    "build/cjs/package.json",
     "build/types/lib",
     "build/types/index.d.ts",
     "LICENSE",
@@ -35,10 +38,12 @@
     "package.json"
   ],
   "scripts": {
-    "build": "npm run build:esm && npm run build:cjs",
+    "build": "npm run build:cjs && npm run build:esm && npm run postbuild:esm && npm run postbuild:cjs",
     "build:esm": "tsc -p tsconfig.esm.json",
     "build:cjs": "tsc -p tsconfig.cjs.json",
     "lint": "eslint . --ext .ts",
+    "postbuild:esm": "node scripts/write-esm-package.js",
+    "postbuild:cjs": "node scripts/write-cjs-package.js",
     "test": "npm run build && node ./build/esm/test/index.js"
   },
   "repository": {
@@ -69,7 +74,7 @@
     "eslint-plugin-sort-exports": "0.9.1",
     "globals": "16.0.0",
     "semantic-release": "24.0.0",
-    "typescript": "5.4.5",
+    "typescript": "5.8.3",
     "typescript-eslint": "8.29.0"
   },
   "dependencies": {