@cj-tech-master/excelts 5.1.3 → 5.1.4

package/dist/browser/modules/excel/stream/workbook-writer.browser.js

@@ -224,8 +224,14 @@ export class WorkbookWriterBase {
     }
     addContentTypes() {
         return new Promise(resolve => {
+            const worksheets = this._worksheets.filter(Boolean);
+            // In the streaming path, ZIP entries use ws.id which is always sequential.
+            // Set fileIndex = id to satisfy the ContentTypesXform contract.
+            worksheets.forEach((ws) => {
+                ws.fileIndex = ws.id;
+            });
             const model = {
-                worksheets: this._worksheets.filter(Boolean),
+                worksheets,
                 sharedStrings: this.sharedStrings,
                 commentRefs: this.commentRefs,
                 media: this.media,

package/dist/browser/modules/excel/xlsx/xform/core/content-types-xform.js

@@ -29,11 +29,9 @@ class ContentTypesXform extends BaseXform {
             PartName: toContentTypesPartName(OOXML_PATHS.xlWorkbook),
             ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"
         });
-        model.worksheets.forEach((worksheet, index) => {
-            // Use fileIndex if set, otherwise use sequential index (1-based)
-            const fileIndex = worksheet.fileIndex || index + 1;
+        model.worksheets.forEach((worksheet) => {
             xmlStream.leafNode("Override", {
-                PartName: toContentTypesPartName(worksheetPath(fileIndex)),
+                PartName: toContentTypesPartName(worksheetPath(worksheet.fileIndex)),
                 ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
             });
         });

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

@@ -167,25 +167,30 @@ class WorkSheetXform extends BaseXform {
             });
         });
         // prepare comment relationships
+        // Use fileIndex (sequential 1-based) for file naming instead of model.id
+        // (the workbook-level sheet ID) because model.id can have gaps when sheets
+        // have been deleted, causing a mismatch between the relationship targets
+        // and the actual ZIP entry paths written by addWorksheets().
+        const { fileIndex } = model;
         if (model.comments.length > 0) {
             const comment = {
                 Id: nextRid(rels),
                 Type: RelType.Comments,
-                Target: commentsRelTargetFromWorksheet(model.id)
+                Target: commentsRelTargetFromWorksheet(fileIndex)
             };
             rels.push(comment);
             const vmlDrawing = {
                 Id: nextRid(rels),
                 Type: RelType.VmlDrawing,
-                Target: vmlDrawingRelTargetFromWorksheet(model.id)
+                Target: vmlDrawingRelTargetFromWorksheet(fileIndex)
             };
             rels.push(vmlDrawing);
             model.comments.forEach(item => {
                 item.refAddress = colCache.decodeAddress(item.ref);
             });
             options.commentRefs.push({
-                commentName: `comments${model.id}`,
-                vmlDrawing: `vmlDrawing${model.id}`
+                commentName: `comments${fileIndex}`,
+                vmlDrawing: `vmlDrawing${fileIndex}`
             });
         }
         // Handle pre-loaded drawing (from file read) that may contain charts or other non-image content.
@@ -338,7 +343,7 @@ class WorkSheetXform extends BaseXform {
                 rels.push({
                     Id: nextRid(rels),
                     Type: RelType.VmlDrawing,
-                    Target: vmlDrawingRelTargetFromWorksheet(model.id)
+                    Target: vmlDrawingRelTargetFromWorksheet(fileIndex)
                 });
             }
             // Add hidden DrawingML shapes that bridge to the VML shape ids.

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

@@ -33,7 +33,7 @@ import { bufferToString, base64ToUint8Array } from "../../../utils/utils.browser
 import { StreamingZip, ZipDeflateFile } from "../../archive/zip/stream.js";
 import { ZipParser } from "../../archive/unzip/zip-parser.js";
 import { PassThrough, concatUint8Arrays } from "../../stream/index.browser.js";
-import { commentsPath, commentsRelTargetFromWorksheetName, ctrlPropPath, drawingPath, drawingRelsPath, OOXML_REL_TARGETS, pivotTableRelTargetFromWorksheetName, pivotCacheDefinitionRelTargetFromWorkbook, getCommentsIndexFromPath, getDrawingNameFromPath, getDrawingNameFromRelsPath, getMediaFilenameFromPath, mediaPath, getPivotCacheDefinitionNameFromPath, getPivotCacheDefinitionNameFromRelsPath, getPivotCacheRecordsNameFromPath, getPivotTableNameFromPath, getPivotTableNameFromRelsPath, pivotCacheDefinitionPath, pivotCacheDefinitionRelsPath, pivotCacheDefinitionRelTargetFromPivotTable, pivotCacheRecordsPath, pivotCacheRecordsRelTarget, pivotTablePath, pivotTableRelsPath, getTableNameFromPath, tablePath, tableRelTargetFromWorksheetName, themePath, getThemeNameFromPath, getVmlDrawingNameFromPath, getWorksheetNoFromWorksheetPath, getWorksheetNoFromWorksheetRelsPath, isBinaryEntryPath, normalizeZipPath, OOXML_PATHS, vmlDrawingRelTargetFromWorksheetName, vmlDrawingPath, worksheetPath, worksheetRelsPath } from "../utils/ooxml-paths.js";
+import { commentsPath, commentsRelTargetFromWorksheetName, ctrlPropPath, drawingPath, drawingRelsPath, OOXML_REL_TARGETS, pivotTableRelTargetFromWorksheetName, pivotCacheDefinitionRelTargetFromWorkbook, getCommentsIndexFromPath, getDrawingNameFromPath, getDrawingNameFromRelsPath, getMediaFilenameFromPath, mediaPath, getPivotCacheDefinitionNameFromPath, getPivotCacheDefinitionNameFromRelsPath, getPivotCacheRecordsNameFromPath, getPivotTableNameFromPath, getPivotTableNameFromRelsPath, pivotCacheDefinitionPath, pivotCacheDefinitionRelsPath, pivotCacheDefinitionRelTargetFromPivotTable, pivotCacheRecordsPath, pivotCacheRecordsRelTarget, pivotTablePath, pivotTableRelsPath, getTableNameFromPath, tablePath, tableRelTargetFromWorksheetName, themePath, getThemeNameFromPath, getVmlDrawingNameFromPath, getWorksheetNoFromWorksheetPath, getWorksheetNoFromWorksheetRelsPath, isBinaryEntryPath, normalizeZipPath, OOXML_PATHS, vmlDrawingRelTargetFromWorksheetName, vmlDrawingPath, worksheetPath, worksheetRelsPath, worksheetRelTarget } from "../utils/ooxml-paths.js";
 import { PassthroughManager } from "../utils/passthrough-manager.js";
 class StreamingZipWriterAdapter {
     constructor(options) {
@@ -1050,13 +1050,13 @@ class XLSX {
                 });
             }
         });
