@office-open/xlsx 0.13.0 → 0.13.2

package/dist/index.mjs

@@ -10735,7 +10735,6 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 	const groupOpts = wsOpts.groups ?? [];
 	const hlOpts = wsOpts.hyperlinks ?? [];
 	const sheetName = wsOpts.name ?? `Sheet${i + 1}`;
-	let sheetXml = stringifyWorksheet(wsOpts, wsContext);
 	const sheetIdx = wsOpts.sheetId ?? i + 1;
 	const wsRows = wsOpts.rows ?? [];
 	for (let ri = 0; ri < wsRows.length; ri++) {
@@ -10766,13 +10765,68 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 	const hasQueryTables = queryTableOpts.length > 0;
 	const singleXmlCellOpts = wsOpts.singleXmlCells ?? [];
 	const bgImg = wsOpts.backgroundImage;
+	const wsPath = `xl/worksheets/sheet${i + 1}.xml`;
 	let wsRels;
-	let nextRid = 0;
-	if (hasMedia || hasExternalHyperlinks || hasComments || hasPivots || hasTables || hasQueryTables || singleXmlCellOpts.length > 0 || bgImg) wsRels = new Relationships();
+	if (hasMedia || hasExternalHyperlinks || hasComments || hasPivots || hasTables || hasQueryTables || singleXmlCellOpts.length > 0 || bgImg) {
+		wsRels = new Relationships();
+		wsRels.reserveSourceRids(wsPath, passthroughRelationships ?? []);
+	}
+	const resolvePassthroughRid = (typeFragment, originalRid) => {
+		if (!wsRels) return originalRid;
+		const rel = (passthroughRelationships ?? []).find((r) => r.source === wsPath && r.rId === originalRid && r.relationshipType.endsWith(typeFragment));
+		if (!rel) return originalRid;
+		const existing = wsRels.idOf(rel.relationshipType, rel.target);
+		if (existing) return existing;
+		if (wsRels.hasId(originalRid)) return `rId${wsRels.add(rel.relationshipType, rel.target)}`;
+		wsRels.addRelationship(originalRid, rel.relationshipType, rel.target);
+		return originalRid;
+	};
+	const resolveEmbeddingRid = (originalRid) => {
+		const rid = resolvePassthroughRid("/oleObject", originalRid);
+		return rid === originalRid ? resolvePassthroughRid("/package", originalRid) : rid;
+	};
+	let xmlOpts = wsOpts;
+	if (wsRels && (passthroughRelationships?.length ?? 0) > 0) {
+		const oleObjects = wsOpts.oleObjects?.map((ole) => ({
+			...ole,
+			rId: ole.rId ? resolveEmbeddingRid(ole.rId) : ole.rId,
+			properties: ole.properties?.iconRid !== void 0 ? {
+				...ole.properties,
+				iconRid: resolvePassthroughRid("/image", ole.properties.iconRid)
+			} : ole.properties
+		}));
+		const controls = wsOpts.controls?.map((c) => ({
+			...c,
+			rId: resolvePassthroughRid("/controls", c.rId),
+			iconRid: c.iconRid !== void 0 ? resolvePassthroughRid("/image", c.iconRid) : c.iconRid
+		}));
+		const pageSetup = wsOpts.pageSetup?.printerSettingsRId ? {
+			...wsOpts.pageSetup,
+			printerSettingsRId: resolvePassthroughRid("/printerSettings", wsOpts.pageSetup.printerSettingsRId)
+		} : wsOpts.pageSetup;
+		const pivotSelection = wsOpts.pivotSelection?.rId ? {
+			...wsOpts.pivotSelection,
+			rId: resolvePassthroughRid("/pivotTable", wsOpts.pivotSelection.rId)
+		} : wsOpts.pivotSelection;
+		const legacyDrawingHF = wsOpts.legacyDrawingHF ? resolvePassthroughRid("/vmlDrawing", wsOpts.legacyDrawingHF) : wsOpts.legacyDrawingHF;
+		const customProperties = wsOpts.customProperties?.map((cp) => ({
+			...cp,
+			rId: resolvePassthroughRid("/customXml", cp.rId)
+		}));
+		xmlOpts = {
+			...wsOpts,
+			...oleObjects ? { oleObjects } : {},
+			...controls ? { controls } : {},
+			...pageSetup !== wsOpts.pageSetup ? { pageSetup } : {},
+			...pivotSelection !== wsOpts.pivotSelection ? { pivotSelection } : {},
+			...legacyDrawingHF !== wsOpts.legacyDrawingHF ? { legacyDrawingHF } : {},
+			...customProperties ? { customProperties } : {}
+		};
+	}
+	let sheetXml = stringifyWorksheet(xmlOpts, wsContext);
 	if (hasExternalHyperlinks) for (const hl of hlOpts) {
 		if (hl.url === void 0) continue;
-		const rid = ++nextRid;
-		wsRels.addRelationship(rid, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", hl.url, "External");
+		wsRels.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", hl.url, "External");
 	}
 	if (hasMedia) {
 		const drawingImages = [];
@@ -10904,9 +10958,8 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 			data: XML_DECL + drawingRels.serialize(),
 			path: `xl/drawings/_rels/drawing${drawingIdx}.xml.rels`
 		};
-		const drawingRid = ++nextRid;
+		const drawingRid = wsRels.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing", `../drawings/drawing${drawingIdx}.xml`);
 		sheetXml = editSheetTailMarker(sheetXml, "<!--DRAWING-->", `<drawing r:id="rId${drawingRid}"/>`);
-		wsRels.addRelationship(drawingRid, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing", `../drawings/drawing${drawingIdx}.xml`);
 	}
 	if (hasComments) {
 		const commentsIdx = i + 1;
@@ -10920,10 +10973,8 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 			data: XML_DECL + vmlXml,
 			path: `xl/drawings/vmlDrawing${commentsIdx}.vml`
 		};
-		const commentsRid = ++nextRid;
-		wsRels.addRelationship(commentsRid, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments", `../comments${commentsIdx}.xml`);
-		const vmlRid = ++nextRid;
-		wsRels.addRelationship(vmlRid, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing", `../drawings/vmlDrawing${commentsIdx}.vml`);
+		wsRels.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments", `../comments${commentsIdx}.xml`);
+		const vmlRid = wsRels.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing", `../drawings/vmlDrawing${commentsIdx}.vml`);
 		sheetXml = editSheetTailMarker(sheetXml, "<!--LEGACY_DRAWING-->", `<legacyDrawing r:id="rId${vmlRid}"/>`);
 	}
 	if (bgImg) {
@@ -10937,25 +10988,9 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 			height: 0
 		}));
 		state.globalMediaIdx++;
-		const bgRid = ++nextRid;
-		wsRels.addRelationship(bgRid, IMAGE_REL, `../media/${entry.fileName}`);
+		const bgRid = wsRels.add(IMAGE_REL, `../media/${entry.fileName}`);
 		sheetXml = editSheetTailMarker(sheetXml, "<!--BACKGROUND_PICTURE-->", `<picture r:id="rId${bgRid}"/>`);
 	}
