@cj-tech-master/excelts 6.1.0 → 6.1.1

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

@@ -141,7 +141,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 errors_1.WorksheetNameError(`Worksheet name already exists: ${name}`);
         }
         this._name = name;

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

@@ -1,21 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HyperlinkXform = void 0;
+exports.isInternalLink = isInternalLink;
 const base_xform_1 = require("../base-xform.js");
 class HyperlinkXform extends base_xform_1.BaseXform {
     get tag() {
         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,
@@ -30,9 +33,13 @@ class HyperlinkXform extends base_xform_1.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;
         }
@@ -42,9 +49,13 @@ class HyperlinkXform extends base_xform_1.BaseXform {
     parseClose() {
         return false;
     }
-    isInternalLink(model) {
-        // @example: Sheet2!D3, return true
-        return !!(model.target && /^[^!]+![a-zA-Z]+[\d]+$/.test(model.target));
-    }
 }
 exports.HyperlinkXform = 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("#");
+}

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

@@ -6,11 +6,11 @@ const xml_stream_1 = require("../../../utils/xml-stream.js");
 const rel_type_1 = require("../../rel-type.js");
 const merges_1 = require("./merges.js");
 const base_xform_1 = require("../base-xform.js");
+const hyperlink_xform_1 = require("./hyperlink-xform.js");
 const list_xform_1 = require("../list-xform.js");
 const row_xform_1 = require("./row-xform.js");
 const col_xform_1 = require("./col-xform.js");
 const dimension_xform_1 = require("./dimension-xform.js");
-const hyperlink_xform_1 = require("./hyperlink-xform.js");
 const merge_cell_xform_1 = require("./merge-cell-xform.js");
 const data_validations_xform_1 = require("./data-validations-xform.js");
 const sheet_properties_xform_1 = require("./sheet-properties-xform.js");
@@ -161,6 +161,11 @@ class WorkSheetXform extends base_xform_1.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 ((0, hyperlink_xform_1.isInternalLink)(hyperlink.target)) {
+                return;
+            }
             const rId = nextRid(rels);
             hyperlink.rId = rId;
             rels.push({
@@ -597,8 +602,13 @@ class WorkSheetXform extends base_xform_1.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 = {};