@cj-tech-master/excelts 9.4.0 → 9.4.1

package/dist/iife/excelts.iife.js

@@ -1,5 +1,5 @@
 /*!
-* @cj-tech-master/excelts v9.4.0
+* @cj-tech-master/excelts v9.4.1
 * Zero-dependency TypeScript toolkit — Excel (XLSX), PDF, CSV, Markdown, XML, ZIP/TAR, and streaming.
 * (c) 2026 cjnoname
 * Released under the MIT License
@@ -17434,8 +17434,9 @@ onmessage = async (ev) => {
 				type: "note"
 			};
 		}
-		constructor(note) {
+		constructor(note, author) {
 			this.note = note;
+			this.author = author;
 		}
 		get model() {
 			let value;
@@ -17453,13 +17454,16 @@ onmessage = async (ev) => {
 					};
 					break;
 			}
-			return deepMerge({}, Note.DEFAULT_CONFIGS, value);
+			const result = deepMerge({}, Note.DEFAULT_CONFIGS, value);
+			if (this.author !== void 0) result.author = this.author;
+			return result;
 		}
 		set model(value) {
 			const { note } = value;
 			const { texts } = note;
 			if (texts && texts.length === 1 && Object.keys(texts[0]).length === 1) this.note = texts[0].text;
 			else this.note = note;
+			this.author = value.author;
 		}
 		static fromModel(model) {
 			const note = new Note();
@@ -20232,7 +20236,7 @@ onmessage = async (ev) => {
 	const drawingRelsXmlRegex = /^xl\/drawings\/_rels\/(drawing\d+)[.]xml[.]rels$/;
 	const vmlDrawingRegex = /^xl\/drawings\/(vmlDrawing\d+)[.]vml$/;
 	const vmlDrawingHFRegex = /^xl\/drawings\/(vmlDrawingHF\d+)[.]vml$/;
-	const commentsXmlRegex = /^xl\/comments(\d+)[.]xml$/;
+	const commentsXmlRegex = /^xl\/(?:comments(\d+)|comments\/comment(\d+))[.]xml$/;
 	const tableXmlRegex = /^xl\/tables\/(table\d+)[.]xml$/;
 	const pivotTableXmlRegex = /^xl\/pivotTables\/(pivotTable\d+)[.]xml$/;
 	const pivotTableRelsXmlRegex = /^xl\/pivotTables\/_rels\/(pivotTable\d+)[.]xml[.]rels$/;
@@ -20287,9 +20291,12 @@ onmessage = async (ev) => {
 		const match = vmlDrawingHFRegex.exec(path);
 		return match ? match[1] : void 0;
 	}
-	function getCommentsIndexFromPath(path) {
-		const match = commentsXmlRegex.exec(path);
-		return match ? match[1] : void 0;
+	/**
+	* Check if a zip entry path is a comments XML file.
+	* Works for both `xl/comments1.xml` and `xl/comments/comment1.xml`.
+	*/
+	function isCommentsPath(path) {
+		return commentsXmlRegex.test(path);
 	}
 	function getTableNameFromPath(path) {
 		const match = tableXmlRegex.exec(path);
@@ -20388,6 +20395,9 @@ onmessage = async (ev) => {
 	function pivotTablePath(n) {
 		return `xl/pivotTables/pivotTable${n}.xml`;
 	}
+	function pivotTablePathFromName(name) {
+		return `xl/pivotTables/${name}.xml`;
+	}
 	function pivotTableRelsPath(n) {
 		return `xl/pivotTables/_rels/pivotTable${n}.xml.rels`;
 	}
@@ -20429,24 +20439,12 @@ onmessage = async (ev) => {
 	function drawingRelTargetFromWorksheet(drawingName) {
 		return `../drawings/${drawingName}.xml`;
 	}
-	function vmlDrawingRelTargetFromWorksheetName(vmlName) {
-		return `../drawings/${vmlName}.vml`;
-	}
-	function commentsRelTargetFromWorksheetName(commentName) {
-		return `../${commentName}.xml`;
-	}
 	function pivotTableRelTargetFromWorksheet(n) {
 		return `../pivotTables/pivotTable${n}.xml`;
 	}
-	function pivotTableRelTargetFromWorksheetName(pivotName) {
-		return `../pivotTables/${pivotName}.xml`;
-	}
 	function tableRelTargetFromWorksheet(target) {
 		return `../tables/${target}`;
 	}
-	function tableRelTargetFromWorksheetName(name) {
-		return `../tables/${name}.xml`;
-	}
 	function mediaRelTargetFromRels(filename) {
 		return `../media/${filename}`;
 	}
@@ -20456,6 +20454,25 @@ onmessage = async (ev) => {
 	function ctrlPropRelTargetFromWorksheet(id) {
 		return `../ctrlProps/ctrlProp${id}.xml`;
 	}
+	/**
+	* Resolve a relationship Target (relative or absolute) to a normalized zip path.
+	*
+	* OOXML relationship targets may be:
+	*   - Relative: `../comments1.xml` (resolved against `baseDir`)
+	*   - Absolute: `/xl/comments/comment1.xml` (leading slash stripped)
+	*
+	* @param baseDir  The directory containing the source part (e.g. `xl/worksheets/`)
+	* @param target   The raw Target value from the .rels file
+	*/
+	function resolveRelTarget(baseDir, target) {
+		if (target.startsWith("/")) return target.slice(1);
+		const parts = ((baseDir.endsWith("/") ? baseDir : baseDir + "/") + target).split("/");
+		const resolved = [];
+		for (const part of parts) if (part === "." || part === "") continue;
+		else if (part === "..") resolved.pop();
+		else resolved.push(part);
+		return resolved.join("/");
+	}
 	//#endregion
 	//#region src/modules/xml/writer.ts
 	/**
@@ -26705,7 +26722,7 @@ self.onmessage = async function(event) {
 			const renderModel = model || this.model;
 			xmlStream.openNode("comment", {
 				ref: renderModel.ref,
-				authorId: 0
+				authorId: renderModel.authorId ?? 0
 			});
 			xmlStream.openNode("text");
 			if (renderModel && renderModel.note && renderModel.note.texts) renderModel.note.texts.forEach((text) => {
@@ -26724,7 +26741,8 @@ self.onmessage = async function(event) {
 					this.model = {
 						type: "note",
 						note: { texts: [] },
-						...node.attributes
+						ref: node.attributes.ref,
+						authorId: node.attributes.authorId != null ? Number(node.attributes.authorId) : void 0
 					};
 					return true;
 				case "r":
@@ -26881,6 +26899,7 @@ self.onmessage = async function(event) {
 	var VmlClientDataXform = class extends BaseXform {
 		constructor() {
 			super();
+			this._leafText = "";
 			this.map = {
 				"x:Anchor": new VmlAnchorXform(),
 				"x:Locked": new VmlProtectionXform({ tag: "x:Locked" }),
@@ -26920,6 +26939,11 @@ self.onmessage = async function(event) {
 						editAs: ""
 					};
 					break;
+				case "x:Row":
+				case "x:Column":
+					this._leafName = node.name;
+					this._leafText = "";
+					break;
 				default:
 					this.parser = this.map[node.name];
 					if (this.parser) this.parser.parseOpen(node);
@@ -26928,9 +26952,20 @@ self.onmessage = async function(event) {
 			return true;
 		}
 		parseText(text) {
-			if (this.parser) this.parser.parseText(text);
+			if (this._leafName) this._leafText += text;
+			else if (this.parser) this.parser.parseText(text);
 		}
 		parseClose(name) {
+			if (this._leafName) {
+				if (name === this._leafName) {
+					const value = parseInt(this._leafText, 10);
+					if (name === "x:Row") this.model.row = value + 1;
+					else if (name === "x:Column") this.model.col = value + 1;
+					this._leafName = void 0;
+					this._leafText = "";
+				}
+				return true;
+			}
 			if (this.parser) {
 				if (!this.parser.parseClose(name)) this.parser = void 0;
 				return true;
@@ -27059,6 +27094,10 @@ self.onmessage = async function(event) {
 					this.model.protection = this.map["x:ClientData"].model && this.map["x:ClientData"].model.protection;
 					this.model.anchor = this.map["x:ClientData"].model && this.map["x:ClientData"].model.anchor;
 					this.model.editAs = this.map["x:ClientData"].model && this.map["x:ClientData"].model.editAs;
+					if (this.map["x:ClientData"].model) {
+						this.model.row = this.map["x:ClientData"].model.row;
+						this.model.col = this.map["x:ClientData"].model.col;
+					}
 					return false;
 				default: return true;
 			}
@@ -41298,9 +41337,14 @@ self.onmessage = async function(event) {
 	}
 	//#endregion
 	//#region src/modules/excel/xlsx/xform/comment/comments-xform.ts
+	const DEFAULT_AUTHOR = "Author";
 	var CommentsXform = class CommentsXform extends BaseXform {
 		constructor() {
 			super();
+			this._authors = [];
+			this._inAuthors = false;
+			this._inAuthor = false;
+			this._currentAuthor = "";
 			this.map = { comment: new CommentXform() };
 			this.model = { comments: [] };
 		}
@@ -41308,12 +41352,19 @@ self.onmessage = async function(event) {
 			const renderModel = model || this.model;
 			xmlStream.openXml(StdDocAttributes);
 			xmlStream.openNode("comments", CommentsXform.COMMENTS_ATTRIBUTES);
+			const authorSet = /* @__PURE__ */ new Set();
+			for (const comment of renderModel.comments) authorSet.add(comment.author ?? DEFAULT_AUTHOR);
+			const authors = [...authorSet];
 			xmlStream.openNode("authors");
-			xmlStream.leafNode("author", null, "Author");
+			for (const author of authors) xmlStream.leafNode("author", null, author);
 			xmlStream.closeNode();
 			xmlStream.openNode("commentList");
 			renderModel.comments.forEach((comment) => {
-				this.map.comment.render(xmlStream, comment);
+				const authorId = authors.indexOf(comment.author ?? DEFAULT_AUTHOR);
+				this.map.comment.render(xmlStream, {
+					...comment,
+					authorId: authorId >= 0 ? authorId : 0
+				});
 			});
 			xmlStream.closeNode();
 			xmlStream.closeNode();
@@ -41324,6 +41375,16 @@ self.onmessage = async function(event) {
 				return true;
 			}
 			switch (node.name) {
+				case "authors":
+					this._inAuthors = true;
+					this._authors = [];
+					return true;
+				case "author":
+					if (this._inAuthors) {
+						this._inAuthor = true;
+						this._currentAuthor = "";
+					}
+					return true;
 				case "commentList":
 					this.model = { comments: [] };
 					return true;
@@ -41335,11 +41396,27 @@ self.onmessage = async function(event) {
 			}
 		}
 		parseText(text) {
-			if (this.parser) this.parser.parseText(text);
+			if (this._inAuthor) this._currentAuthor += text;
+			else if (this.parser) this.parser.parseText(text);
 		}
 		parseClose(name) {
 			switch (name) {
-				case "commentList": return false;
+				case "authors":
+					this._inAuthors = false;
+					return true;
+				case "author":
+					if (this._inAuthors) {
+						this._authors.push(this._currentAuthor);
+						this._inAuthor = false;
+						this._currentAuthor = "";
+					}
+					return true;
+				case "commentList":
+					for (const comment of this.model.comments) {
+						const { authorId } = comment;
+						if (authorId != null && authorId >= 0 && authorId < this._authors.length) comment.author = this._authors[authorId];
+					}
+					return false;
 				case "comment":
 					this.model.comments.push(this.parser.model);
 					this.parser = void 0;
@@ -44034,23 +44111,39 @@ self.onmessage = async function(event) {
 			}
 		}
 		reconcile(model, options) {
-			const rels = (model.relationships ?? []).reduce((h, rel) => {
+			const relList = model.relationships ?? [];
+			const rels = relList.reduce((h, rel) => {
 				h[rel.Id] = rel;
-				if (rel.Type === RelType.Comments) {
-					const commentEntry = options.comments?.[rel.Target];
-					if (commentEntry) model.comments = commentEntry.comments;
-				}
-				if (rel.Type === RelType.VmlDrawing && model.comments && model.comments.length) {
-					const vmlEntry = options.vmlDrawings?.[rel.Target];
+				return h;
+			}, {});
+			for (const rel of relList) if (rel.Type === RelType.Comments) {
+				const resolvedPath = resolveRelTarget("xl/worksheets/", rel.Target);
+				const commentEntry = options.comments?.[resolvedPath];
+				if (commentEntry) model.comments = commentEntry.comments;
+			}
+			if (model.comments && model.comments.length) {
+				for (const rel of relList) if (rel.Type === RelType.VmlDrawing) {
+					const resolvedVmlPath = resolveRelTarget("xl/worksheets/", rel.Target);
+					const vmlEntry = options.vmlDrawings?.[resolvedVmlPath];
 					if (vmlEntry) {
-						const vmlComment = vmlEntry.comments;
-						model.comments.forEach((comment, index) => {
-							comment.note = Object.assign({}, comment.note, vmlComment[index]);
+						const vmlComments = vmlEntry.comments;
+						const vmlByRef = {};
+						let hasRefInfo = false;
+						for (const vc of vmlComments) if (vc.row != null && vc.col != null) {
+							const ref = colCache.encodeAddress(vc.row, vc.col);
+							vmlByRef[ref] = vc;
+							hasRefInfo = true;
+						}
+						if (hasRefInfo) for (const comment of model.comments) {
+							const vml = vmlByRef[comment.ref];
+							if (vml) comment.note = Object.assign({}, comment.note, vml);
+						}
+						else model.comments.forEach((comment, index) => {
+							if (index < vmlComments.length) comment.note = Object.assign({}, comment.note, vmlComments[index]);
 						});
 					}
 				}
-				return h;
-			}, {});
+			}
 			options.commentsMap = (model.comments ?? []).reduce((h, comment) => {
 				if (comment.ref) h[comment.ref] = comment;
 				return h;
@@ -44116,7 +44209,8 @@ self.onmessage = async function(event) {
 			model.tables = (model.tables ?? []).reduce((acc, tablePart) => {
 				const rel = rels[tablePart.rId];
 				if (rel) {
-					const table = options.tables[rel.Target];
+					const resolvedPath = resolveRelTarget("xl/worksheets/", rel.Target);
+					const table = options.tables[resolvedPath];
 					if (table) acc.push(table);
 				}
 				return acc;
@@ -44124,7 +44218,8 @@ self.onmessage = async function(event) {
 			model.pivotTables = [];
 			(model.relationships ?? []).forEach((rel) => {
 				if (rel.Type === RelType.PivotTable && options.pivotTables) {
-					const pivotTable = options.pivotTables[rel.Target];
+					const resolvedPath = resolveRelTarget("xl/worksheets/", rel.Target);
+					const pivotTable = options.pivotTables[resolvedPath];
 					if (pivotTable) model.pivotTables.push(pivotTable);
 				}
 			});
@@ -45454,7 +45549,7 @@ self.onmessage = async function(event) {
 					applyWidthHeightFormats: pt.applyWidthHeightFormats === "1" ? "1" : "0"
 				};
 				loadedPivotTables.push(completePivotTable);
-				pivotTablesIndexed[pivotTableRelTargetFromWorksheetName(pivotName)] = completePivotTable;
+				pivotTablesIndexed[pivotTablePathFromName(pivotName)] = completePivotTable;
 			});
 			loadedPivotTables.sort((a, b) => a.tableNumber - b.tableNumber);
 			model.pivotTables = loadedPivotTables;
@@ -45498,13 +45593,13 @@ self.onmessage = async function(event) {
 			model.worksheetHash[path] = worksheet;
 			model.worksheets.push(worksheet);
 		}
-		async _processCommentEntry(stream, model, name) {
+		async _processCommentEntry(stream, model, zipPath) {
 			const comments = await new CommentsXform().parseStream(stream);
-			model.comments[commentsRelTargetFromWorksheetName(name)] = comments;
+			model.comments[zipPath] = comments;
 		}
-		async _processTableEntry(stream, model, name) {
+		async _processTableEntry(stream, model, zipPath) {
 			const table = await new TableXform().parseStream(stream);
-			model.tables[tableRelTargetFromWorksheetName(name)] = table;
+			model.tables[zipPath] = table;
 		}
 		async _processWorksheetRelsEntry(stream, model, sheetNo) {
 			const relationships = await new RelationshipsXform().parseStream(stream);
@@ -45566,9 +45661,9 @@ self.onmessage = async function(event) {
 			const relationships = await new RelationshipsXform().parseStream(entry);
 			model.drawingRels[name] = relationships;
 		}
-		async _processVmlDrawingEntry(entry, model, name) {
+		async _processVmlDrawingEntry(entry, model, zipPath) {
 			const vmlDrawing = await new VmlDrawingXform().parseStream(entry);
-			model.vmlDrawings[vmlDrawingRelTargetFromWorksheetName(name)] = vmlDrawing;
+			model.vmlDrawings[zipPath] = vmlDrawing;
 		}
 		async _processVmlDrawingHFEntry(entry, model, _name) {
 			const vmlDrawing = await new VmlDrawingXform().parseStream(entry);
@@ -45678,9 +45773,8 @@ self.onmessage = async function(event) {
 				await this._processDrawingRelsEntry(stream, model, drawingRelsName);
 				return true;
 			}
-			const vmlDrawingName = getVmlDrawingNameFromPath(entryName);
-			if (vmlDrawingName) {
-				await this._processVmlDrawingEntry(stream, model, vmlDrawingName);
+			if (getVmlDrawingNameFromPath(entryName)) {
+				await this._processVmlDrawingEntry(stream, model, entryName);
 				return true;
 			}
 			const vmlHFName = getVmlDrawingHFNameFromPath(entryName);
@@ -45688,14 +45782,12 @@ self.onmessage = async function(event) {
 				await this._processVmlDrawingHFEntry(stream, model, vmlHFName);
 				return true;
 			}
-			const commentsIndex = getCommentsIndexFromPath(entryName);
-			if (commentsIndex) {
-				await this._processCommentEntry(stream, model, `comments${commentsIndex}`);
+			if (isCommentsPath(entryName)) {
+				await this._processCommentEntry(stream, model, entryName);
 				return true;
 			}
-			const tableName = getTableNameFromPath(entryName);
-			if (tableName) {
-				await this._processTableEntry(stream, model, tableName);
+			if (getTableNameFromPath(entryName)) {
+				await this._processTableEntry(stream, model, entryName);
 				return true;
 			}
 			const themeName = getThemeNameFromPath(entryName);
@@ -54833,6 +54925,7 @@ self.onmessage = async function(event) {
 	exports.MarkdownParseError = MarkdownParseError;
 	exports.MaxItemsExceededError = MaxItemsExceededError;
 	exports.MergeConflictError = MergeConflictError;
+	exports.Note = Note;
 	exports.PageSizes = PageSizes;
 	exports.PaperSize = PaperSize;
 	exports.PdfError = PdfError;