@cj-tech-master/excelts 5.0.0-canary.20260123012457.1fdf506 → 5.0.1-canary.20260123024428.98c7ee0

package/dist/browser/modules/excel/xlsx/xlsx.browser.d.ts

@@ -201,7 +201,15 @@ declare class XLSX {
     _processTableEntry(stream: IParseStream, model: any, name: string): Promise<void>;
     _processWorksheetRelsEntry(stream: IParseStream, model: any, sheetNo: number): Promise<void>;
     _processMediaEntry(stream: IParseStream, model: any, filename: string): Promise<void>;
-    _processDrawingEntry(entry: any, model: any, name: string): Promise<void>;
+    /**
+     * Process a drawing XML entry.
+     *
+     * @param stream - Stream to read from (used in loadFromZipEntries path)
+     * @param model - Model to populate
+     * @param name - Drawing name (e.g., "drawing1")
+     * @param rawData - Pre-read raw data (used in loadFromFiles path to avoid re-reading stream)
+     */
+    _processDrawingEntry(stream: IParseStream, model: any, name: string, rawData?: Uint8Array): Promise<void>;
     _processDrawingRelsEntry(entry: any, model: any, name: string): Promise<void>;
     _processVmlDrawingEntry(entry: any, model: any, name: string): Promise<void>;
     _processThemeEntry(stream: IParseStream, model: any, name: string): Promise<void>;

package/dist/browser/modules/excel/xlsx/xlsx.browser.js

@@ -761,16 +761,26 @@ class XLSX {
             });
         }
     }
-    async _processDrawingEntry(entry, model, name) {
-        // Collect raw data first so we can preserve drawings that reference charts.
-        const rawData = await this.collectStreamData(entry);
+    /**
+     * Process a drawing XML entry.
+     *
+     * @param stream - Stream to read from (used in loadFromZipEntries path)
+     * @param model - Model to populate
+     * @param name - Drawing name (e.g., "drawing1")
+     * @param rawData - Pre-read raw data (used in loadFromFiles path to avoid re-reading stream)
+     */
+    async _processDrawingEntry(stream, model, name, rawData) {
+        // Use provided rawData if available (loadFromFiles path), otherwise collect from stream.
+        // In loadFromFiles, the stream is created from already-decoded text, and collecting from
+        // it may not work correctly due to PassThrough stream timing issues.
+        const data = rawData ?? (await this.collectStreamData(stream));
         // Parse the drawing for normal processing (images, etc.)
         const xform = new DrawingXform();
-        const xmlString = this.bufferToString(rawData);
+        const xmlString = this.bufferToString(data);
         const drawing = await xform.parseStream(this.createTextStream(xmlString));
         model.drawings[name] = drawing;
         // Store raw data; reconcile() may later drop it if charts are not referenced.
-        model.rawDrawings[name] = rawData;
+        model.rawDrawings[name] = data;
     }
     async _processDrawingRelsEntry(entry, model, name) {
         const xform = new RelationshipsXform();
@@ -887,11 +897,8 @@ class XLSX {
         }
         const drawingName = getDrawingNameFromPath(entryName);
         if (drawingName) {
-            await this._processDrawingEntry(stream, model, drawingName);
-            // For loadFromFiles path, store raw data for passthrough (drawings with charts)
-            if (rawData) {
-                model.rawDrawings[drawingName] = rawData;
-            }
+            await this._processDrawingEntry(stream, model, drawingName, rawData);
+            // rawData is now stored inside _processDrawingEntry
             return true;
         }
         const drawingRelsName = getDrawingNameFromRelsPath(entryName);

package/dist/cjs/modules/excel/xlsx/xlsx.browser.js

@@ -764,16 +764,26 @@ class XLSX {
             });
         }
     }
-    async _processDrawingEntry(entry, model, name) {
-        // Collect raw data first so we can preserve drawings that reference charts.
-        const rawData = await this.collectStreamData(entry);
+    /**
+     * Process a drawing XML entry.
+     *
+     * @param stream - Stream to read from (used in loadFromZipEntries path)
+     * @param model - Model to populate
+     * @param name - Drawing name (e.g., "drawing1")
+     * @param rawData - Pre-read raw data (used in loadFromFiles path to avoid re-reading stream)
+     */
+    async _processDrawingEntry(stream, model, name, rawData) {
+        // Use provided rawData if available (loadFromFiles path), otherwise collect from stream.
+        // In loadFromFiles, the stream is created from already-decoded text, and collecting from
+        // it may not work correctly due to PassThrough stream timing issues.
+        const data = rawData ?? (await this.collectStreamData(stream));
         // Parse the drawing for normal processing (images, etc.)
         const xform = new drawing_xform_1.DrawingXform();
-        const xmlString = this.bufferToString(rawData);
+        const xmlString = this.bufferToString(data);
         const drawing = await xform.parseStream(this.createTextStream(xmlString));
         model.drawings[name] = drawing;
         // Store raw data; reconcile() may later drop it if charts are not referenced.
-        model.rawDrawings[name] = rawData;
+        model.rawDrawings[name] = data;
     }
     async _processDrawingRelsEntry(entry, model, name) {
         const xform = new relationships_xform_1.RelationshipsXform();
@@ -890,11 +900,8 @@ class XLSX {
         }
         const drawingName = (0, ooxml_paths_1.getDrawingNameFromPath)(entryName);
         if (drawingName) {
-            await this._processDrawingEntry(stream, model, drawingName);
-            // For loadFromFiles path, store raw data for passthrough (drawings with charts)
-            if (rawData) {
-                model.rawDrawings[drawingName] = rawData;
-            }
+            await this._processDrawingEntry(stream, model, drawingName, rawData);
+            // rawData is now stored inside _processDrawingEntry
             return true;
         }
         const drawingRelsName = (0, ooxml_paths_1.getDrawingNameFromRelsPath)(entryName);

package/dist/esm/modules/excel/xlsx/xlsx.browser.js

@@ -761,16 +761,26 @@ class XLSX {
             });
         }
     }
