@cj-tech-master/excelts 6.0.0 → 6.1.0

package/dist/iife/excelts.iife.js

@@ -1,5 +1,5 @@
 /*!
-* @cj-tech-master/excelts v6.0.0
+* @cj-tech-master/excelts v6.1.0
 * TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.
 * (c) 2026 cjnoname
 * Released under the MIT License
@@ -2520,18 +2520,20 @@ var ExcelTS = (function(exports) {
 			return new Anchor(void 0, model);
 		}
 		get col() {
-			return this.nativeCol + Math.min(this.colWidth - 1, this.nativeColOff) / this.colWidth;
+			return this.nativeColOff === 0 ? this.nativeCol : this.nativeCol + Math.min(this.colWidth - 1, this.nativeColOff) / this.colWidth;
 		}
 		set col(v) {
 			this.nativeCol = Math.floor(v);
-			this.nativeColOff = Math.floor((v - this.nativeCol) * this.colWidth);
+			const fraction = v - this.nativeCol;
+			this.nativeColOff = fraction === 0 ? 0 : Math.floor(fraction * this.colWidth);
 		}
 		get row() {
-			return this.nativeRow + Math.min(this.rowHeight - 1, this.nativeRowOff) / this.rowHeight;
+			return this.nativeRowOff === 0 ? this.nativeRow : this.nativeRow + Math.min(this.rowHeight - 1, this.nativeRowOff) / this.rowHeight;
 		}
 		set row(v) {
 			this.nativeRow = Math.floor(v);
-			this.nativeRowOff = Math.floor((v - this.nativeRow) * this.rowHeight);
+			const fraction = v - this.nativeRow;
+			this.nativeRowOff = fraction === 0 ? 0 : Math.floor(fraction * this.rowHeight);
 		}
 		get colWidth() {
 			return this.worksheet && this.worksheet.getColumn(this.nativeCol + 1) && this.worksheet.getColumn(this.nativeCol + 1).isCustomWidth ? Math.floor(this.worksheet.getColumn(this.nativeCol + 1).width * 1e4) : 64e4;
@@ -5257,7 +5259,7 @@ var ExcelTS = (function(exports) {
 		* Duplicate rows and insert new rows
 		*/
 		duplicateRow(rowNum, count, insert = false) {
-			const rSrc = this._rows[rowNum - 1];
+			const rSrc = this.getRow(rowNum);
 			const inserts = Array.from({ length: count }).fill(rSrc.values);
 			const srcMerges = [];
 			for (const merge of Object.values(this._merges)) if (merge.top === rowNum && merge.bottom === rowNum) srcMerges.push(merge);
@@ -13440,6 +13442,94 @@ var ExcelTS = (function(exports) {
 		}
 	};
 	//#endregion
+	//#region src/modules/excel/utils/drawing-utils.ts
+	/**
+	* Shared utilities for building drawing models (anchors + relationships)
+	* used by both the streaming WorksheetWriter and the non-streaming WorkSheetXform.
+	*
+	* This eliminates the duplicated anchor/rel building logic and provides
+	* a single, correct image-rel deduplication strategy.
+	*/
+	/**
+	* Resolves a media filename into the drawing-level relative target path.
+	*
+	* In the non-streaming path, media entries have separate `name` and `extension`
+	* fields (e.g. name="image0", extension="png").
+	* In the streaming path, `name` already includes the extension (e.g. "image0.png").
+	*
+	* This function accepts both forms and returns e.g. `"../media/image0.png"`.
+	*/
+	function resolveMediaTarget(medium) {
+		return mediaRelTargetFromRels(medium.name && medium.extension && medium.name.endsWith(`.${medium.extension}`) ? medium.name : `${medium.name}.${medium.extension}`);
+	}
+	/**
+	* Build the drawing anchors and relationships from a list of image media entries.
+	*
+	* This is the core logic shared between:
+	* - `WorksheetWriter._writeDrawing()` (streaming)
+	* - `WorkSheetXform.prepare()` (non-streaming)
+	*
+	* It correctly deduplicates image rels: if the same `imageId` is used for
+	* multiple anchors, only one image relationship is created and shared.
+	*/
+	function buildDrawingAnchorsAndRels(media, existingRels, options) {
+		const anchors = [];
+		const rels = [...existingRels];
+		const imageRIdMap = {};
+		for (const medium of media) {
+			const imageId = String(medium.imageId);
+			const bookImage = options.getBookImage(medium.imageId);
+			if (!bookImage) continue;
+			let rIdImage = imageRIdMap[imageId];
+			if (!rIdImage) {
+				rIdImage = options.nextRId(rels);
+				imageRIdMap[imageId] = rIdImage;
+				rels.push({
+					Id: rIdImage,
+					Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
+					Target: resolveMediaTarget(bookImage)
+				});
+			}
+			const anchor = {
+				picture: { rId: rIdImage },
+				range: medium.range
+			};
+			if (medium.hyperlinks && medium.hyperlinks.hyperlink) {
+				const rIdHyperlink = options.nextRId(rels);
+				anchor.picture.hyperlinks = {
+					tooltip: medium.hyperlinks.tooltip,
+					rId: rIdHyperlink
+				};
+				rels.push({
+					Id: rIdHyperlink,
+					Type: RelType.Hyperlink,
+					Target: medium.hyperlinks.hyperlink,
+					TargetMode: "External"
+				});
+			}
+			anchors.push(anchor);
+		}
+		return {
+			anchors,
+			rels
+		};
+	}
+	/**
+	* Filter drawing anchors to remove invalid entries before XML generation.
+	*
+	* Shared between streaming `WorkbookWriterBase.addDrawings()` and
+	* non-streaming `XLSX.addDrawings()`.
+	*/
+	function filterDrawingAnchors(anchors) {
+		return anchors.filter((a) => {
+			if (a == null) return false;
+			if (a.range?.br && a.shape) return true;
+			if (!a.range?.br && !a.picture) return false;
+			if (a.range?.br && !a.picture && !a.shape) return false;
+			return true;
+		});
+	}
+	//#endregion
 	//#region src/modules/excel/xlsx/xform/sheet/worksheet-xform.ts
 	const mergeRule = (rule, extRule) => {
 		Object.keys(extRule).forEach((key) => {
@@ -13601,68 +13691,46 @@ var ExcelTS = (function(exports) {
 					Target: drawingRelTargetFromWorksheet(drawing.name)
 				});
 			}
-			const drawingRelsHash = [];
-			let bookImage;
+			const backgroundMedia = [];
+			const imageMedia = [];
 			model.media.forEach((medium) => {
-				if (medium.type === "background") {
-					const rId = nextRid(rels);
-					bookImage = options.media[medium.imageId];
+				if (medium.type === "background") backgroundMedia.push(medium);
+				else if (medium.type === "image") imageMedia.push(medium);
+			});
+			backgroundMedia.forEach((medium) => {
+				const rId = nextRid(rels);
+				const bookImage = options.media[medium.imageId];
+				rels.push({
+					Id: rId,
+					Type: RelType.Image,
+					Target: resolveMediaTarget(bookImage)
+				});
+				model.background = { rId };
+				model.image = options.media[medium.imageId];
+			});
+			if (imageMedia.length > 0) {
+				let { drawing } = model;
+				if (!drawing) {
+					drawing = model.drawing = {
+						rId: nextRid(rels),
+						name: `drawing${++options.drawingsCount}`,
+						anchors: [],
+						rels: []
+					};
+					options.drawings.push(drawing);
 					rels.push({
-						Id: rId,
-						Type: RelType.Image,
-						Target: mediaRelTargetFromRels(`${bookImage.name}.${bookImage.extension}`)
+						Id: drawing.rId,
+						Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
+						Target: drawingRelTargetFromWorksheet(drawing.name)
 					});
-					model.background = { rId };
-					model.image = options.media[medium.imageId];
-				} else if (medium.type === "image") {
-					let { drawing } = model;
-					bookImage = options.media[medium.imageId];
-					if (!drawing) {
-						drawing = model.drawing = {
-							rId: nextRid(rels),
-							name: `drawing${++options.drawingsCount}`,
-							anchors: [],
-							rels: []
-						};
-						options.drawings.push(drawing);
-						rels.push({
-							Id: drawing.rId,
-							Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
-							Target: drawingRelTargetFromWorksheet(drawing.name)
-						});
-					}
-					let rIdImage = this.preImageId === medium.imageId ? drawingRelsHash[medium.imageId] : drawingRelsHash[drawing.rels.length];
-					if (!rIdImage) {
-						rIdImage = nextRid(drawing.rels);
-						drawingRelsHash[drawing.rels.length] = rIdImage;
-						drawing.rels.push({
-							Id: rIdImage,
-							Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-							Target: mediaRelTargetFromRels(`${bookImage.name}.${bookImage.extension}`)
-						});
-					}
-					const anchor = {
-						picture: { rId: rIdImage },
-						range: medium.range
-					};
-					if (medium.hyperlinks && medium.hyperlinks.hyperlink) {
-						const rIdHyperLink = nextRid(drawing.rels);
-						drawingRelsHash[drawing.rels.length] = rIdHyperLink;
-						anchor.picture.hyperlinks = {
-							tooltip: medium.hyperlinks.tooltip,
-							rId: rIdHyperLink
-						};
-						drawing.rels.push({
-							Id: rIdHyperLink,
-							Type: RelType.Hyperlink,
-							Target: medium.hyperlinks.hyperlink,
-							TargetMode: "External"
-						});
-					}
-					this.preImageId = medium.imageId;
-					drawing.anchors.push(anchor);
 				}
-			});
+				const result = buildDrawingAnchorsAndRels(imageMedia, drawing.rels, {
+					getBookImage: (id) => options.media[id],
+					nextRId: (currentRels) => nextRid(currentRels)
+				});
+				drawing.anchors.push(...result.anchors);
+				drawing.rels = result.rels;
+			}
 			model.tables.forEach((table) => {
 				const rId = nextRid(rels);
 				table.rId = rId;
@@ -29647,13 +29715,7 @@ self.onmessage = async function(event) {
 				if (drawing) {
 					if (this.drawingHasChartReference(drawing) && rawDrawings[drawing.name]) zip.append(rawDrawings[drawing.name], { name: drawingPath(drawing.name) });
 					else {
-						const filteredAnchors = (drawing.anchors ?? []).filter((a) => {
-							if (a == null) return false;
-							if (a.range?.br && a.shape) return true;
-							if (!a.br && !a.picture) return false;
-							if (a.br && !a.picture && !a.shape) return false;
-							return true;
-						});
+						const filteredAnchors = filterDrawingAnchors(drawing.anchors ?? []);
 						const drawingForWrite = drawing.anchors ? {
 							...drawing,
 							anchors: filteredAnchors
@@ -29995,6 +30057,7 @@ self.onmessage = async function(event) {
 		pageSeteup: new PageSetupXform(),
 		autoFilter: new AutoFilterXform$1(),
 		picture: new PictureXform(),
+		drawing: new DrawingXform$1(),
 		conditionalFormattings: new ConditionalFormattingsXform(),
 		headerFooter: new HeaderFooterXform(),
 		rowBreaks: new RowBreaksXform(),
@@ -30103,10 +30166,11 @@ self.onmessage = async function(event) {
 			this._writeDataValidations();
 			this._writePageMargins();
 			this._writePageSetup();
-			this._writeBackground();
 			this._writeHeaderFooter();
 			this._writeRowBreaks();
 			this._writeColBreaks();
+			this._writeDrawing();
+			this._writeBackground();
 			this._writeLegacyData();
 			this._writeCloseWorksheet();
 			this.stream.end();
@@ -30253,11 +30317,62 @@ self.onmessage = async function(event) {
 			else this.conditionalFormatting = [];
 		}
 		addBackgroundImage(imageId) {
-			this._background = { imageId };
+			this._background = { imageId: Number(imageId) };
 		}
 		getBackgroundImageId() {
 			return this._background && this._background.imageId;
 		}
+		/**
+		* Using the image id from `WorkbookWriter.addImage`,
+		* embed an image within the worksheet to cover a range.
+		*/
+		addImage(imageId, range) {
+			const model = this._parseImageRange(String(imageId), range);
+			this._media.push(model);
+		}
+		/**
+		* Return the images that have been added to this worksheet.
+		* Each entry contains imageId and the normalised range (with native anchors).
+		*/
+		getImages() {
+			return this._media;
+		}
+		/**
+		* Parse the user-supplied range into a normalised internal model
+		* mirroring what the regular Worksheet / Image class does.
+		*/
+		_parseImageRange(imageId, range) {
+			if (typeof range === "string") {
+				const decoded = colCache.decode(range);
+				if ("top" in decoded) return {
+					type: "image",
+					imageId,
+					range: {
+						tl: new Anchor(this, {
+							col: decoded.left,
+							row: decoded.top
+						}, -1).model,
+						br: new Anchor(this, {
+							col: decoded.right,
+							row: decoded.bottom
+						}, 0).model,
+						editAs: "oneCell"
+					}
+				};
+				throw new Error(`Invalid image range: "${range}". Expected a range like "A1:C3".`);
+			}
+			return {
+				type: "image",
+				imageId,
+				range: {
+					tl: new Anchor(this, range.tl, 0).model,
+					br: range.br ? new Anchor(this, range.br, 0).model : void 0,
+					ext: range.ext,
+					editAs: range.editAs
+				},
+				hyperlinks: range.hyperlinks
+			};
+		}
 		async protect(password, options) {
 			this.sheetProtection = { sheet: true };
 			if (options && "spinCount" in options) options.spinCount = Number.isFinite(options.spinCount) ? Math.round(Math.max(0, options.spinCount)) : 1e5;
@@ -30388,6 +30503,29 @@ self.onmessage = async function(event) {
 		_writeAutoFilter() {
 			this.stream.write(xform.autoFilter.toXml(this.autoFilter));
 		}
+		_writeDrawing() {
+			if (this._media.length === 0) return;
+			const drawingName = `drawing${this.id}`;
+			const drawingRId = this._sheetRelsWriter.addRelationship({
+				Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
+				Target: drawingRelTargetFromWorksheet(drawingName)
+			});
+			const { anchors, rels } = buildDrawingAnchorsAndRels(this._media, [], {
+				getBookImage: (id) => this._workbook.getImage(Number(id)),
+				nextRId: (currentRels) => `rId${currentRels.length + 1}`
+			});
+			this._drawing = {
+				rId: drawingRId,
+				name: drawingName,
+				anchors,
+				rels
+			};
+			this.stream.write(xform.drawing.toXml({ rId: drawingRId }));
+		}
+		/** Returns the drawing model if images were added, for the workbook writer. */
+		get drawing() {
+			return this._drawing;
+		}
 		_writeBackground() {
 			if (this._background) {
 				if (this._background.imageId !== void 0) {
@@ -30510,6 +30648,7 @@ self.onmessage = async function(event) {
 			await this.promise;
 			await this._commitWorksheets();
 			await this.addMedia();
+			this.addDrawings();
 			await Promise.all([
 				this.addThemes(),
 				this.addOfficeRels(),
@@ -30614,11 +30753,13 @@ self.onmessage = async function(event) {
 				worksheets.forEach((ws) => {
 					ws.fileIndex = ws.id;
 				});
+				const drawings = worksheets.filter((ws) => ws.drawing).map((ws) => ws.drawing);
 				const model = {
 					worksheets,
 					sharedStrings: this.sharedStrings,
 					commentRefs: this.commentRefs,
 					media: this.media,
+					drawings,
 					hasCheckboxes: this.styles.hasCheckboxes
 				};
 				const xform = new ContentTypesXform();
@@ -30647,6 +30788,29 @@ self.onmessage = async function(event) {
 				throw new ImageError("Unsupported media");
 			}));
 		}
+		/**
+		* Generate drawing XML and drawing relationship files for worksheets that have images.
+		* Must be called after _commitWorksheets() so that each WorksheetWriter has built its
+		* drawing model, and after addMedia() so that media files are already in the ZIP.
+		*/
+		addDrawings() {
+			const drawingXform = new DrawingXform();
+			const relsXform = new RelationshipsXform();
+			for (const ws of this._worksheets) {
+				if (!ws?.drawing) continue;
+				const { drawing } = ws;
+				const filteredAnchors = filterDrawingAnchors(drawing.anchors);
+				const drawingForWrite = {
+					...drawing,
+					anchors: filteredAnchors
+				};
+				drawingXform.prepare(drawingForWrite);
+				const xml = drawingXform.toXml(drawingForWrite);
+				this._addFile(xml, drawingPath(drawing.name));
+				const relsXml = relsXform.toXml(drawing.rels);
+				this._addFile(relsXml, drawingRelsPath(drawing.name));
+			}
+		}
 		addApp() {
 			return new Promise((resolve) => {
 				const xform = new AppXform();