-	const wsPath = `xl/worksheets/sheet${i + 1}.xml`;
-	const resolvePassthroughRid = (typeFragment, originalRid) => {
-		if (!wsRels) return originalRid;
-		const rel = (passthroughRelationships ?? []).find((r) => r.source === wsPath && r.rId === originalRid && r.relationshipType.endsWith(typeFragment));
-		if (!rel) return originalRid;
-		const existing = wsRels.idOf(rel.relationshipType, rel.target);
-		if (existing) return existing;
-		if (wsRels.hasId(originalRid)) {
-			const n = ++nextRid;
-			wsRels.addRelationship(n, rel.relationshipType, rel.target);
-			return `rId${n}`;
-		}
-		wsRels.addRelationship(originalRid, rel.relationshipType, rel.target);
-		return originalRid;
-	};
 	if (wsOpts.drawingRid) {
 		const rid = escapeXml(resolvePassthroughRid("/drawing", wsOpts.drawingRid));
 		sheetXml = editSheetTailMarker(sheetXml, "<!--DRAWING-->", `<drawing r:id="${rid}"/>`);
@@ -11031,8 +11066,7 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 			data: XML_DECL + ptRels.serialize(),
 			path: `xl/pivotTables/_rels/pivotTable${pivotIdx}.xml.rels`
 		};
