@cj-tech-master/excelts 9.4.0 → 9.4.1

package/dist/esm/index.js

@@ -10,6 +10,7 @@ export { Range } from "./modules/excel/range.js";
 export { Image } from "./modules/excel/image.js";
 export * from "./modules/excel/anchor.js";
 export { Table } from "./modules/excel/table.js";
+export { Note } from "./modules/excel/note.js";
 export { DataValidations } from "./modules/excel/data-validations.js";
 export { FormCheckbox } from "./modules/excel/form-control.js";
 // Note: the formula engine lives at the `./formula` subpath so it stays

package/dist/esm/modules/excel/note.js

@@ -1,7 +1,8 @@
 import { deepMerge } from "./utils/under-dash.js";
 class Note {
-    constructor(note) {
+    constructor(note, author) {
         this.note = note;
+        this.author = author;
     }
     get model() {
         let value;
@@ -26,7 +27,11 @@ class Note {
                 break;
         }
         // Suitable for all cell comments
-        return deepMerge({}, Note.DEFAULT_CONFIGS, value);
+        const result = deepMerge({}, Note.DEFAULT_CONFIGS, value);
+        if (this.author !== undefined) {
+            result.author = this.author;
+        }
+        return result;
     }
     set model(value) {
         const { note } = value;
@@ -37,6 +42,7 @@ class Note {
         else {
             this.note = note;
         }
+        this.author = value.author;
     }
     static fromModel(model) {
         const note = new Note();

package/dist/esm/modules/excel/utils/ooxml-paths.js

@@ -19,7 +19,9 @@ const drawingXmlRegex = /^xl\/drawings\/(drawing\d+)[.]xml$/;
 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$/;
+// Matches both flat layout (xl/comments1.xml) and subdirectory layout (xl/comments/comment1.xml).
+// Both are valid OOXML — the actual path is determined by .rels, not by convention.
+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$/;
@@ -81,9 +83,12 @@ export function getVmlDrawingHFNameFromPath(path) {
     const match = vmlDrawingHFRegex.exec(path);
     return match ? match[1] : undefined;
 }
-export function getCommentsIndexFromPath(path) {
-    const match = commentsXmlRegex.exec(path);
-    return match ? match[1] : undefined;
+/**
+ * Check if a zip entry path is a comments XML file.
+ * Works for both `xl/comments1.xml` and `xl/comments/comment1.xml`.
+ */
+export function isCommentsPath(path) {
+    return commentsXmlRegex.test(path);
 }
 export function getTableNameFromPath(path) {
     const match = tableXmlRegex.exec(path);
@@ -184,6 +189,9 @@ export function pivotCacheRecordsRelTarget(n) {
 export function pivotTablePath(n) {
     return `xl/pivotTables/pivotTable${n}.xml`;
 }
+export function pivotTablePathFromName(name) {
+    return `xl/pivotTables/${name}.xml`;
+}
 export function pivotTableRelsPath(n) {
     return `xl/pivotTables/_rels/pivotTable${n}.xml.rels`;
 }
@@ -232,29 +240,14 @@ export function drawingRelTargetFromWorksheet(drawingName) {
     // Target inside xl/worksheets/_rels/sheetN.xml.rels (base: xl/worksheets/)
     return `../drawings/${drawingName}.xml`;
 }
-export function vmlDrawingRelTargetFromWorksheetName(vmlName) {
-    // For VML drawings when the caller already has the logical name (e.g. "vmlDrawing1").
-    return `../drawings/${vmlName}.vml`;
-}
-export function commentsRelTargetFromWorksheetName(commentName) {
-    // For comments when the caller already has the logical name (e.g. "comments1").
-    return `../${commentName}.xml`;
-}
 export function pivotTableRelTargetFromWorksheet(n) {
     // Target inside xl/worksheets/_rels/sheetN.xml.rels (base: xl/worksheets/)
     return `../pivotTables/pivotTable${n}.xml`;
 }
-export function pivotTableRelTargetFromWorksheetName(pivotName) {
-    // For pivot tables when the caller already has the logical name (e.g. "pivotTable1").
-    return `../pivotTables/${pivotName}.xml`;
-}
 export function tableRelTargetFromWorksheet(target) {
     // Target inside xl/worksheets/_rels/sheetN.xml.rels (base: xl/worksheets/)
     return `../tables/${target}`;
 }
-export function tableRelTargetFromWorksheetName(name) {
-    return `../tables/${name}.xml`;
-}
 export function mediaRelTargetFromRels(filename) {
     // Target from a rels file located under xl/*/_rels (base is one level deeper than xl/)
     return `../media/${filename}`;
@@ -267,3 +260,37 @@ export function ctrlPropRelTargetFromWorksheet(id) {
     // Target inside xl/worksheets/_rels/sheetN.xml.rels (base: xl/worksheets/)
     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
+ */
+export function resolveRelTarget(baseDir, target) {
+    // Absolute target — strip leading slash to get the zip path.
+    if (target.startsWith("/")) {
+        return target.slice(1);
+    }
+    // Ensure baseDir ends with "/" so the join works correctly.
+    const base = baseDir.endsWith("/") ? baseDir : baseDir + "/";
+    // Relative target — resolve against baseDir.
+    // Simple resolution: join base + target, then resolve `.` and `..` segments.
+    const parts = (base + 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("/");
+}

package/dist/esm/modules/excel/xlsx/xform/comment/comment-xform.js

@@ -18,7 +18,7 @@ class CommentXform extends BaseXform {
         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) {
@@ -41,7 +41,8 @@ class CommentXform extends BaseXform {
                     note: {
                         texts: []
                     },
-                    ...node.attributes
+                    ref: node.attributes.ref,
+                    authorId: node.attributes.authorId != null ? Number(node.attributes.authorId) : undefined
                 };
                 return true;
             case "r":

package/dist/esm/modules/excel/xlsx/xform/comment/comments-xform.js

@@ -1,9 +1,18 @@
 import { BaseXform } from "../base-xform.js";
 import { CommentXform } from "./comment-xform.js";
 import { StdDocAttributes } from "../../../../xml/writer.js";
+const DEFAULT_AUTHOR = "Author";
 class CommentsXform extends BaseXform {
     constructor() {
         super();
+        /** Authors collected while parsing the <authors> element. */
+        this._authors = [];
+        /** Whether we are currently inside the <authors> element. */
+        this._inAuthors = false;
+        /** Whether we are currently inside an <author> element (collecting text). */
+        this._inAuthor = false;
+        /** Accumulator for the current <author> text content. */
+        this._currentAuthor = "";
         this.map = {
             comment: new CommentXform()
         };
@@ -13,15 +22,23 @@ class CommentsXform extends BaseXform {
         const renderModel = model || this.model;
         xmlStream.openXml(StdDocAttributes);
         xmlStream.openNode("comments", CommentsXform.COMMENTS_ATTRIBUTES);
-        // authors
-        // TODO: support authors properly
+        // Collect unique authors from comments
+        const authorSet = 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();
         // comments
         xmlStream.openNode("commentList");
         renderModel.comments.forEach(comment => {
-            this.map.comment.render(xmlStream, comment);
+            // Set the authorId based on the authors list for rendering
+            const authorId = authors.indexOf(comment.author ?? DEFAULT_AUTHOR);
+            this.map.comment.render(xmlStream, { ...comment, authorId: authorId >= 0 ? authorId : 0 });
         });
         xmlStream.closeNode();
         xmlStream.closeNode();
@@ -32,6 +49,16 @@ class CommentsXform extends BaseXform {
             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: []
@@ -46,13 +73,33 @@ class CommentsXform extends BaseXform {
         }
     }
     parseText(text) {
-        if (this.parser) {
+        if (this._inAuthor) {
+            this._currentAuthor += text;
+        }
+        else if (this.parser) {
             this.parser.parseText(text);
         }
     }
     parseClose(name) {
         switch (name) {
+            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":
+                // Resolve authorId → author name on each comment
+                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);

package/dist/esm/modules/excel/xlsx/xform/comment/vml-client-data-xform.js

@@ -6,6 +6,8 @@ const POSITION_TYPE = ["twoCells", "oneCells", "absolute"];
 class VmlClientDataXform extends BaseXform {
     constructor() {
         super();
+        /** Accumulated text for the current leaf element. */
+        this._leafText = "";
         this.map = {
             "x:Anchor": new VmlAnchorXform(),
             "x:Locked": new VmlProtectionXform({ tag: "x:Locked" }),
@@ -41,6 +43,11 @@ class VmlClientDataXform extends BaseXform {
                     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) {
@@ -51,11 +58,30 @@ class VmlClientDataXform extends BaseXform {
         return true;
     }
     parseText(text) {
-        if (this.parser) {
+        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") {
+                    // VML uses 0-based row; convert to 1-based to match comment ref
+                    this.model.row = value + 1;
+                }
+                else if (name === "x:Column") {
+                    // VML uses 0-based col; convert to 1-based to match comment ref
+                    this.model.col = value + 1;
+                }
+                this._leafName = undefined;
+                this._leafText = "";
+            }
+            return true;
+        }
         if (this.parser) {
             if (!this.parser.parseClose(name)) {
                 this.parser = undefined;

package/dist/esm/modules/excel/xlsx/xform/comment/vml-shape-xform.js

@@ -66,6 +66,10 @@ class VmlShapeXform extends BaseXform {
                     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;

package/dist/esm/modules/excel/xlsx/xform/sheet/worksheet-xform.js

@@ -1,6 +1,6 @@
 import { colCache } from "../../../utils/col-cache.js";
 import { buildDrawingAnchorsAndRels, resolveMediaTarget } from "../../../utils/drawing-utils.js";
-import { commentsRelTargetFromWorksheet, ctrlPropRelTargetFromWorksheet, drawingRelTargetFromWorksheet, pivotTableRelTargetFromWorksheet, tableRelTargetFromWorksheet, vmlDrawingRelTargetFromWorksheet, vmlDrawingHFRelTargetFromWorksheet } from "../../../utils/ooxml-paths.js";
+import { commentsRelTargetFromWorksheet, ctrlPropRelTargetFromWorksheet, drawingRelTargetFromWorksheet, pivotTableRelTargetFromWorksheet, resolveRelTarget, tableRelTargetFromWorksheet, vmlDrawingRelTargetFromWorksheet, vmlDrawingHFRelTargetFromWorksheet } from "../../../utils/ooxml-paths.js";
 import { RelType } from "../../rel-type.js";
 import { BaseXform } from "../base-xform.js";
 import { ListXform } from "../list-xform.js";
@@ -700,25 +700,63 @@ class WorkSheetXform extends BaseXform {
     reconcile(model, options) {
         // options.merges = new Merges();
         // options.merges.reconcile(model.mergeCells, model.rows);
-        const rels = (model.relationships ?? []).reduce((h, rel) => {
+        // Build rel index first, then process comments and VML in two passes so
+        // that the result is independent of the order rels appear in the file.
+        const relList = model.relationships ?? [];
+        const rels = relList.reduce((h, rel) => {
             h[rel.Id] = rel;
+            return h;
+        }, {});
+        // Pass 1: resolve comments
+        for (const rel of relList) {
             if (rel.Type === RelType.Comments) {
-                const commentEntry = options.comments?.[rel.Target];
+                const resolvedPath = resolveRelTarget("xl/worksheets/", rel.Target);
+                const commentEntry = options.comments?.[resolvedPath];
                 if (commentEntry) {
                     model.comments = commentEntry.comments;
                 }
             }
-            if (rel.Type === RelType.VmlDrawing && model.comments && model.comments.length) {
-                const vmlEntry = options.vmlDrawings?.[rel.Target];
-                if (vmlEntry) {
-                    const vmlComment = vmlEntry.comments;
-                    model.comments.forEach((comment, index) => {
-                        comment.note = Object.assign({}, comment.note, vmlComment[index]);
-                    });
+        }
+        // Pass 2: merge VML note metadata (requires model.comments from pass 1)
+        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) {
+                        // Build a ref-keyed map from VML comments for order-independent merge.
+                        // Fall back to index-based merge if VML entries lack row/col.
+                        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) {
+                            // Merge by cell reference (robust against order differences)
+                            for (const comment of model.comments) {
+                                const vml = vmlByRef[comment.ref];
+                                if (vml) {
+                                    comment.note = Object.assign({}, comment.note, vml);
+                                }
+                            }
+                        }
+                        else {
+                            // Fallback: index-based merge for VML files without row/col
+                            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;
@@ -830,7 +868,8 @@ class WorkSheetXform extends BaseXform {
         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);
                 }
@@ -842,7 +881,8 @@ class WorkSheetXform extends BaseXform {
         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);
                 }

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

@@ -13,7 +13,7 @@ import { StreamingZip, ZipDeflateFile } from "../../archive/zip/stream.js";
 import { ExcelStreamStateError, ExcelFileError, ImageError, ExcelNotSupportedError, XmlParseError, TableError } from "../errors.js";
 import { filterDrawingAnchors } from "../utils/drawing-utils.js";
 import { rewriteExternalRefs } from "../utils/external-link-formula.js";
-import { commentsPath, commentsRelTargetFromWorksheetName, ctrlPropPath, drawingPath, drawingRelsPath, externalLinkPath, externalLinkRelsPath, externalLinkRelTargetFromWorkbook, OOXML_REL_TARGETS, pivotTableRelTargetFromWorksheetName, pivotCacheDefinitionRelTargetFromWorkbook, getCommentsIndexFromPath, getDrawingNameFromPath, getDrawingNameFromRelsPath, getExternalLinkIndexFromPath, getExternalLinkIndexFromRelsPath, getMediaFilenameFromPath, mediaPath, getPivotCacheDefinitionNameFromPath, getPivotCacheDefinitionNameFromRelsPath, getPivotCacheRecordsNameFromPath, getPivotTableNameFromPath, getPivotTableNameFromRelsPath, pivotCacheDefinitionPath, pivotCacheDefinitionRelsPath, pivotCacheDefinitionRelTargetFromPivotTable, pivotCacheRecordsPath, pivotCacheRecordsRelTarget, pivotTablePath, pivotTableRelsPath, getTableNameFromPath, tablePath, tableRelTargetFromWorksheetName, themePath, getThemeNameFromPath, getVmlDrawingNameFromPath, getVmlDrawingHFNameFromPath, getWorksheetNoFromWorksheetPath, getWorksheetNoFromWorksheetRelsPath, isBinaryEntryPath, normalizeZipPath, OOXML_PATHS, vmlDrawingRelTargetFromWorksheetName, vmlDrawingPath, vmlDrawingHFPath, vmlDrawingHFRelsPath, worksheetPath, worksheetRelsPath, worksheetRelTarget } from "../utils/ooxml-paths.js";
+import { commentsPath, ctrlPropPath, drawingPath, drawingRelsPath, externalLinkPath, externalLinkRelsPath, externalLinkRelTargetFromWorkbook, OOXML_REL_TARGETS, pivotCacheDefinitionRelTargetFromWorkbook, pivotTablePathFromName, isCommentsPath, getDrawingNameFromPath, getDrawingNameFromRelsPath, getExternalLinkIndexFromPath, getExternalLinkIndexFromRelsPath, getMediaFilenameFromPath, mediaPath, getPivotCacheDefinitionNameFromPath, getPivotCacheDefinitionNameFromRelsPath, getPivotCacheRecordsNameFromPath, getPivotTableNameFromPath, getPivotTableNameFromRelsPath, pivotCacheDefinitionPath, pivotCacheDefinitionRelsPath, pivotCacheDefinitionRelTargetFromPivotTable, pivotCacheRecordsPath, pivotCacheRecordsRelTarget, pivotTablePath, pivotTableRelsPath, getTableNameFromPath, tablePath, themePath, getThemeNameFromPath, getVmlDrawingNameFromPath, getVmlDrawingHFNameFromPath, getWorksheetNoFromWorksheetPath, getWorksheetNoFromWorksheetRelsPath, isBinaryEntryPath, normalizeZipPath, OOXML_PATHS, vmlDrawingPath, vmlDrawingHFPath, vmlDrawingHFRelsPath, worksheetPath, worksheetRelsPath, worksheetRelTarget } from "../utils/ooxml-paths.js";
 import { PassthroughManager } from "../utils/passthrough-manager.js";
 import { StreamBuf } from "../utils/stream-buf.js";
 import { RelType } from "./rel-type.js";
@@ -1007,9 +1007,8 @@ class XLSX {
                 applyWidthHeightFormats: pt.applyWidthHeightFormats === "1" ? "1" : "0"
             };
             loadedPivotTables.push(completePivotTable);
-            // Key format (e.g., "../pivotTables/pivotTable1.xml") matches worksheet .rels Target values,
-            // allowing worksheet reconciliation to look up pivot tables by their relationship target path.
-            pivotTablesIndexed[pivotTableRelTargetFromWorksheetName(pivotName)] = completePivotTable;
+            // Key by absolute zip path so reconcile can match any rel target layout.
+            pivotTablesIndexed[pivotTablePathFromName(pivotName)] = completePivotTable;
         });
         loadedPivotTables.sort((a, b) => a.tableNumber - b.tableNumber);
         model.pivotTables = loadedPivotTables;
@@ -1069,15 +1068,17 @@ class XLSX {
         model.worksheetHash[path] = worksheet;
         model.worksheets.push(worksheet);
     }
-    async _processCommentEntry(stream, model, name) {
+    async _processCommentEntry(stream, model, zipPath) {
         const xform = new CommentsXform();
         const comments = await xform.parseStream(stream);
-        model.comments[commentsRelTargetFromWorksheetName(name)] = comments;
+        // Key by absolute zip path so reconcile can match any rel target layout.
+        model.comments[zipPath] = comments;
     }
-    async _processTableEntry(stream, model, name) {
+    async _processTableEntry(stream, model, zipPath) {
         const xform = new TableXform();
         const table = await xform.parseStream(stream);
-        model.tables[tableRelTargetFromWorksheetName(name)] = table;
+        // Key by absolute zip path so reconcile can match any rel target layout.
+        model.tables[zipPath] = table;
     }
     async _processWorksheetRelsEntry(stream, model, sheetNo) {
         const xform = new RelationshipsXform();
@@ -1146,10 +1147,11 @@ class XLSX {
         const relationships = await xform.parseStream(entry);
         model.drawingRels[name] = relationships;
     }
-    async _processVmlDrawingEntry(entry, model, name) {
+    async _processVmlDrawingEntry(entry, model, zipPath) {
         const xform = new VmlDrawingXform();
         const vmlDrawing = await xform.parseStream(entry);
-        model.vmlDrawings[vmlDrawingRelTargetFromWorksheetName(name)] = vmlDrawing;
+        // Key by absolute zip path so reconcile can match any rel target layout.
+        model.vmlDrawings[zipPath] = vmlDrawing;
     }
     async _processVmlDrawingHFEntry(entry, model, _name) {
         const xform = new VmlDrawingXform();
@@ -1296,7 +1298,7 @@ class XLSX {
         }
         const vmlDrawingName = getVmlDrawingNameFromPath(entryName);
         if (vmlDrawingName) {
-            await this._processVmlDrawingEntry(stream, model, vmlDrawingName);
+            await this._processVmlDrawingEntry(stream, model, entryName);
             return true;
         }
         // VML header/footer drawings (watermark in header mode).
@@ -1306,14 +1308,13 @@ class XLSX {
             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);
+            await this._processTableEntry(stream, model, entryName);
             return true;
         }
         const themeName = getThemeNameFromPath(entryName);