@cj-tech-master/excelts 1.6.2 → 1.6.3-canary.20251224124621.73c5d94

package/dist/cjs/stream/xlsx/workbook-writer.js

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkbookWriter = void 0;
 const fs_1 = __importDefault(require("fs"));
 const fflate_1 = require("fflate");
-const stream_buf_js_1 = require("../../utils/stream-buf");
-const rel_type_js_1 = require("../../xlsx/rel-type");
-const styles_xform_js_1 = require("../../xlsx/xform/style/styles-xform");
-const shared_strings_js_1 = require("../../utils/shared-strings");
-const defined_names_js_1 = require("../../doc/defined-names");
-const core_xform_js_1 = require("../../xlsx/xform/core/core-xform");
-const relationships_xform_js_1 = require("../../xlsx/xform/core/relationships-xform");
-const content_types_xform_js_1 = require("../../xlsx/xform/core/content-types-xform");
-const app_xform_js_1 = require("../../xlsx/xform/core/app-xform");
-const workbook_xform_js_1 = require("../../xlsx/xform/book/workbook-xform");
-const shared_strings_xform_js_1 = require("../../xlsx/xform/strings/shared-strings-xform");
-const worksheet_writer_js_1 = require("./worksheet-writer");
-const theme1_js_1 = require("../../xlsx/xml/theme1");
+const stream_buf_1 = require("../../utils/stream-buf");
+const rel_type_1 = require("../../xlsx/rel-type");
+const styles_xform_1 = require("../../xlsx/xform/style/styles-xform");
+const shared_strings_1 = require("../../utils/shared-strings");
+const defined_names_1 = require("../../doc/defined-names");
+const core_xform_1 = require("../../xlsx/xform/core/core-xform");
+const relationships_xform_1 = require("../../xlsx/xform/core/relationships-xform");
+const content_types_xform_1 = require("../../xlsx/xform/core/content-types-xform");
+const app_xform_1 = require("../../xlsx/xform/core/app-xform");
+const workbook_xform_1 = require("../../xlsx/xform/book/workbook-xform");
+const shared_strings_xform_1 = require("../../xlsx/xform/strings/shared-strings-xform");
+const worksheet_writer_1 = require("./worksheet-writer");
+const theme1_1 = require("../../xlsx/xml/theme1");
 class WorkbookWriter {
     constructor(options = {}) {
         this.created = options.created || new Date();
@@ -28,11 +28,11 @@ class WorkbookWriter {
         this.lastPrinted = options.lastPrinted;
         // using shared strings creates a smaller xlsx file but may use more memory
         this.useSharedStrings = options.useSharedStrings || false;
-        this.sharedStrings = new shared_strings_js_1.SharedStrings();
+        this.sharedStrings = new shared_strings_1.SharedStrings();
         // style manager
-        this.styles = options.useStyles ? new styles_xform_js_1.StylesXform(true) : new styles_xform_js_1.StylesXform.Mock(true);
+        this.styles = options.useStyles ? new styles_xform_1.StylesXform(true) : new styles_xform_1.StylesXform.Mock(true);
         // defined names
-        this._definedNames = new defined_names_js_1.DefinedNames();
+        this._definedNames = new defined_names_1.DefinedNames();
         this._worksheets = [];
         this.views = [];
         this.zipOptions = options.zip;
@@ -62,7 +62,7 @@ class WorkbookWriter {
             this.stream = fs_1.default.createWriteStream(options.filename);
         }
         else {
-            this.stream = new stream_buf_js_1.StreamBuf();
+            this.stream = new stream_buf_1.StreamBuf();
         }
         // these bits can be added right now
         this.promise = Promise.all([this.addThemes(), this.addOfficeRels()]);
@@ -71,7 +71,7 @@ class WorkbookWriter {
         return this._definedNames;
     }
     _openStream(path) {
-        const stream = new stream_buf_js_1.StreamBuf({ bufSize: 65536, batch: true });
+        const stream = new stream_buf_1.StreamBuf({ bufSize: 65536, batch: true });
         // Create a ZipDeflate for this file with compression
         const zipFile = new fflate_1.ZipDeflate(path, { level: this.compressionLevel });
         this.zip.add(zipFile);
@@ -98,14 +98,14 @@ class WorkbookWriter {
         let buffer;
         if (base64) {
             // Use Buffer.from for efficient base64 decoding
-            const base64Data = typeof data === "string" ? data : data.toString();
+            const base64Data = typeof data === "string" ? data : new TextDecoder().decode(data);
             buffer = Buffer.from(base64Data, "base64");
         }
         else if (typeof data === "string") {
             buffer = Buffer.from(data, "utf8");
         }
         else {
-            buffer = new Uint8Array(data);
+            buffer = data;
         }
         zipFile.push(buffer, true); // true = final chunk
     }
@@ -125,15 +125,15 @@ class WorkbookWriter {
         // if there are any uncommitted worksheets, commit them now and wait
         const promises = this._worksheets.map(commitWorksheet);
         if (promises.length) {
-            return Promise.all(promises);
+            return Promise.all(promises).then(() => { });
         }
         return Promise.resolve();
     }
     async commit() {
-        // commit all worksheets, then add suplimentary files
+        // commit all worksheets, then add supplementary files
         await this.promise;
-        await this.addMedia();
         await this._commitWorksheets();
+        await this.addMedia();
         await Promise.all([
             this.addContentTypes(),
             this.addApp(),
@@ -155,46 +155,60 @@ class WorkbookWriter {
         }
         return this._worksheets.length || 1;
     }
+    /**
+     * Add Image to Workbook and return the id
+     */
     addImage(image) {
         const id = this.media.length;
-        const medium = Object.assign({}, image, {
+        const medium = {
+            ...image,
             type: "image",
             name: `image${id}.${image.extension}`
-        });
+        };
         this.media.push(medium);
         return id;
     }
+    /**
+     * Get image by id
+     */
     getImage(id) {
         return this.media[id];
     }
-    addWorksheet(name, options = {}) {
+    /**
+     * Add a new worksheet and return a reference to it
+     */
+    addWorksheet(name, options) {
         // it's possible to add a worksheet with different than default
         // shared string handling
         // in fact, it's even possible to switch it mid-sheet
-        const useSharedStrings = options.useSharedStrings !== undefined ? options.useSharedStrings : this.useSharedStrings;
-        if (options.tabColor) {
+        const opts = options || {};
+        const useSharedStrings = opts.useSharedStrings !== undefined ? opts.useSharedStrings : this.useSharedStrings;
+        if (opts.tabColor) {
             console.trace("tabColor option has moved to { properties: tabColor: {...} }");
-            options.properties = Object.assign({
-                tabColor: options.tabColor
-            }, options.properties);
+            opts.properties = Object.assign({
+                tabColor: opts.tabColor
+            }, opts.properties);
         }
         const id = this.nextId;
         name = name || `sheet${id}`;
-        const worksheet = new worksheet_writer_js_1.WorksheetWriter({
+        const worksheet = new worksheet_writer_1.WorksheetWriter({
             id,
             name,
             workbook: this,
             useSharedStrings,
-            properties: options.properties,
-            state: options.state,
-            pageSetup: options.pageSetup,
-            views: options.views,
-            autoFilter: options.autoFilter,
-            headerFooter: options.headerFooter
+            properties: opts.properties,
+            state: opts.state,
+            pageSetup: opts.pageSetup,
+            views: opts.views,
+            autoFilter: opts.autoFilter,
+            headerFooter: opts.headerFooter
         });
         this._worksheets[id] = worksheet;
         return worksheet;
     }
+    /**
+     * Fetch sheet by name or id
+     */
     getWorksheet(id) {
         if (id === undefined) {
             return this._worksheets.find(() => true);
@@ -203,7 +217,7 @@ class WorkbookWriter {
             return this._worksheets[id];
         }
         if (typeof id === "string") {
-            return this._worksheets.find((worksheet) => worksheet && worksheet.name === id);
+            return this._worksheets.find(worksheet => worksheet && worksheet.name === id);
         }
         return undefined;
     }
@@ -215,17 +229,17 @@ class WorkbookWriter {
     }
     addThemes() {
         return new Promise(resolve => {
-            this._addFile(theme1_js_1.theme1Xml, "xl/theme/theme1.xml");
+            this._addFile(theme1_1.theme1Xml, "xl/theme/theme1.xml");
             resolve();
         });
     }
     addOfficeRels() {
         return new Promise(resolve => {
-            const xform = new relationships_xform_js_1.RelationshipsXform();
+            const xform = new relationships_xform_1.RelationshipsXform();
             const xml = xform.toXml([
-                { Id: "rId1", Type: rel_type_js_1.RelType.OfficeDocument, Target: "xl/workbook.xml" },
-                { Id: "rId2", Type: rel_type_js_1.RelType.CoreProperties, Target: "docProps/core.xml" },
-                { Id: "rId3", Type: rel_type_js_1.RelType.ExtenderProperties, Target: "docProps/app.xml" }
+                { Id: "rId1", Type: rel_type_1.RelType.OfficeDocument, Target: "xl/workbook.xml" },
+                { Id: "rId2", Type: rel_type_1.RelType.CoreProperties, Target: "docProps/core.xml" },
+                { Id: "rId3", Type: rel_type_1.RelType.ExtenderProperties, Target: "docProps/app.xml" }
             ]);
             this._addFile(xml, "_rels/.rels");
             resolve();
@@ -239,7 +253,7 @@ class WorkbookWriter {
                 commentRefs: this.commentRefs,
                 media: this.media
             };
-            const xform = new content_types_xform_js_1.ContentTypesXform();
+            const xform = new content_types_xform_1.ContentTypesXform();
             const xml = xform.toXml(model);
             this._addFile(xml, "[Content_Types].xml");
             resolve();
@@ -256,7 +270,7 @@ class WorkbookWriter {
                                 reject(err);
                             }
                             else {
-                                resolve(data);
+                                resolve(new Uint8Array(data));
                             }
                         });
                     });
@@ -265,13 +279,13 @@ class WorkbookWriter {
                 }
                 if (medium.buffer) {
                     this._addFile(medium.buffer, filename);
-                    return Promise.resolve();
+                    return;
                 }
                 if (medium.base64) {
                     const dataimg64 = medium.base64;
                     const content = dataimg64.substring(dataimg64.indexOf(",") + 1);
                     this._addFile(content, filename, true);
-                    return Promise.resolve();
+                    return;
                 }
             }
             throw new Error("Unsupported media");
@@ -282,7 +296,7 @@ class WorkbookWriter {
             const model = {
                 worksheets: this._worksheets.filter(Boolean)
             };
-            const xform = new app_xform_js_1.AppXform();
+            const xform = new app_xform_1.AppXform();
             const xml = xform.toXml(model);
             this._addFile(xml, "docProps/app.xml");
             resolve();
@@ -290,7 +304,7 @@ class WorkbookWriter {
     }
     addCore() {
         return new Promise(resolve => {
-            const coreXform = new core_xform_js_1.CoreXform();
+            const coreXform = new core_xform_1.CoreXform();
             const xml = coreXform.toXml(this);
             this._addFile(xml, "docProps/core.xml");
             resolve();
@@ -299,7 +313,7 @@ class WorkbookWriter {
     addSharedStrings() {
         if (this.sharedStrings.count) {
             return new Promise(resolve => {
-                const sharedStringsXform = new shared_strings_xform_js_1.SharedStringsXform();
+                const sharedStringsXform = new shared_strings_xform_1.SharedStringsXform();
                 const xml = sharedStringsXform.toXml(this.sharedStrings);
                 this._addFile(xml, "xl/sharedStrings.xml");
                 resolve();
@@ -310,13 +324,13 @@ class WorkbookWriter {
     addWorkbookRels() {
         let count = 1;
         const relationships = [
-            { Id: `rId${count++}`, Type: rel_type_js_1.RelType.Styles, Target: "styles.xml" },
-            { Id: `rId${count++}`, Type: rel_type_js_1.RelType.Theme, Target: "theme/theme1.xml" }
+            { Id: `rId${count++}`, Type: rel_type_1.RelType.Styles, Target: "styles.xml" },
+            { Id: `rId${count++}`, Type: rel_type_1.RelType.Theme, Target: "theme/theme1.xml" }
         ];
         if (this.sharedStrings.count) {
             relationships.push({
                 Id: `rId${count++}`,
-                Type: rel_type_js_1.RelType.SharedStrings,
+                Type: rel_type_1.RelType.SharedStrings,
                 Target: "sharedStrings.xml"
             });
         }
@@ -325,13 +339,13 @@ class WorkbookWriter {
                 worksheet.rId = `rId${count++}`;
                 relationships.push({
                     Id: worksheet.rId,
-                    Type: rel_type_js_1.RelType.Worksheet,
+                    Type: rel_type_1.RelType.Worksheet,
                     Target: `worksheets/sheet${worksheet.id}.xml`
                 });
             }
         });
         return new Promise(resolve => {
-            const xform = new relationships_xform_js_1.RelationshipsXform();
+            const xform = new relationships_xform_1.RelationshipsXform();
             const xml = xform.toXml(relationships);
             this._addFile(xml, "xl/_rels/workbook.xml.rels");
             resolve();
@@ -346,7 +360,7 @@ class WorkbookWriter {
             calcProperties: {}
         };
         return new Promise(resolve => {
-            const xform = new workbook_xform_js_1.WorkbookXform();
+            const xform = new workbook_xform_1.WorkbookXform();
             xform.prepare(model);
             this._addFile(xform.toXml(model), "xl/workbook.xml");
             resolve();

package/dist/cjs/stream/xlsx/worksheet-reader.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorksheetReader = void 0;
 const events_1 = require("events");
-const parse_sax_js_1 = require("../../utils/parse-sax");
-const utils_js_1 = require("../../utils/utils");
-const col_cache_js_1 = require("../../utils/col-cache");
-const range_js_1 = require("../../doc/range");
-const row_js_1 = require("../../doc/row");
-const column_js_1 = require("../../doc/column");
+const parse_sax_1 = require("../../utils/parse-sax");
+const utils_1 = require("../../utils/utils");
+const col_cache_1 = require("../../utils/col-cache");
+const range_1 = require("../../doc/range");
+const row_1 = require("../../doc/row");
+const column_1 = require("../../doc/column");
 class WorksheetReader extends events_1.EventEmitter {
     constructor({ workbook, id, iterator, options }) {
         super();
@@ -21,14 +21,14 @@ class WorksheetReader extends events_1.EventEmitter {
         this._columns = null;
         this._keys = {};
         // keep a record of dimensions
-        this._dimensions = new range_js_1.Dimensions();
+        this._dimensions = new range_1.Dimensions();
     }
     // destroy - not a valid operation for a streaming writer
     // even though some streamers might be able to, it's a bad idea.
     destroy() {
         throw new Error("Invalid Operation: destroy");
     }
-    // return the current dimensions of the writer
+    // return the current dimensions of the reader
     get dimensions() {
         return this._dimensions;
     }
@@ -47,8 +47,8 @@ class WorksheetReader extends events_1.EventEmitter {
             if (col) {
                 return col;
             }
-            // otherise, assume letter
-            c = col_cache_js_1.colCache.l2n(c);
+            // otherwise, assume letter
+            c = col_cache_1.colCache.l2n(c);
         }
         if (!this._columns) {
             this._columns = [];
@@ -56,7 +56,7 @@ class WorksheetReader extends events_1.EventEmitter {
         if (c > this._columns.length) {
             let n = this._columns.length + 1;
             while (n <= c) {
-                this._columns.push(new column_js_1.Column(this, n++));
+                this._columns.push(new column_1.Column(this, n++));
             }
         }
         return this._columns[c - 1];
@@ -88,9 +88,9 @@ class WorksheetReader extends events_1.EventEmitter {
     }
     async *[Symbol.asyncIterator]() {
         for await (const events of this.parse()) {
-            for (const { eventType, value } of events) {
-                if (eventType === "row") {
-                    yield value;
+            for (const event of events) {
+                if (event.eventType === "row") {
+                    yield event.value;
                 }
             }
         }
@@ -133,7 +133,7 @@ class WorksheetReader extends events_1.EventEmitter {
         let row = null;
         let c = null;
         let current = null;
-        for await (const events of (0, parse_sax_js_1.parseSax)(iterator)) {
+        for await (const events of (0, parse_sax_1.parseSax)(iterator)) {
             const worksheetEvents = [];
             for (const { eventType, value } of events) {
                 if (eventType === "opentag") {
@@ -160,7 +160,7 @@ class WorksheetReader extends events_1.EventEmitter {
                             case "row":
                                 if (inRows) {
                                     const r = parseInt(node.attributes.r, 10);
-                                    row = new row_js_1.Row(this, r);
+                                    row = new row_1.Row(this, r);
                                     if (node.attributes.ht) {
                                         row.height = parseFloat(node.attributes.ht);
                                     }
@@ -244,7 +244,7 @@ class WorksheetReader extends events_1.EventEmitter {
                         switch (node.name) {
                             case "cols":
                                 inCols = false;
-                                this._columns = column_js_1.Column.fromModel(cols);
+                                this._columns = column_1.Column.fromModel(cols);
                                 break;
                             case "sheetData":
                                 inRows = false;
@@ -256,7 +256,7 @@ class WorksheetReader extends events_1.EventEmitter {
                                 break;
                             case "c":
                                 if (row && c) {
-                                    const address = col_cache_js_1.colCache.decodeAddress(c.ref);
+                                    const address = col_cache_1.colCache.decodeAddress(c.ref);
                                     const cell = row.getCell(address.col);
                                     if (c.s) {
                                         const style = styles.getStyleModel(c.s);
@@ -270,7 +270,7 @@ class WorksheetReader extends events_1.EventEmitter {
                                         };
                                         if (c.v) {
                                             if (c.t === "str") {
-                                                cellValue.result = (0, utils_js_1.xmlDecode)(c.v.text);
+                                                cellValue.result = (0, utils_1.xmlDecode)(c.v.text);
                                             }
                                             else {
                                                 cellValue.result = parseFloat(c.v.text);
@@ -286,6 +286,7 @@ class WorksheetReader extends events_1.EventEmitter {
                                                     cell.value = sharedStrings[index];
                                                 }
                                                 else {
+                                                    // Streaming format - unresolved shared string reference
                                                     cell.value = {
                                                         sharedString: index
                                                     };
@@ -294,7 +295,7 @@ class WorksheetReader extends events_1.EventEmitter {
                                             }
                                             case "inlineStr":
                                             case "str":
-                                                cell.value = (0, utils_js_1.xmlDecode)(c.v.text);
+                                                cell.value = (0, utils_1.xmlDecode)(c.v.text);
                                                 break;
                                             case "e":
                                                 cell.value = { error: c.v.text };
@@ -302,19 +303,22 @@ class WorksheetReader extends events_1.EventEmitter {
                                             case "b":
                                                 cell.value = parseInt(c.v.text, 10) !== 0;
                                                 break;
-                                            default:
-                                                if ((0, utils_js_1.isDateFmt)(cell.numFmt)) {
-                                                    cell.value = (0, utils_js_1.excelToDate)(parseFloat(c.v.text), properties.model && properties.model.date1904);
+                                            default: {
+                                                const numFmtStr = typeof cell.numFmt === "string" ? cell.numFmt : cell.numFmt?.formatCode;
+                                                if (numFmtStr && (0, utils_1.isDateFmt)(numFmtStr)) {
+                                                    cell.value = (0, utils_1.excelToDate)(parseFloat(c.v.text), properties?.model?.date1904);
                                                 }
                                                 else {
                                                     cell.value = parseFloat(c.v.text);
                                                 }
                                                 break;
+                                            }
                                         }
                                     }
                                     if (hyperlinks) {
                                         const hyperlink = hyperlinks[c.ref];
                                         if (hyperlink) {
+                                            // Streaming-specific: assign text and hyperlink for further processing
                                             cell.text = cell.value;
                                             cell.value = undefined;
                                             cell.hyperlink = hyperlink;