-    async _processDrawingEntry(entry, model, name) {
-        // Collect raw data first so we can preserve drawings that reference charts.
-        const rawData = await this.collectStreamData(entry);
+    /**
+     * Process a drawing XML entry.
+     *
+     * @param stream - Stream to read from (used in loadFromZipEntries path)
+     * @param model - Model to populate
+     * @param name - Drawing name (e.g., "drawing1")
+     * @param rawData - Pre-read raw data (used in loadFromFiles path to avoid re-reading stream)
+     */
+    async _processDrawingEntry(stream, model, name, rawData) {
+        // Use provided rawData if available (loadFromFiles path), otherwise collect from stream.
+        // In loadFromFiles, the stream is created from already-decoded text, and collecting from
+        // it may not work correctly due to PassThrough stream timing issues.
+        const data = rawData ?? (await this.collectStreamData(stream));
         // Parse the drawing for normal processing (images, etc.)
         const xform = new DrawingXform();
-        const xmlString = this.bufferToString(rawData);
+        const xmlString = this.bufferToString(data);
         const drawing = await xform.parseStream(this.createTextStream(xmlString));
         model.drawings[name] = drawing;
         // Store raw data; reconcile() may later drop it if charts are not referenced.
-        model.rawDrawings[name] = rawData;
+        model.rawDrawings[name] = data;
     }
     async _processDrawingRelsEntry(entry, model, name) {
         const xform = new RelationshipsXform();
@@ -887,11 +897,8 @@ class XLSX {
         }
         const drawingName = getDrawingNameFromPath(entryName);
         if (drawingName) {
-            await this._processDrawingEntry(stream, model, drawingName);
-            // For loadFromFiles path, store raw data for passthrough (drawings with charts)
-            if (rawData) {
-                model.rawDrawings[drawingName] = rawData;
-            }
+            await this._processDrawingEntry(stream, model, drawingName, rawData);
+            // rawData is now stored inside _processDrawingEntry
             return true;
         }
         const drawingRelsName = getDrawingNameFromRelsPath(entryName);

package/dist/iife/excelts.iife.js

@@ -1,5 +1,5 @@
 /*!
- * @cj-tech-master/excelts v5.0.0-canary.20260123012457.1fdf506
+ * @cj-tech-master/excelts v5.0.1-canary.20260123024428.98c7ee0
  * TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.
  * (c) 2026 cjnoname
  * Released under the MIT License
@@ -21124,13 +21124,21 @@ var ExcelTS = (function(exports) {
 				});
 			}
 		}
-		async _processDrawingEntry(entry, model, name) {
-			const rawData = await this.collectStreamData(entry);
+		/**
+		* Process a drawing XML entry.
+		*
+		* @param stream - Stream to read from (used in loadFromZipEntries path)
+		* @param model - Model to populate
+		* @param name - Drawing name (e.g., "drawing1")
+		* @param rawData - Pre-read raw data (used in loadFromFiles path to avoid re-reading stream)
+		*/
+		async _processDrawingEntry(stream, model, name, rawData) {
+			const data = rawData ?? await this.collectStreamData(stream);
 			const xform = new DrawingXform();
-			const xmlString = this.bufferToString(rawData);
+			const xmlString = this.bufferToString(data);
 			const drawing = await xform.parseStream(this.createTextStream(xmlString));
 			model.drawings[name] = drawing;
-			model.rawDrawings[name] = rawData;
+			model.rawDrawings[name] = data;
 		}
 		async _processDrawingRelsEntry(entry, model, name) {
 			const relationships = await new RelationshipsXform().parseStream(entry);
@@ -21217,8 +21225,7 @@ var ExcelTS = (function(exports) {
 			}
 			const drawingName = getDrawingNameFromPath(entryName);
 			if (drawingName) {
-				await this._processDrawingEntry(stream, model, drawingName);
-				if (rawData) model.rawDrawings[drawingName] = rawData;
+				await this._processDrawingEntry(stream, model, drawingName, rawData);
 				return true;
 			}
 			const drawingRelsName = getDrawingNameFromRelsPath(entryName);