@js-ak/excel-toolbox 1.4.1 → 1.6.0

package/build/cjs/lib/template/utils/index.js

@@ -10,10 +10,34 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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;
+    };
+})();
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Common = void 0;
+exports.Common = __importStar(require("../../utils/index.js"));
 __exportStar(require("./apply-replacements.js"), exports);
 __exportStar(require("./check-row.js"), exports);
 __exportStar(require("./check-rows.js"), exports);
@@ -30,6 +54,7 @@ __exportStar(require("./process-merge-cells.js"), exports);
 __exportStar(require("./process-merge-finalize.js"), exports);
 __exportStar(require("./process-rows.js"), exports);
 __exportStar(require("./process-shared-strings.js"), exports);
+__exportStar(require("./regexp.js"), exports);
 __exportStar(require("./to-excel-column-object.js"), exports);
 __exportStar(require("./update-dimension.js"), exports);
 __exportStar(require("./validate-worksheet-xml.js"), exports);

package/build/cjs/lib/template/utils/prepare-row-to-cells.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareRowToCells = prepareRowToCells;
+const column_index_to_letter_js_1 = require("./column-index-to-letter.js");
+const escape_xml_js_1 = require("./escape-xml.js");
+function prepareRowToCells(row, rowNumber) {
+    return row.map((value, colIndex) => {
+        const colLetter = (0, column_index_to_letter_js_1.columnIndexToLetter)(colIndex);
+        const cellRef = `${colLetter}${rowNumber}`;
+        const cellValue = (0, escape_xml_js_1.escapeXml)(String(value ?? ""));
+        return {
+            cellRef,
+            cellValue,
+            cellXml: `<c r="${cellRef}" t="inlineStr"><is><t>${cellValue}</t></is></c>`,
+        };
+    });
+}

package/build/cjs/lib/template/utils/regexp.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.relationshipMatch = relationshipMatch;
+exports.sheetMatch = sheetMatch;
+/**
+ * Creates a regular expression to match a relationship element with a specific ID.
+ *
+ * @param {string} id - The relationship ID to match (e.g. "rId1")
+ * @returns {RegExp} A regular expression that matches a Relationship XML element with the given ID and captures the Target attribute value
+ * @example
+ * const regex = relationshipMatch("rId1");
+ * const xml = '<Relationship Id="rId1" Target="worksheets/sheet1.xml"/>';
+ * const match = xml.match(regex);
+ * // match[1] === "worksheets/sheet1.xml"
+ */
+function relationshipMatch(id) {
+    return new RegExp(`<Relationship[^>]+Id="${id}"[^>]+Target="([^"]+)"[^>]*/>`);
+}
+/**
+ * Creates a regular expression to match a sheet element with a specific name.
+ *
+ * @param {string} sheetName - The name of the sheet to match
+ * @returns {RegExp} A regular expression that matches a sheet XML element with the given name and captures the r:id attribute value
+ * @example
+ * const regex = sheetMatch("Sheet1");
+ * const xml = '<sheet name="Sheet1" sheetId="1" r:id="rId1"/>';
+ * const match = xml.match(regex);
+ * // match[1] === "rId1"
+ */
+function sheetMatch(sheetName) {
+    return new RegExp(`<sheet[^>]+name="${sheetName}"[^>]+r:id="([^"]+)"[^>]*/>`);
+}

package/build/cjs/lib/template/utils/update-dimension.js

