@cj-tech-master/excelts 6.1.0 → 6.1.1

package/dist/browser/modules/excel/stream/worksheet-reader.js

@@ -227,9 +227,12 @@ class WorksheetReader extends EventEmitter {
                                 break;
                             case "hyperlink":
                                 if (inHyperlinks) {
+                                    const loc = node.attributes.location;
                                     const hyperlink = {
                                         ref: node.attributes.ref,
-                                        rId: node.attributes["r:id"]
+                                        rId: node.attributes["r:id"],
+                                        // Internal links: resolve target from location attribute
+                                        target: loc ? (loc.startsWith("#") ? loc : `#${loc}`) : undefined
                                     };
                                     if (emitHyperlinks) {
                                         (worksheetEvents || (worksheetEvents = [])).push({ eventType: "hyperlink", value: hyperlink });

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

@@ -666,7 +666,8 @@ class Workbook {
             return this._worksheets[id];
         }
         if (typeof id === "string") {
-            return this._worksheets.find(worksheet => worksheet && worksheet.name === id);
+            const idLower = id.toLowerCase();
+            return this._worksheets.find(worksheet => worksheet && worksheet.name.toLowerCase() === idLower);
         }
         return undefined;
     }

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

@@ -138,7 +138,8 @@ class Worksheet {
             }
             name = name.substring(0, 31);
         }
-        if (this._workbook.worksheets.find(ws => ws && ws.name.toLowerCase() === name.toLowerCase())) {
+        const nameLower = name.toLowerCase();
+        if (this._workbook.worksheets.find(ws => ws && ws !== this && ws.name.toLowerCase() === nameLower)) {
             throw new WorksheetNameError(`Worksheet name already exists: ${name}`);
         }
         this._name = name;

package/dist/browser/modules/excel/xlsx/xform/sheet/hyperlink-xform.d.ts

@@ -1,7 +1,7 @@
 import { BaseXform } from "../base-xform.js";
 interface HyperlinkModel {
     address: string;
-    rId: string;
+    rId?: string;
     tooltip?: string;
     target?: string;
 }
@@ -11,6 +11,11 @@ declare class HyperlinkXform extends BaseXform {
     parseOpen(node: any): boolean;
     parseText(): void;
     parseClose(): boolean;
-    isInternalLink(model: HyperlinkModel): boolean;
 }
-export { HyperlinkXform };
+/**
+ * Internal hyperlinks start with "#" (e.g. "#Sheet2!A1").
+ * This matches Excel's convention and the OOXML spec where internal links
+ * use the `location` attribute instead of a relationship.
+ */
+declare function isInternalLink(target: string): boolean;
+export { HyperlinkXform, isInternalLink };

package/dist/browser/modules/excel/xlsx/xform/sheet/hyperlink-xform.js

@@ -4,15 +4,17 @@ class HyperlinkXform extends BaseXform {
         return "hyperlink";
     }
     render(xmlStream, model) {
-        if (this.isInternalLink(model)) {
+        if (model.target && isInternalLink(model.target)) {
+            // Internal link: use location attribute only (no relationship)
+            // Strip the leading "#" — OOXML location attribute is without "#"
             xmlStream.leafNode("hyperlink", {
                 ref: model.address,
-                "r:id": model.rId,
                 tooltip: model.tooltip,
-                location: model.target
+                location: model.target.slice(1)
             });
         }
         else {
+            // External link: use r:id relationship reference
             xmlStream.leafNode("hyperlink", {
                 ref: model.address,
                 "r:id": model.rId,
@@ -27,9 +29,13 @@ class HyperlinkXform extends BaseXform {
                 rId: node.attributes["r:id"],
                 tooltip: node.attributes.tooltip
             };
-            // This is an internal link
+            // Internal link: location attribute stores the target without "#"
+            // Normalize: always store as "#Location" in the model regardless of
+            // whether the source had a leading "#" (our old buggy output) or not
+            // (correct OOXML from Excel or the fixed writer).
             if (node.attributes.location) {
-                this.model.target = node.attributes.location;
+                const loc = node.attributes.location;
+                this.model.target = loc.startsWith("#") ? loc : `#${loc}`;
             }
             return true;
         }
@@ -39,9 +45,13 @@ class HyperlinkXform extends BaseXform {
     parseClose() {
         return false;
     }
-    isInternalLink(model) {
-        // @example: Sheet2!D3, return true
-        return !!(model.target && /^[^!]+![a-zA-Z]+[\d]+$/.test(model.target));
-    }
 }
-export { HyperlinkXform };
+/**
+ * Internal hyperlinks start with "#" (e.g. "#Sheet2!A1").
+ * This matches Excel's convention and the OOXML spec where internal links
+ * use the `location` attribute instead of a relationship.
+ */
+function isInternalLink(target) {
+    return target.startsWith("#");
+}
+export { HyperlinkXform, isInternalLink };

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

@@ -3,11 +3,11 @@ import { XmlStream } from "../../../utils/xml-stream.js";
 import { RelType } from "../../rel-type.js";
 import { Merges } from "./merges.js";
 import { BaseXform } from "../base-xform.js";
+import { isInternalLink, HyperlinkXform } from "./hyperlink-xform.js";
 import { ListXform } from "../list-xform.js";
 import { RowXform } from "./row-xform.js";
 import { ColXform } from "./col-xform.js";
 import { DimensionXform } from "./dimension-xform.js";
-import { HyperlinkXform } from "./hyperlink-xform.js";
 import { MergeCellXform } from "./merge-cell-xform.js";
 import { DataValidationsXform } from "./data-validations-xform.js";
 import { SheetPropertiesXform } from "./sheet-properties-xform.js";
@@ -158,6 +158,11 @@ class WorkSheetXform extends BaseXform {
             return `rId${r.length + 1}`;
         }
         model.hyperlinks.forEach(hyperlink => {
+            // Internal links (e.g. "#Sheet2!A1") use the location attribute only,
+            // no relationship is needed in the .rels file.
+            if (isInternalLink(hyperlink.target)) {
+                return;
+            }
             const rId = nextRid(rels);
             hyperlink.rId = rId;
             rels.push({
@@ -594,8 +599,13 @@ class WorkSheetXform extends BaseXform {
         }, {});
         options.hyperlinkMap = (model.hyperlinks ?? []).reduce((h, hyperlink) => {
             if (hyperlink.rId) {
+                // External link: resolve target from relationship
                 h[hyperlink.address] = rels[hyperlink.rId].Target;
             }
+            else if (hyperlink.target) {
+                // Internal link: target was restored from location attribute (with "#" prefix)
+                h[hyperlink.address] = hyperlink.target;
+            }
             return h;
         }, {});
         options.formulae = {};