@cj-tech-master/excelts 1.4.5 → 1.5.0

package/dist/cjs/doc/worksheet.js

@@ -128,19 +128,26 @@ class Worksheet {
             }
             name = name.substring(0, 31);
         }
-        if (this._workbook._worksheets.find((ws) => ws && ws.name.toLowerCase() === name.toLowerCase())) {
+        if (this._workbook.worksheets.find(ws => ws && ws.name.toLowerCase() === name.toLowerCase())) {
             throw new Error(`Worksheet name already exists: ${name}`);
         }
         this._name = name;
     }
+    /**
+     * The workbook that contains this worksheet
+     */
     get workbook() {
         return this._workbook;
     }
-    // when you're done with this worksheet, call this to remove from workbook
+    /**
+     * When you're done with this worksheet, call this to remove from workbook
+     */
     destroy() {
         this._workbook.removeWorksheetEx(this);
     }
-    // Get the bounding range of the cells in this worksheet
+    /**
+     * Get the bounding range of the cells in this worksheet
+     */
     get dimensions() {
         const dimensions = new range_js_1.Range();
         this._rows.forEach(row => {
@@ -155,16 +162,22 @@ class Worksheet {
     }
     // =========================================================================
     // Columns
-    // get the current columns array.
+    /**
+     * Get the current columns array
+     */
     get columns() {
         return this._columns;
     }
-    // set the columns from an array of column definitions.
-    // Note: any headers defined will overwrite existing values.
+    /**
+     * Add column headers and define column keys and widths.
+     *
+     * Note: these column structures are a workbook-building convenience only,
+     * apart from the column width, they will not be fully persisted.
+     */
     set columns(value) {
         // calculate max header row count
         this._headerRowCount = value.reduce((pv, cv) => {
-            const headerCount = (cv.header && 1) || (cv.headers && cv.headers.length) || 0;
+            const headerCount = Array.isArray(cv.header) ? cv.header.length : cv.header ? 1 : 0;
             return Math.max(pv, headerCount);
         }, 0);
         // construct Column objects
@@ -188,7 +201,9 @@ class Worksheet {
     eachColumnKey(f) {
         Object.keys(this._keys).forEach(key => f(this._keys[key], key));
     }
-    // get a single column by col number. If it doesn't exist, create it and any gaps before it
+    /**
+     * Access an individual column by key, letter and 1-based column number
+     */
     getColumn(c) {
         let colNum;
         if (typeof c === "string") {
@@ -214,18 +229,26 @@ class Worksheet {
         }
         return this._columns[colNum - 1];
     }
+    /**
+     * Cut one or more columns (columns to the right are shifted left)
+     * and optionally insert more
+     *
+     * If column properties have been defined, they will be cut or moved accordingly
+     *
+     * Known Issue: If a splice causes any merged cells to move, the results may be unpredictable
+     *
+     * Also: If the worksheet has more rows than values in the column inserts,
+     * the rows will still be shifted as if the values existed
+     */
     spliceColumns(start, count, ...inserts) {
         const rows = this._rows;
         const nRows = rows.length;
         if (inserts.length > 0) {
             // must iterate over all rows whether they exist yet or not
             for (let i = 0; i < nRows; i++) {
-                const rowArguments = [start, count];
-                inserts.forEach(insert => {
-                    rowArguments.push(insert[i] || null);
-                });
+                const insertValues = inserts.map(insert => insert[i] || null);
                 const row = this.getRow(i + 1);
-                row.splice(...rowArguments);
+                row.splice(start, count, ...insertValues);
             }
         }
         else {
@@ -251,26 +274,35 @@ class Worksheet {
             }
         }
         for (let i = start; i < start + inserts.length; i++) {
-            this.getColumn(i).defn = null;
+            this.getColumn(i).defn = undefined;
         }
         // account for defined names
         this.workbook.definedNames.spliceColumns(this.name, start, count, inserts.length);
     }
+    /**
+     * Get the last column in a worksheet
+     */
     get lastColumn() {
         return this.getColumn(this.columnCount);
     }
+    /**
+     * The total column size of the document. Equal to the maximum cell count from all of the rows
+     */
     get columnCount() {
         let maxCount = 0;
-        this.eachRow((row) => {
+        this.eachRow(row => {
             maxCount = Math.max(maxCount, row.cellCount);
         });
         return maxCount;
     }
+    /**
+     * A count of the number of columns that have values
+     */
     get actualColumnCount() {
         // performance nightmare - for each row, counts all the columns used
         const counts = [];
         let count = 0;
-        this.eachRow((row) => {
+        this.eachRow(row => {
             row.eachCell(({ col }) => {
                 if (!counts[col]) {
                     counts[col] = true;
@@ -297,23 +329,41 @@ class Worksheet {
     get _nextRow() {
         return this._lastRowNumber + 1;
     }
+    /**
+     * Get the last editable row in a worksheet (or undefined if there are none)
+     */
     get lastRow() {
         if (this._rows.length) {
             return this._rows[this._rows.length - 1];
         }
         return undefined;
     }
-    // find a row (if exists) by row number
+    /**
+     * Tries to find and return row for row number, else undefined
+     *
+     * @param r - The 1-indexed row number
+     */
     findRow(r) {
         return this._rows[r - 1];
     }
-    // find multiple rows (if exists) by row number
+    /**
+     * Tries to find and return rows for row number start and length, else undefined
+     *
+     * @param start - The 1-indexed starting row number
+     * @param length - The length of the expected array
+     */
     findRows(start, length) {
         return this._rows.slice(start - 1, start - 1 + length);
     }
+    /**
+     * The total row size of the document. Equal to the row number of the last row that has values.
+     */
     get rowCount() {
         return this._lastRowNumber;
     }
+    /**
+     * A count of the number of rows that have values. If a mid-document row is empty, it will not be included in the count.
+     */
     get actualRowCount() {
         // counts actual rows that have actual data
         let count = 0;
@@ -322,7 +372,9 @@ class Worksheet {
         });
         return count;
     }
-    // get a row by row number.
+    /**
+     * Get or create row by 1-based index
+     */
     getRow(r) {
         let row = this._rows[r - 1];
         if (!row) {
@@ -330,7 +382,9 @@ class Worksheet {
         }
         return row;
     }
-    // get multiple rows by row number.
+    /**
+     * Get or create rows by 1-based index
+     */
     getRows(start, length) {
         if (length < 1) {
             return undefined;
@@ -341,6 +395,10 @@ class Worksheet {
         }
         return rows;
     }
+    /**
+     * Add a couple of Rows by key-value, after the last current row, using the column keys,
+     * or add a row by contiguous Array (assign to columns A, B & C)
+     */
     addRow(value, style = "n") {
         const rowNo = this._nextRow;
         const row = this.getRow(rowNo);
@@ -348,6 +406,9 @@ class Worksheet {
         this._setStyleOption(rowNo, style[0] === "i" ? style : "n");
         return row;
     }
+    /**
+     * Add multiple rows by providing an array of arrays or key-value pairs
+     */
     addRows(value, style = "n") {
         const rows = [];
         value.forEach(row => {
@@ -355,11 +416,19 @@ class Worksheet {
         });
         return rows;
     }
+    /**
+     * Insert a Row by key-value, at the position (shifting down all rows from position),
+     * using the column keys, or add a row by contiguous Array (assign to columns A, B & C)
+     */
     insertRow(pos, value, style = "n") {
         this.spliceRows(pos, 0, value);
         this._setStyleOption(pos, style);
         return this.getRow(pos);
     }
+    /**
+     * Insert multiple rows at position (shifting down all rows from position)
+     * by providing an array of arrays or key-value pairs
+     */
     insertRows(pos, values, style = "n") {
         this.spliceRows(pos, 0, ...values);
         if (style !== "n") {
@@ -393,6 +462,9 @@ class Worksheet {
         });
         rDst.height = rSrc.height;
     }
+    /**
+     * Duplicate rows and insert new rows
+     */
     duplicateRow(rowNum, count, insert = false) {
         // create count duplicates of rowNum
         // either inserting new or overwriting existing rows
@@ -409,6 +481,12 @@ class Worksheet {
             });
         }
     }
+    /**
+     * Cut one or more rows (rows below are shifted up)
+     * and optionally insert more
+     *
+     * Known Issue: If a splice causes any merged cells to move, the results may be unpredictable
+     */
     spliceRows(start, count, ...inserts) {
         // same problem as row.splice, except worse.
         const nKeep = start + count;
@@ -451,10 +529,10 @@ class Worksheet {
                     rSrc.eachCell({ includeEmpty: true }, (cell, colNumber) => {
                         rDst.getCell(colNumber).style = cell.style;
                         // remerge cells accounting for insert offset
-                        if (cell._value.constructor.name === "MergeValue") {
-                            const cellToBeMerged = this.getRow(cell._row._number + nInserts).getCell(colNumber);
-                            const prevMaster = cell._value._master;
-                            const newMaster = this.getRow(prevMaster._row._number + nInserts).getCell(prevMaster._column._number);
+                        if (cell.type === enums_js_1.Enums.ValueType.Merge) {
+                            const cellToBeMerged = this.getRow(cell.row + nInserts).getCell(colNumber);
+                            const prevMaster = cell.master;
+                            const newMaster = this.getRow(prevMaster.row + nInserts).getCell(prevMaster.col);
                             cellToBeMerged.merge(newMaster);
                         }
                     });
@@ -473,31 +551,33 @@ class Worksheet {
         // account for defined names
         this.workbook.definedNames.spliceRows(this.name, start, count, nInserts);
     }
-    eachRow(optionsOrIteratee, maybeIteratee) {
+    eachRow(optOrCallback, maybeCallback) {
         let options;
-        let iteratee;
-        if (typeof optionsOrIteratee === "function") {
-            iteratee = optionsOrIteratee;
+        let callback;
+        if (typeof optOrCallback === "function") {
+            callback = optOrCallback;
         }
         else {
-            options = optionsOrIteratee;
-            iteratee = maybeIteratee;
+            options = optOrCallback;
+            callback = maybeCallback;
         }
         if (options && options.includeEmpty) {
             const n = this._rows.length;
             for (let i = 1; i <= n; i++) {
-                iteratee(this.getRow(i), i);
+                callback(this.getRow(i), i);
             }
         }
         else {
             this._rows.forEach(row => {
                 if (row && row.hasValues) {
-                    iteratee(row, row.number);
+                    callback(row, row.number);
                 }
             });
         }
     }
-    // return all rows as sparse array
+    /**
+     * Return all rows as sparse array
+     */
     getSheetValues() {
         const rows = [];
         this._rows.forEach(row => {
@@ -509,13 +589,17 @@ class Worksheet {
     }
     // =========================================================================
     // Cells
-    // returns the cell at [r,c] or address given by r. If not found, return undefined
+    /**
+     * Returns the cell at [r,c] or address given by r. If not found, return undefined
+     */
     findCell(r, c) {
         const address = col_cache_js_1.colCache.getAddress(r, c);
         const row = this._rows[address.row - 1];
         return row ? row.findCell(address.col) : undefined;
     }
-    // return the cell at [r,c] or address given by r. If not found, create a new one.
+    /**
+     * Get or create cell at [r,c] or address given by r
+     */
     getCell(r, c) {
         const address = col_cache_js_1.colCache.getAddress(r, c);
         const row = this.getRow(address.row);
@@ -523,7 +607,15 @@ class Worksheet {
     }
     // =========================================================================
     // Merge
-    // convert the range defined by ['tl:br'], [tl,br] or [t,l,b,r] into a single 'merged' cell
+    /**
+     * Merge cells, either:
+     *
+     * tlbr string, e.g. `'A4:B5'`
+     *
+     * tl string, br string, e.g. `'G10', 'H11'`
+     *
+     * t, l, b, r numbers, e.g. `10,11,12,13`
+     */
     mergeCells(...cells) {
         const dimensions = new range_js_1.Range(cells);
         this._mergeCellsInternal(dimensions);
@@ -568,9 +660,11 @@ class Worksheet {
         // return true if this._merges has a merge object
         return Object.values(this._merges).some(Boolean);
     }
-    // scan the range defined by ['tl:br'], [tl,br] or [t,l,b,r] and if any cell is part of a merge,
-    // un-merge the group. Note this function can affect multiple merges and merge-blocks are
-    // atomic - either they're all merged or all un-merged.
+    /**
+     * Scan the range and if any cell is part of a merge, un-merge the group.
+     * Note this function can affect multiple merges and merge-blocks are
+     * atomic - either they're all merged or all un-merged.
+     */
     unMergeCells(...cells) {
         const dimensions = new range_js_1.Range(cells);
         // find any cells in that range and unmerge them
@@ -619,12 +713,14 @@ class Worksheet {
         for (let r = top; r <= bottom; r++) {
             for (let c = left; c <= right; c++) {
                 if (first) {
-                    this.getCell(r, c).value = {
+                    const cell = this.getCell(r, c);
+                    const formulaValue = {
                         shareType,
                         formula,
                         ref: range,
                         result: getResult(r, c)
                     };
+                    cell.value = formulaValue;
                     first = false;
                 }
                 else {
@@ -640,6 +736,10 @@ class Worksheet {
     }
     // =========================================================================
     // Images
+    /**
+     * Using the image id from `Workbook.addImage`,
+     * embed an image within the worksheet to cover a range
+     */
     addImage(imageId, range) {
         const model = {
             type: "image",
@@ -651,6 +751,9 @@ class Worksheet {
     getImages() {
         return this._media.filter(m => m.type === "image");
     }
+    /**
+     * Using the image id from `Workbook.addImage`, set the background to the worksheet
+     */
     addBackgroundImage(imageId) {
         const model = {
             type: "background",
@@ -664,6 +767,9 @@ class Worksheet {
     }
     // =========================================================================
     // Worksheet Protection
+    /**
+     * Protect the worksheet with optional password and options
+     */
     protect(password, options) {
         // TODO: make this function truly async
         // perhaps marshal to worker thread or something
@@ -698,17 +804,29 @@ class Worksheet {
     }
     // =========================================================================
     // Tables
+    /**
+     * Add a new table and return a reference to it
+     */
     addTable(model) {
         const table = new table_js_1.Table(this, model);
         this.tables[model.name] = table;
         return table;
     }
+    /**
+     * Fetch table by name
+     */
     getTable(name) {
         return this.tables[name];
     }
+    /**
+     * Delete table by name
+     */
     removeTable(name) {
         delete this.tables[name];
     }
+    /**
+     * Fetch all tables in the worksheet
+     */
     getTables() {
         return Object.values(this.tables);
     }
@@ -724,9 +842,15 @@ Please leave feedback at https://github.com/excelts/excelts/discussions/2575`);
     }
     // ===========================================================================
     // Conditional Formatting
+    /**
+     * Add conditional formatting rules
+     */
     addConditionalFormatting(cf) {
         this.conditionalFormattings.push(cf);
     }
+    /**
+     * Delete conditional formatting rules
+     */
     removeConditionalFormatting(filter) {
         if (typeof filter === "number") {
             this.conditionalFormattings.splice(filter, 1);
@@ -760,7 +884,7 @@ Please leave feedback at https://github.com/excelts/excelts/discussions/2575`);
         };
         // =================================================
         // columns
-        model.cols = column_js_1.Column.toModel(this.columns);
+        model.cols = column_js_1.Column.toModel(this.columns || []);
         // ==========================================================
         // Rows
         const rows = (model.rows = []);

package/dist/cjs/utils/sheet-utils.js

@@ -132,7 +132,9 @@ function formatValue(value, fmt, dateFormat) {
  */
 function getCellDisplayText(cell, dateFormat) {
     const value = cell.value;
-    const fmt = cell.numFmt || "General";
+    const numFmt = cell.numFmt;
+    // Extract format code string from numFmt (which can be string or NumFmt object)
+    const fmt = typeof numFmt === "string" ? numFmt : (numFmt?.formatCode ?? "General");
     // Null/undefined
     if (value == null) {
         return "";

package/dist/cjs/utils/unzip/extract.js

@@ -2,18 +2,19 @@
 /**
  * Simple ZIP extraction utilities
  * Provides easy-to-use Promise-based API for extracting ZIP files
+ * Works in both Node.js and browser environments
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZipParser = void 0;
 exports.extractAll = extractAll;
 exports.extractFile = extractFile;
 exports.listFiles = listFiles;
 exports.forEachEntry = forEachEntry;
-const stream_1 = require("stream");
-const parse_js_1 = require("./parse");
+const zip_parser_js_1 = require("./zip-parser");
 /**
  * Extract all files from a ZIP buffer
  *
- * @param zipData - ZIP file data as Buffer or Uint8Array
+ * @param zipData - ZIP file data as Buffer, Uint8Array, or ArrayBuffer
  * @returns Map of file paths to their content
  *
  * @example
@@ -30,40 +31,24 @@ const parse_js_1 = require("./parse");
  */
 async function extractAll(zipData) {
     const files = new Map();
-    const buffer = Buffer.isBuffer(zipData) ? zipData : Buffer.from(zipData);
-    const parse = (0, parse_js_1.createParse)({ forceStream: true });
-    const stream = stream_1.Readable.from([buffer]);
-    stream.pipe(parse);
-    for await (const entry of parse) {
-        const zipEntry = entry;
-        const isDirectory = zipEntry.type === "Directory";
-        if (isDirectory) {
-            files.set(zipEntry.path, {
-                path: zipEntry.path,
-                data: Buffer.alloc(0),
-                isDirectory: true,
-                size: 0
-            });
-            zipEntry.autodrain();
-        }
-        else {
-            const data = await zipEntry.buffer();
-            files.set(zipEntry.path, {
-                path: zipEntry.path,
-                data,
-                isDirectory: false,
-                size: data.length
-            });
-        }
+    const parser = new zip_parser_js_1.ZipParser(zipData);
+    for (const entry of parser.getEntries()) {
+        const data = await parser.extract(entry.path);
+        files.set(entry.path, {
+            path: entry.path,
+            data: data || new Uint8Array(0),
+            isDirectory: entry.isDirectory,
+            size: entry.uncompressedSize
+        });
     }
     return files;
 }
 /**
  * Extract a single file from a ZIP buffer
  *
- * @param zipData - ZIP file data as Buffer or Uint8Array
+ * @param zipData - ZIP file data as Buffer, Uint8Array, or ArrayBuffer
  * @param filePath - Path of the file to extract
- * @returns File content as Buffer, or null if not found
+ * @returns File content as Uint8Array, or null if not found
  *
  * @example
  * ```ts
@@ -72,31 +57,18 @@ async function extractAll(zipData) {
  * const zipData = fs.readFileSync("archive.zip");
  * const content = await extractFile(zipData, "readme.txt");
  * if (content) {
- *   console.log(content.toString("utf-8"));
+ *   console.log(new TextDecoder().decode(content));
  * }
  * ```
  */
 async function extractFile(zipData, filePath) {
-    const buffer = Buffer.isBuffer(zipData) ? zipData : Buffer.from(zipData);
-    const parse = (0, parse_js_1.createParse)({ forceStream: true });
-    const stream = stream_1.Readable.from([buffer]);
-    stream.pipe(parse);
-    for await (const entry of parse) {
-        const zipEntry = entry;
-        if (zipEntry.path === filePath) {
-            if (zipEntry.type === "Directory") {
-                return Buffer.alloc(0);
-            }
-            return zipEntry.buffer();
-        }
-        zipEntry.autodrain();
-    }
-    return null;
+    const parser = new zip_parser_js_1.ZipParser(zipData);
+    return parser.extract(filePath);
 }
 /**
  * List all file paths in a ZIP buffer (without extracting content)
  *
- * @param zipData - ZIP file data as Buffer or Uint8Array
+ * @param zipData - ZIP file data as Buffer, Uint8Array, or ArrayBuffer
  * @returns Array of file paths
  *
  * @example
@@ -109,22 +81,13 @@ async function extractFile(zipData, filePath) {
  * ```
  */
 async function listFiles(zipData) {
-    const paths = [];
-    const buffer = Buffer.isBuffer(zipData) ? zipData : Buffer.from(zipData);
-    const parse = (0, parse_js_1.createParse)({ forceStream: true });
-    const stream = stream_1.Readable.from([buffer]);
-    stream.pipe(parse);
-    for await (const entry of parse) {
-        const zipEntry = entry;
-        paths.push(zipEntry.path);
-        zipEntry.autodrain();
-    }
-    return paths;
+    const parser = new zip_parser_js_1.ZipParser(zipData);
+    return parser.listFiles();
 }
 /**
  * Iterate over ZIP entries with a callback (memory efficient for large ZIPs)
  *
- * @param zipData - ZIP file data as Buffer or Uint8Array
+ * @param zipData - ZIP file data as Buffer, Uint8Array, or ArrayBuffer
  * @param callback - Async callback for each entry, return false to stop iteration
  *
  * @example
@@ -134,33 +97,18 @@ async function listFiles(zipData) {
  * await forEachEntry(zipData, async (path, getData) => {
  *   if (path.endsWith(".xml")) {
  *     const content = await getData();
- *     console.log(content.toString("utf-8"));
+ *     console.log(new TextDecoder().decode(content));
  *   }
  *   return true; // continue iteration
  * });
  * ```
  */
 async function forEachEntry(zipData, callback) {
-    const buffer = Buffer.isBuffer(zipData) ? zipData : Buffer.from(zipData);
-    const parse = (0, parse_js_1.createParse)({ forceStream: true });
-    const stream = stream_1.Readable.from([buffer]);
-    stream.pipe(parse);
-    for await (const entry of parse) {
-        const zipEntry = entry;
-        let dataPromise = null;
-        const getData = () => {
-            if (!dataPromise) {
-                dataPromise = zipEntry.buffer();
-            }
-            return dataPromise;
-        };
-        const shouldContinue = await callback(zipEntry.path, getData, zipEntry);
-        // If callback didn't read data, drain it
-        if (!dataPromise) {
-            zipEntry.autodrain();
-        }
-        if (shouldContinue === false) {
-            break;
-        }
-    }
+    const parser = new zip_parser_js_1.ZipParser(zipData);
+    await parser.forEach(async (entry, getData) => {
+        return callback(entry.path, getData, entry);
+    });
 }
+// Re-export ZipParser for advanced usage
+var zip_parser_js_2 = require("./zip-parser");
+Object.defineProperty(exports, "ZipParser", { enumerable: true, get: function () { return zip_parser_js_2.ZipParser; } });