@@ -1,6 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDimension = updateDimension;
+/**
+ * Updates the dimension element in an Excel worksheet XML string based on the actual cell references.
+ *
+ * This function scans the XML for all cell references and calculates the minimum and maximum
+ * column/row values to determine the actual used range in the worksheet. It then updates
+ * the dimension element to reflect this range.
+ *
+ * @param {string} xml - The worksheet XML string to process
+ * @returns {string} The XML string with updated dimension element
+ * @example
+ * // XML with cells from A1 to C3
+ * const xml = '....<dimension ref="A1:B2"/>.....<c r="C3">...</c>...';
+ * const updated = updateDimension(xml);
+ * // Returns XML with dimension updated to ref="A1:C3"
+ */
 function updateDimension(xml) {
     const cellRefs = [...xml.matchAll(/<c r="([A-Z]+)(\d+)"/g)];
     if (cellRefs.length === 0)

package/build/cjs/lib/template/utils/validate-worksheet-xml.js

@@ -33,9 +33,7 @@ function validateWorksheetXml(xml) {
     const requiredElements = [
         { name: "sheetViews", tag: "<sheetViews>" },
         { name: "sheetFormatPr", tag: "<sheetFormatPr" },
-        { name: "cols", tag: "<cols>" },
         { name: "sheetData", tag: "<sheetData>" },
-        { name: "mergeCells", tag: "<mergeCells" },
     ];
     for (const { name, tag } of requiredElements) {
         if (!xml.includes(tag)) {
@@ -100,59 +98,82 @@ function validateWorksheetXml(xml) {
         }
     }
     // 4. Check mergeCells
-    const mergeCellsStart = xml.indexOf("<mergeCells");
-    const mergeCellsEnd = xml.indexOf("</mergeCells>");
-    if (mergeCellsStart === -1 || mergeCellsEnd === -1) {
-        return createError("Invalid mergeCells structure");
-    }
-    const mergeCellsContent = xml.substring(mergeCellsStart, mergeCellsEnd);
-    const countMatch = mergeCellsContent.match(/count="(\d+)"/);
-    if (!countMatch) {
-        return createError("Count attribute not specified for mergeCells");
-    }
-    const mergeCellTags = mergeCellsContent.match(/<mergeCell\s+ref="([A-Z]+\d+:[A-Z]+\d+)"\s*\/>/g);
-    if (!mergeCellTags) {
-        return createError("No merged cells found");
-    }
-    // Check if the number of mergeCells matches the count attribute
-    if (mergeCellTags.length !== parseInt(countMatch[1])) {
-        return createError("Mismatch in the number of merged cells", `Expected: ${countMatch[1]}, found: ${mergeCellTags.length}`);
-    }
-    // Check for duplicates of mergeCell
-    const mergeRefs = new Set();
-    const duplicates = new Set();
-    for (const mergeTag of mergeCellTags) {
-        const refMatch = mergeTag.match(/ref="([A-Z]+\d+:[A-Z]+\d+)"/);
-        if (!refMatch) {
-            return createError("Invalid merge cell format", `Tag: ${mergeTag}`);
-        }
-        const ref = refMatch[1];
-        if (mergeRefs.has(ref)) {
-            duplicates.add(ref);
+    if (xml.includes("<mergeCells")) {
+        const mergeCellsStart = xml.indexOf("<mergeCells");
+        const mergeCellsEnd = xml.indexOf("</mergeCells>");
+        if (mergeCellsStart === -1 || mergeCellsEnd === -1) {
+            return createError("Invalid mergeCells structure");
+        }
+        const mergeCellsContent = xml.substring(mergeCellsStart, mergeCellsEnd);
+        const countMatch = mergeCellsContent.match(/count="(\d+)"/);
+        if (!countMatch) {
+            return createError("Count attribute not specified for mergeCells");
+        }
+        const mergeCellTags = mergeCellsContent.match(/<mergeCell\s+ref="([A-Z]+\d+:[A-Z]+\d+)"\s*\/>/g);
+        if (!mergeCellTags) {
+            return createError("No merged cells found");
+        }
+        // Check if the number of mergeCells matches the count attribute
+        if (mergeCellTags.length !== parseInt(countMatch[1])) {
+            return createError("Mismatch in the number of merged cells", `Expected: ${countMatch[1]}, found: ${mergeCellTags.length}`);
+        }
+        // Check for duplicates of mergeCell
+        const mergeRefs = new Set();
+        const duplicates = new Set();
+        for (const mergeTag of mergeCellTags) {
+            const refMatch = mergeTag.match(/ref="([A-Z]+\d+:[A-Z]+\d+)"/);
+            if (!refMatch) {
+                return createError("Invalid merge cell format", `Tag: ${mergeTag}`);
+            }
+            const ref = refMatch[1];
+            if (mergeRefs.has(ref)) {
+                duplicates.add(ref);
+            }
+            else {
+                mergeRefs.add(ref);
+            }
         }
-        else {
-            mergeRefs.add(ref);
+        if (duplicates.size > 0) {
+            return createError("Duplicates of merged cells found", `Duplicates: ${Array.from(duplicates).join(", ")}`);
+        }
+        // Check for overlapping merge ranges
+        const mergedRanges = Array.from(mergeRefs).map(ref => {
+            const [start, end] = ref.split(":");
+            return {
+                endCol: end.match(/[A-Z]+/)?.[0] || "",
+                endRow: parseInt(end.match(/\d+/)?.[0] || "0"),
+                startCol: start.match(/[A-Z]+/)?.[0] || "",
+                startRow: parseInt(start.match(/\d+/)?.[0] || "0"),
+            };
+        });
+        for (let i = 0; i < mergedRanges.length; i++) {
+            for (let j = i + 1; j < mergedRanges.length; j++) {
+                const a = mergedRanges[i];
+                const b = mergedRanges[j];
+                if (rangesIntersect(a, b)) {
+                    return createError("Found intersecting merged cells", `Intersecting: ${getRangeString(a)} and ${getRangeString(b)}`);
+                }
+            }
         }
-    }
-    if (duplicates.size > 0) {
-        return createError("Duplicates of merged cells found", `Duplicates: ${Array.from(duplicates).join(", ")}`);
-    }
-    // Check for overlapping merge ranges
-    const mergedRanges = Array.from(mergeRefs).map(ref => {
-        const [start, end] = ref.split(":");
-        return {
-            endCol: end.match(/[A-Z]+/)?.[0] || "",
-            endRow: parseInt(end.match(/\d+/)?.[0] || "0"),
-            startCol: start.match(/[A-Z]+/)?.[0] || "",
-            startRow: parseInt(start.match(/\d+/)?.[0] || "0"),
-        };
-    });
-    for (let i = 0; i < mergedRanges.length; i++) {
-        for (let j = i + 1; j < mergedRanges.length; j++) {
-            const a = mergedRanges[i];
-            const b = mergedRanges[j];
-            if (rangesIntersect(a, b)) {
-                return createError("Found intersecting merged cells", `Intersecting: ${getRangeString(a)} and ${getRangeString(b)}`);
+        // 6. Additional check: all mergeCell tags refer to existing cells
+        for (const mergeTag of mergeCellTags) {
+            const refMatch = mergeTag.match(/ref="([A-Z]+\d+:[A-Z]+\d+)"/);
+            if (!refMatch) {
+                return createError("Invalid merge cell format", `Tag: ${mergeTag}`);
+            }
+            const [cell1, cell2] = refMatch[1].split(":");
+            const cell1Col = cell1.match(/[A-Z]+/)?.[0];
+            const cell1Row = parseInt(cell1.match(/\d+/)?.[0] || "0");
+            const cell2Col = cell2.match(/[A-Z]+/)?.[0];
+            const cell2Row = parseInt(cell2.match(/\d+/)?.[0] || "0");
+            if (!cell1Col || !cell2Col || isNaN(cell1Row) || isNaN(cell2Row)) {
+                return createError("Invalid merged cell coordinates", `Merged cells: ${refMatch[1]}`);
+            }
+            // Check if the merged cells exist
+            const cell1Exists = allCells.some(c => c.row === cell1Row && c.col === cell1Col);
+            const cell2Exists = allCells.some(c => c.row === cell2Row && c.col === cell2Col);
+            if (!cell1Exists || !cell2Exists) {
+                return createError("Merged cell reference points to non-existent cells", `Merged cells: ${refMatch[1]}, missing: ${!cell1Exists ? `${cell1Col}${cell1Row}` : `${cell2Col}${cell2Row}`}`);
             }
         }
     }
@@ -181,27 +202,6 @@ function validateWorksheetXml(xml) {
             return createError("Cell is outside the specified area (by column)", `Cell: ${cell.col}${cell.row}, dimension: ${dimensionMatch[1]}`);
         }
     }
-    // 6. Additional check: all mergeCell tags refer to existing cells
-    for (const mergeTag of mergeCellTags) {
-        const refMatch = mergeTag.match(/ref="([A-Z]+\d+:[A-Z]+\d+)"/);
-        if (!refMatch) {
-            return createError("Invalid merge cell format", `Tag: ${mergeTag}`);
-        }
-        const [cell1, cell2] = refMatch[1].split(":");
-        const cell1Col = cell1.match(/[A-Z]+/)?.[0];
-        const cell1Row = parseInt(cell1.match(/\d+/)?.[0] || "0");
-        const cell2Col = cell2.match(/[A-Z]+/)?.[0];
-        const cell2Row = parseInt(cell2.match(/\d+/)?.[0] || "0");
-        if (!cell1Col || !cell2Col || isNaN(cell1Row) || isNaN(cell2Row)) {
-            return createError("Invalid merged cell coordinates", `Merged cells: ${refMatch[1]}`);
-        }
-        // Check if the merged cells exist
-        const cell1Exists = allCells.some(c => c.row === cell1Row && c.col === cell1Col);
-        const cell2Exists = allCells.some(c => c.row === cell2Row && c.col === cell2Col);
-        if (!cell1Exists || !cell2Exists) {
-            return createError("Merged cell reference points to non-existent cells", `Merged cells: ${refMatch[1]}, missing: ${!cell1Exists ? `${cell1Col}${cell1Row}` : `${cell2Col}${cell2Row}`}`);
-        }
-    }
     return { isValid: true };
 }
 // A function to check if two ranges intersect

package/build/cjs/lib/template/utils/write-rows-to-stream.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeRowsToStream = writeRowsToStream;
-const column_index_to_letter_js_1 = require("./column-index-to-letter.js");
-const escape_xml_js_1 = require("./escape-xml.js");
+const prepare_row_to_cells_js_1 = require("./prepare-row-to-cells.js");
 /**
  * Writes an async iterable of rows to an Excel XML file.
  *
@@ -14,29 +13,74 @@ const escape_xml_js_1 = require("./escape-xml.js");
  * for the first row written to the file. Subsequent rows are written
  * with incrementing row numbers.
  *
- * @param output - A file write stream to write the Excel XML to.
- * @param rows - An async iterable of rows, where each row is an array
- *               of values.
- * @param startRowNumber - The starting row number to use for the first
- *                         row written to the file.
- *
- * @returns An object with a single property `rowNumber`, which is the
- *          last row number written to the file (i.e., the `startRowNumber`
- *          plus the number of rows written).
+ * @param {WritableLike} output - A file write stream to write the Excel XML to.
+ * @param {AsyncIterable<unknown[] | unknown[][]>} rows - An async iterable of rows, where each row is an array
+ *                                                        of values or an array of arrays of values.
+ * @param {number} startRowNumber - The starting row number to use for the first
+ *                                 row written to the file.
+ * @returns {Promise<{
+ *   dimension: {
+ *     maxColumn: string;
+ *     maxRow: number;
+ *     minColumn: string;
+ *     minRow: number;
+ *   };
+ *   rowNumber: number;
+ * }>} An object containing:
+ *   - dimension: The boundaries of the written data (min/max columns and rows)
+ *   - rowNumber: The last row number written to the file
  */
 async function writeRowsToStream(output, rows, startRowNumber) {
     let rowNumber = startRowNumber;
+    const dimension = {
+        maxColumn: "A",
+        maxRow: startRowNumber,
+        minColumn: "A",
+        minRow: startRowNumber,
+    };
+    // Функция для сравнения колонок (A < B, AA > Z и т.д.)
+    const compareColumns = (a, b) => {
+        if (a === b)
+            return 0;
+        return a.length === b.length ? (a < b ? -1 : 1) : (a.length < b.length ? -1 : 1);
+    };
+    const processRow = (row, currentRowNumber) => {
+        const cells = (0, prepare_row_to_cells_js_1.prepareRowToCells)(row, currentRowNumber);
+        if (cells.length === 0)
+            return;
+        output.write(`<row r="${currentRowNumber}">${cells.map(cell => cell.cellXml).join("")}</row>`);
+        // Обновление границ
+        const firstCellRef = cells[0]?.cellRef;
+        const lastCellRef = cells[cells.length - 1]?.cellRef;
+        if (firstCellRef) {
+            const colLetters = firstCellRef.match(/[A-Z]+/)?.[0] || "";
+            if (compareColumns(colLetters, dimension.minColumn) < 0) {
+                dimension.minColumn = colLetters;
+            }
+        }
+        if (lastCellRef) {
+            const colLetters = lastCellRef.match(/[A-Z]+/)?.[0] || "";
+            if (compareColumns(colLetters, dimension.maxColumn) > 0) {
+                dimension.maxColumn = colLetters;
+            }
+        }
+        dimension.maxRow = currentRowNumber;
+    };
     for await (const row of rows) {
-        // Transform the row into XML
-        const cells = row.map((value, colIndex) => {
-            const colLetter = (0, column_index_to_letter_js_1.columnIndexToLetter)(colIndex);
-            const cellRef = `${colLetter}${rowNumber}`;
-            const cellValue = (0, escape_xml_js_1.escapeXml)(String(value ?? ""));
-            return `<c r="${cellRef}" t="inlineStr"><is><t>${cellValue}</t></is></c>`;
-        });
-        // Write the row to the file
-        output.write(`<row r="${rowNumber}">${cells.join("")}</row>`);
-        rowNumber++;
+        if (!row.length)
+            continue;
+        if (Array.isArray(row[0])) {
+            for (const subRow of row) {
+                if (!subRow.length)
+                    continue;
+                processRow(subRow, rowNumber);
+                rowNumber++;
+            }
+        }
+        else {
+            processRow(row, rowNumber);
+            rowNumber++;
+        }
     }
-    return { rowNumber };
+    return { dimension, rowNumber };
 }

package/build/esm/lib/template/index.js

@@ -1 +1,2 @@
 export * from "./template-fs.js";
+export * from "./template-memory.js";

package/build/esm/lib/template/memory-write-stream.js

@@ -0,0 +1,13 @@
+export class MemoryWriteStream {
+    chunks = [];
+    write(chunk) {
+        this.chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, "utf-8"));
+        return true;
+    }
+    end() {
+        // no-op
+    }
+    toBuffer() {
+        return Buffer.concat(this.chunks);
+    }
+}