-        model.worksheets.forEach((worksheet, index) => {
+        model.worksheets.forEach((worksheet) => {
             worksheet.rId = `rId${count++}`;
-            worksheet.fileIndex = index + 1;
+            // fileIndex is assigned once in prepareModel() — use it directly
             relationships.push({
                 Id: worksheet.rId,
                 Type: XLSX.RelType.Worksheet,
-                Target: `worksheets/sheet${worksheet.fileIndex}.xml`
+                Target: worksheetRelTarget(worksheet.fileIndex)
             });
         });
         const xform = new RelationshipsXform();
@@ -1091,8 +1091,8 @@ class XLSX {
         const commentsXform = new CommentsXform();
         const vmlDrawingXform = new VmlDrawingXform();
         const ctrlPropXform = new CtrlPropXform();
-        model.worksheets.forEach((worksheet, index) => {
-            const fileIndex = worksheet.fileIndex || index + 1;
+        model.worksheets.forEach((worksheet) => {
+            const { fileIndex } = worksheet;
             let xmlStream = new XmlStream();
             worksheetXform.render(xmlStream, worksheet);
             zip.append(xmlStream.xml, { name: worksheetPath(fileIndex) });
@@ -1299,7 +1299,12 @@ class XLSX {
         worksheetOptions.formControlRefs = model.formControlRefs = [];
         let tableCount = 0;
         model.tables = [];
-        model.worksheets.forEach((worksheet) => {
+        model.worksheets.forEach((worksheet, index) => {
+            // Assign fileIndex early so that worksheet-xform.prepare() can use it
+            // for comment/VML relationship targets and content type names.
+            // This ensures consistency with addWorksheets() which writes ZIP entries
+            // using the same fileIndex.
+            worksheet.fileIndex = index + 1;
             worksheet.tables.forEach((table) => {
                 tableCount++;
                 table.target = `table${tableCount}.xml`;

package/dist/cjs/modules/excel/stream/workbook-writer.browser.js

@@ -227,8 +227,14 @@ class WorkbookWriterBase {
     }
     addContentTypes() {
         return new Promise(resolve => {
+            const worksheets = this._worksheets.filter(Boolean);
+            // In the streaming path, ZIP entries use ws.id which is always sequential.
+            // Set fileIndex = id to satisfy the ContentTypesXform contract.
+            worksheets.forEach((ws) => {
+                ws.fileIndex = ws.id;
+            });
             const model = {
-                worksheets: this._worksheets.filter(Boolean),
+                worksheets,
                 sharedStrings: this.sharedStrings,
                 commentRefs: this.commentRefs,
                 media: this.media,

package/dist/cjs/modules/excel/xlsx/xform/core/content-types-xform.js

@@ -32,11 +32,9 @@ class ContentTypesXform extends base_xform_1.BaseXform {
             PartName: (0, ooxml_paths_1.toContentTypesPartName)(ooxml_paths_1.OOXML_PATHS.xlWorkbook),
             ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"
         });
-        model.worksheets.forEach((worksheet, index) => {
-            // Use fileIndex if set, otherwise use sequential index (1-based)
-            const fileIndex = worksheet.fileIndex || index + 1;
+        model.worksheets.forEach((worksheet) => {
             xmlStream.leafNode("Override", {
-                PartName: (0, ooxml_paths_1.toContentTypesPartName)((0, ooxml_paths_1.worksheetPath)(fileIndex)),
+                PartName: (0, ooxml_paths_1.toContentTypesPartName)((0, ooxml_paths_1.worksheetPath)(worksheet.fileIndex)),
                 ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
             });
         });

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

@@ -170,25 +170,30 @@ class WorkSheetXform extends base_xform_1.BaseXform {
             });
         });
         // prepare comment relationships
+        // Use fileIndex (sequential 1-based) for file naming instead of model.id
+        // (the workbook-level sheet ID) because model.id can have gaps when sheets
+        // have been deleted, causing a mismatch between the relationship targets
+        // and the actual ZIP entry paths written by addWorksheets().
+        const { fileIndex } = model;
         if (model.comments.length > 0) {
             const comment = {
                 Id: nextRid(rels),
                 Type: rel_type_1.RelType.Comments,
-                Target: (0, ooxml_paths_1.commentsRelTargetFromWorksheet)(model.id)
+                Target: (0, ooxml_paths_1.commentsRelTargetFromWorksheet)(fileIndex)
             };
             rels.push(comment);
             const vmlDrawing = {
                 Id: nextRid(rels),
                 Type: rel_type_1.RelType.VmlDrawing,
-                Target: (0, ooxml_paths_1.vmlDrawingRelTargetFromWorksheet)(model.id)
+                Target: (0, ooxml_paths_1.vmlDrawingRelTargetFromWorksheet)(fileIndex)
             };
             rels.push(vmlDrawing);
             model.comments.forEach(item => {
                 item.refAddress = col_cache_1.colCache.decodeAddress(item.ref);
             });
             options.commentRefs.push({
-                commentName: `comments${model.id}`,
-                vmlDrawing: `vmlDrawing${model.id}`
+                commentName: `comments${fileIndex}`,
+                vmlDrawing: `vmlDrawing${fileIndex}`
             });
         }
         // Handle pre-loaded drawing (from file read) that may contain charts or other non-image content.
@@ -341,7 +346,7 @@ class WorkSheetXform extends base_xform_1.BaseXform {
                 rels.push({
                     Id: nextRid(rels),
                     Type: rel_type_1.RelType.VmlDrawing,
-                    Target: (0, ooxml_paths_1.vmlDrawingRelTargetFromWorksheet)(model.id)
+                    Target: (0, ooxml_paths_1.vmlDrawingRelTargetFromWorksheet)(fileIndex)
                 });
             }
             // Add hidden DrawingML shapes that bridge to the VML shape ids.

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

@@ -1053,13 +1053,13 @@ class XLSX {
                 });
             }
         });
-        model.worksheets.forEach((worksheet, index) => {
+        model.worksheets.forEach((worksheet) => {
             worksheet.rId = `rId${count++}`;
-            worksheet.fileIndex = index + 1;
+            // fileIndex is assigned once in prepareModel() — use it directly
             relationships.push({
                 Id: worksheet.rId,
                 Type: XLSX.RelType.Worksheet,
-                Target: `worksheets/sheet${worksheet.fileIndex}.xml`
+                Target: (0, ooxml_paths_1.worksheetRelTarget)(worksheet.fileIndex)
             });
         });
         const xform = new relationships_xform_1.RelationshipsXform();
@@ -1094,8 +1094,8 @@ class XLSX {
         const commentsXform = new comments_xform_1.CommentsXform();
         const vmlDrawingXform = new vml_drawing_xform_1.VmlDrawingXform();
         const ctrlPropXform = new ctrl_prop_xform_1.CtrlPropXform();
-        model.worksheets.forEach((worksheet, index) => {
-            const fileIndex = worksheet.fileIndex || index + 1;
+        model.worksheets.forEach((worksheet) => {
+            const { fileIndex } = worksheet;
             let xmlStream = new xml_stream_1.XmlStream();
             worksheetXform.render(xmlStream, worksheet);
             zip.append(xmlStream.xml, { name: (0, ooxml_paths_1.worksheetPath)(fileIndex) });
@@ -1302,7 +1302,12 @@ class XLSX {
         worksheetOptions.formControlRefs = model.formControlRefs = [];
         let tableCount = 0;
         model.tables = [];
-        model.worksheets.forEach((worksheet) => {
+        model.worksheets.forEach((worksheet, index) => {
+            // Assign fileIndex early so that worksheet-xform.prepare() can use it
+            // for comment/VML relationship targets and content type names.
+            // This ensures consistency with addWorksheets() which writes ZIP entries
+            // using the same fileIndex.
+            worksheet.fileIndex = index + 1;
             worksheet.tables.forEach((table) => {
                 tableCount++;
                 table.target = `table${tableCount}.xml`;

package/dist/esm/modules/excel/stream/workbook-writer.browser.js

@@ -224,8 +224,14 @@ export class WorkbookWriterBase {
     }
     addContentTypes() {
         return new Promise(resolve => {
+            const worksheets = this._worksheets.filter(Boolean);
+            // In the streaming path, ZIP entries use ws.id which is always sequential.
+            // Set fileIndex = id to satisfy the ContentTypesXform contract.
+            worksheets.forEach((ws) => {
+                ws.fileIndex = ws.id;
+            });
             const model = {
-                worksheets: this._worksheets.filter(Boolean),
+                worksheets,
                 sharedStrings: this.sharedStrings,
                 commentRefs: this.commentRefs,
                 media: this.media,

package/dist/esm/modules/excel/xlsx/xform/core/content-types-xform.js

@@ -29,11 +29,9 @@ class ContentTypesXform extends BaseXform {
             PartName: toContentTypesPartName(OOXML_PATHS.xlWorkbook),
             ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"
         });
-        model.worksheets.forEach((worksheet, index) => {
-            // Use fileIndex if set, otherwise use sequential index (1-based)
-            const fileIndex = worksheet.fileIndex || index + 1;
+        model.worksheets.forEach((worksheet) => {
             xmlStream.leafNode("Override", {
-                PartName: toContentTypesPartName(worksheetPath(fileIndex)),
+                PartName: toContentTypesPartName(worksheetPath(worksheet.fileIndex)),
                 ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
             });
         });

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

@@ -167,25 +167,30 @@ class WorkSheetXform extends BaseXform {
             });
         });
         // prepare comment relationships
+        // Use fileIndex (sequential 1-based) for file naming instead of model.id
+        // (the workbook-level sheet ID) because model.id can have gaps when sheets
+        // have been deleted, causing a mismatch between the relationship targets
+        // and the actual ZIP entry paths written by addWorksheets().
+        const { fileIndex } = model;
         if (model.comments.length > 0) {
             const comment = {
                 Id: nextRid(rels),
                 Type: RelType.Comments,
-                Target: commentsRelTargetFromWorksheet(model.id)
+                Target: commentsRelTargetFromWorksheet(fileIndex)
             };
             rels.push(comment);
             const vmlDrawing = {
                 Id: nextRid(rels),
                 Type: RelType.VmlDrawing,
-                Target: vmlDrawingRelTargetFromWorksheet(model.id)
+                Target: vmlDrawingRelTargetFromWorksheet(fileIndex)
             };
             rels.push(vmlDrawing);
             model.comments.forEach(item => {
                 item.refAddress = colCache.decodeAddress(item.ref);
             });
             options.commentRefs.push({
-                commentName: `comments${model.id}`,
-                vmlDrawing: `vmlDrawing${model.id}`
+                commentName: `comments${fileIndex}`,
+                vmlDrawing: `vmlDrawing${fileIndex}`
             });
         }
         // Handle pre-loaded drawing (from file read) that may contain charts or other non-image content.
@@ -338,7 +343,7 @@ class WorkSheetXform extends BaseXform {
                 rels.push({
                     Id: nextRid(rels),
                     Type: RelType.VmlDrawing,
-                    Target: vmlDrawingRelTargetFromWorksheet(model.id)
+                    Target: vmlDrawingRelTargetFromWorksheet(fileIndex)
                 });
             }
             // Add hidden DrawingML shapes that bridge to the VML shape ids.

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

@@ -33,7 +33,7 @@ import { bufferToString, base64ToUint8Array } from "../../../utils/utils.js";
 import { StreamingZip, ZipDeflateFile } from "../../archive/zip/stream.js";
 import { ZipParser } from "../../archive/unzip/zip-parser.js";
 import { PassThrough, concatUint8Arrays } from "../../stream/index.js";
-import { commentsPath, commentsRelTargetFromWorksheetName, ctrlPropPath, drawingPath, drawingRelsPath, OOXML_REL_TARGETS, pivotTableRelTargetFromWorksheetName, pivotCacheDefinitionRelTargetFromWorkbook, getCommentsIndexFromPath, getDrawingNameFromPath, getDrawingNameFromRelsPath, getMediaFilenameFromPath, mediaPath, getPivotCacheDefinitionNameFromPath, getPivotCacheDefinitionNameFromRelsPath, getPivotCacheRecordsNameFromPath, getPivotTableNameFromPath, getPivotTableNameFromRelsPath, pivotCacheDefinitionPath, pivotCacheDefinitionRelsPath, pivotCacheDefinitionRelTargetFromPivotTable, pivotCacheRecordsPath, pivotCacheRecordsRelTarget, pivotTablePath, pivotTableRelsPath, getTableNameFromPath, tablePath, tableRelTargetFromWorksheetName, themePath, getThemeNameFromPath, getVmlDrawingNameFromPath, getWorksheetNoFromWorksheetPath, getWorksheetNoFromWorksheetRelsPath, isBinaryEntryPath, normalizeZipPath, OOXML_PATHS, vmlDrawingRelTargetFromWorksheetName, vmlDrawingPath, worksheetPath, worksheetRelsPath } from "../utils/ooxml-paths.js";
+import { commentsPath, commentsRelTargetFromWorksheetName, ctrlPropPath, drawingPath, drawingRelsPath, OOXML_REL_TARGETS, pivotTableRelTargetFromWorksheetName, pivotCacheDefinitionRelTargetFromWorkbook, getCommentsIndexFromPath, getDrawingNameFromPath, getDrawingNameFromRelsPath, getMediaFilenameFromPath, mediaPath, getPivotCacheDefinitionNameFromPath, getPivotCacheDefinitionNameFromRelsPath, getPivotCacheRecordsNameFromPath, getPivotTableNameFromPath, getPivotTableNameFromRelsPath, pivotCacheDefinitionPath, pivotCacheDefinitionRelsPath, pivotCacheDefinitionRelTargetFromPivotTable, pivotCacheRecordsPath, pivotCacheRecordsRelTarget, pivotTablePath, pivotTableRelsPath, getTableNameFromPath, tablePath, tableRelTargetFromWorksheetName, themePath, getThemeNameFromPath, getVmlDrawingNameFromPath, getWorksheetNoFromWorksheetPath, getWorksheetNoFromWorksheetRelsPath, isBinaryEntryPath, normalizeZipPath, OOXML_PATHS, vmlDrawingRelTargetFromWorksheetName, vmlDrawingPath, worksheetPath, worksheetRelsPath, worksheetRelTarget } from "../utils/ooxml-paths.js";
 import { PassthroughManager } from "../utils/passthrough-manager.js";
 class StreamingZipWriterAdapter {
     constructor(options) {
@@ -1050,13 +1050,13 @@ class XLSX {
                 });
             }
         });
-        model.worksheets.forEach((worksheet, index) => {
+        model.worksheets.forEach((worksheet) => {
             worksheet.rId = `rId${count++}`;
-            worksheet.fileIndex = index + 1;
+            // fileIndex is assigned once in prepareModel() — use it directly
             relationships.push({
                 Id: worksheet.rId,
                 Type: XLSX.RelType.Worksheet,
-                Target: `worksheets/sheet${worksheet.fileIndex}.xml`
+                Target: worksheetRelTarget(worksheet.fileIndex)
             });
         });
         const xform = new RelationshipsXform();
@@ -1091,8 +1091,8 @@ class XLSX {
         const commentsXform = new CommentsXform();
         const vmlDrawingXform = new VmlDrawingXform();
         const ctrlPropXform = new CtrlPropXform();
-        model.worksheets.forEach((worksheet, index) => {
-            const fileIndex = worksheet.fileIndex || index + 1;
+        model.worksheets.forEach((worksheet) => {
+            const { fileIndex } = worksheet;
             let xmlStream = new XmlStream();
             worksheetXform.render(xmlStream, worksheet);
             zip.append(xmlStream.xml, { name: worksheetPath(fileIndex) });
@@ -1299,7 +1299,12 @@ class XLSX {
         worksheetOptions.formControlRefs = model.formControlRefs = [];
         let tableCount = 0;
         model.tables = [];
-        model.worksheets.forEach((worksheet) => {
+        model.worksheets.forEach((worksheet, index) => {
+            // Assign fileIndex early so that worksheet-xform.prepare() can use it
+            // for comment/VML relationship targets and content type names.
+            // This ensures consistency with addWorksheets() which writes ZIP entries
+            // using the same fileIndex.
+            worksheet.fileIndex = index + 1;
             worksheet.tables.forEach((table) => {
                 tableCount++;
                 table.target = `table${tableCount}.xml`;

package/dist/iife/excelts.iife.js

@@ -1,5 +1,5 @@
 /*!
- * @cj-tech-master/excelts v5.1.3
+ * @cj-tech-master/excelts v5.1.4
  * TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.
  * (c) 2026 cjnoname
  * Released under the MIT License
@@ -10733,10 +10733,9 @@ var ExcelTS = (function(exports) {
 				PartName: toContentTypesPartName(OOXML_PATHS.xlWorkbook),
 				ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"
 			});
-			model.worksheets.forEach((worksheet, index) => {
-				const fileIndex = worksheet.fileIndex || index + 1;
+			model.worksheets.forEach((worksheet) => {
 				xmlStream.leafNode("Override", {
-					PartName: toContentTypesPartName(worksheetPath(fileIndex)),
+					PartName: toContentTypesPartName(worksheetPath(worksheet.fileIndex)),
 					ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
 				});
 			});
@@ -14239,25 +14238,26 @@ var ExcelTS = (function(exports) {
 					TargetMode: "External"
 				});
 			});
+			const { fileIndex } = model;
 			if (model.comments.length > 0) {
 				const comment = {
 					Id: nextRid(rels),
 					Type: RelType.Comments,
-					Target: commentsRelTargetFromWorksheet(model.id)
+					Target: commentsRelTargetFromWorksheet(fileIndex)
 				};
 				rels.push(comment);
 				const vmlDrawing = {
 					Id: nextRid(rels),
 					Type: RelType.VmlDrawing,
-					Target: vmlDrawingRelTargetFromWorksheet(model.id)
+					Target: vmlDrawingRelTargetFromWorksheet(fileIndex)
 				};
 				rels.push(vmlDrawing);
 				model.comments.forEach((item) => {
 					item.refAddress = colCache.decodeAddress(item.ref);
 				});
 				options.commentRefs.push({
-					commentName: `comments${model.id}`,
-					vmlDrawing: `vmlDrawing${model.id}`
+					commentName: `comments${fileIndex}`,
+					vmlDrawing: `vmlDrawing${fileIndex}`
 				});
 			}
 			if (model.drawing && model.drawing.anchors) {
@@ -14375,7 +14375,7 @@ var ExcelTS = (function(exports) {
 				if (model.comments.length === 0) rels.push({
 					Id: nextRid(rels),
 					Type: RelType.VmlDrawing,
-					Target: vmlDrawingRelTargetFromWorksheet(model.id)
+					Target: vmlDrawingRelTargetFromWorksheet(fileIndex)
 				});
 				const toNativePos = (p) => ({
 					nativeCol: p.col,
@@ -22319,13 +22319,12 @@ var ExcelTS = (function(exports) {
 					});
 				}
 			});
-			model.worksheets.forEach((worksheet, index) => {
+			model.worksheets.forEach((worksheet) => {
 				worksheet.rId = `rId${count++}`;
-				worksheet.fileIndex = index + 1;
 				relationships.push({
 					Id: worksheet.rId,
 					Type: XLSX.RelType.Worksheet,
-					Target: `worksheets/sheet${worksheet.fileIndex}.xml`
+					Target: worksheetRelTarget(worksheet.fileIndex)
 				});
 			});
 			const xml = new RelationshipsXform().toXml(relationships);
@@ -22353,8 +22352,8 @@ var ExcelTS = (function(exports) {
 			const commentsXform = new CommentsXform();
 			const vmlDrawingXform = new VmlDrawingXform();
 			const ctrlPropXform = new CtrlPropXform();
-			model.worksheets.forEach((worksheet, index) => {
-				const fileIndex = worksheet.fileIndex || index + 1;
+			model.worksheets.forEach((worksheet) => {
+				const { fileIndex } = worksheet;
 				let xmlStream = new XmlStream();
 				worksheetXform.render(xmlStream, worksheet);
 				zip.append(xmlStream.xml, { name: worksheetPath(fileIndex) });
@@ -22517,7 +22516,8 @@ var ExcelTS = (function(exports) {
 			worksheetOptions.formControlRefs = model.formControlRefs = [];
 			let tableCount = 0;
 			model.tables = [];
-			model.worksheets.forEach((worksheet) => {
+			model.worksheets.forEach((worksheet, index) => {
+				worksheet.fileIndex = index + 1;
 				worksheet.tables.forEach((table) => {
 					tableCount++;
 					table.target = `table${tableCount}.xml`;
@@ -24646,8 +24646,12 @@ var ExcelTS = (function(exports) {
 		}
 		addContentTypes() {
 			return new Promise((resolve) => {
+				const worksheets = this._worksheets.filter(Boolean);
+				worksheets.forEach((ws) => {
+					ws.fileIndex = ws.id;
+				});
 				const model = {
-					worksheets: this._worksheets.filter(Boolean),
+					worksheets,
 					sharedStrings: this.sharedStrings,
 					commentRefs: this.commentRefs,
 					media: this.media,