-		const ptRid = ++nextRid;
-		wsRels.addRelationship(ptRid, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable", `../pivotTables/pivotTable${pivotIdx}.xml`);
+		wsRels.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable", `../pivotTables/pivotTable${pivotIdx}.xml`);
 	}
 	const wsTableParts = [];
 	if (hasTables) for (const tbl of tableOpts) {
@@ -11047,8 +11081,7 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 			data: tableXmlStr,
 			path: `xl/tables/table${tableIdx}.xml`
 		};
-		const tblRid = ++nextRid;
-		wsRels.addRelationship(tblRid, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table", `../tables/table${tableIdx}.xml`);
+		const tblRid = wsRels.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/table", `../tables/table${tableIdx}.xml`);
 		wsTableParts.push({ rId: `rId${tblRid}` });
 		state.allTableParts.push({ rId: `rId${tblRid}` });
 	}
@@ -11058,8 +11091,7 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 			data: XML_DECL + queryTableDesc.stringify(qt, ctx),
 			path: `xl/queryTables/queryTable${state.globalQueryTableIdx}.xml`
 		};
-		const qtRid = ++nextRid;
-		wsRels.addRelationship(qtRid, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/queryTable", `../queryTables/queryTable${state.globalQueryTableIdx}.xml`);
+		wsRels.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/queryTable", `../queryTables/queryTable${state.globalQueryTableIdx}.xml`);
 	}
 	if (singleXmlCellOpts.length > 0) {
 		state.globalSingleXmlCellsIdx++;
@@ -11067,8 +11099,7 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 			data: XML_DECL + singleXmlCellsDesc.stringify({ cells: singleXmlCellOpts }, ctx),
 			path: `xl/tables/tableSingleCells${state.globalSingleXmlCellsIdx}.xml`
 		};
-		const sxcRid = ++nextRid;
-		wsRels.addRelationship(sxcRid, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableSingleCells", `../tables/tableSingleCells${state.globalSingleXmlCellsIdx}.xml`);
+		wsRels.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableSingleCells", `../tables/tableSingleCells${state.globalSingleXmlCellsIdx}.xml`);
 	}
 	if (hasPivots) {
 		const rendered = renderPivotSheetData(pivotOpts, worksheetConfigs, ctx.sharedStrings, sheetName);
@@ -11079,23 +11110,9 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 	}
 	if (wsTableParts.length > 0) sheetXml = editSheetTailMarker(sheetXml, "<!--TABLE_PARTS-->", buildTablePartsXml(wsTableParts));
 	sheetXml = stripWorksheetPlaceholders(sheetXml);
-	if (wsRels) {
-		if (wsOpts.pageSetup?.printerSettingsRId) {
-			const src = wsOpts.pageSetup.printerSettingsRId;
-			const rid = resolvePassthroughRid("/printerSettings", src);
-			if (rid !== src) sheetXml = sheetXml.replace(new RegExp(`(<pageSetup[^>]*r:id=")${src.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(")`), `$1${rid}$2`);
-		}
-		if (wsOpts.pivotSelection?.rId) {
-			const src = wsOpts.pivotSelection.rId;
-			const rid = resolvePassthroughRid("/pivotTable", src);
-			if (rid !== src) sheetXml = sheetXml.replace(new RegExp(`(<pivotSelection[^>]*r:id=")${src.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(")`), `$1${rid}$2`);
-		}
-		for (const rel of passthroughRelationships ?? []) {
-			if (rel.source !== wsPath) continue;
-			if (wsRels.hasRelationship(rel.relationshipType, rel.target)) continue;
-			const n = ++nextRid;
-			wsRels.addRelationship(n, rel.relationshipType, rel.target);
-		}
+	if (wsRels) for (const rel of passthroughRelationships ?? []) {
+		if (rel.source !== wsPath) continue;
+		wsRels.claimSourceRel(rel);
 	}
 	if (wsRels) mapping[`WorksheetRels${i}`] = {
 		data: XML_DECL + wsRels.serialize(),