fix: updated TemplateFs methods

added tests

Author: JS-AK

src/lib/template/template-fs.ts

@@ -105,16 +105,16 @@ export class TemplateFs {
 			initialMergeCells,
 			mergeCellMatches,
 			modifiedXml,
-		} = processMergeCells(sheetXml);
+		} = Utils.processMergeCells(sheetXml);
 
 		const {
 			sharedIndexMap,
 			sharedStrings,
 			sharedStringsHeader,
 			sheetMergeCells,
-		} = processSharedStrings(sharedStringsXml);
+		} = Utils.processSharedStrings(sharedStringsXml);
 
-		const { lastIndex, resultRows, rowShift } = processRows({
+		const { lastIndex, resultRows, rowShift } = Utils.processRows({
 			mergeCellMatches,
 			replacements,
 			sharedIndexMap,
@@ -123,7 +123,7 @@ export class TemplateFs {
 			sheetXml: modifiedXml,
 		});
 
-		return processBuild({
+		return Utils.processMergeFinalize({
 			initialMergeCells,
 			lastIndex,
 			mergeCellMatches,
@@ -873,317 +873,3 @@ export class TemplateFs {
 		return new TemplateFs(new Set(Object.keys(files)), destination);
 	}
 }
-
-function processMergeCells(sheetXml: string) {
-	// Regular expression for finding <mergeCells> block
-	const mergeCellsBlockRegex = /<mergeCells[^>]*>[\s\S]*?<\/mergeCells>/;
-
-	// Find the first <mergeCells> block (if there are multiple, in xlsx usually there is only one)
-	const mergeCellsBlockMatch = sheetXml.match(mergeCellsBlockRegex);
-
-	const initialMergeCells: string[] = [];
-	const mergeCellMatches: { from: string; to: string }[] = [];
-
-	if (mergeCellsBlockMatch) {
-		const mergeCellsBlock = mergeCellsBlockMatch[0];
-		initialMergeCells.push(mergeCellsBlock);
-
-		// Extract <mergeCell ref="A1:B2"/> from this block
-		const mergeCellRegex = /<mergeCell ref="([A-Z]+\d+):([A-Z]+\d+)"\/>/g;
-		for (const match of mergeCellsBlock.matchAll(mergeCellRegex)) {
-			mergeCellMatches.push({ from: match[1]!, to: match[2]! });
-		}
-	}
-
-	// Remove the <mergeCells> block from the XML
-	const modifiedXml = sheetXml.replace(mergeCellsBlockRegex, "");
-
-	return {
-		initialMergeCells,
-		mergeCellMatches,
-		modifiedXml,
-	};
-};
-
-function processSharedStrings(sharedStringsXml: string) {
-	// Final list of merged cells with all changes
-	const sheetMergeCells: string[] = [];
-
-	// Array for storing shared strings
-	const sharedStrings: string[] = [];
-	const sharedStringsHeader = Utils.extractXmlDeclaration(sharedStringsXml);
-
-	// Map for fast lookup of shared string index by content
-	const sharedIndexMap = new Map<string, number>();
-
-	// Regular expression for finding <si> elements (shared string items)
-	const siRegex = /<si>([\s\S]*?)<\/si>/g;
-
-	// Parse sharedStringsXml and fill sharedStrings and sharedIndexMap
-	for (const match of sharedStringsXml.matchAll(siRegex)) {
-		const content = match[1];
-
-		if (!content) throw new Error("Shared index not found");
-
-		const fullSi = `<si>${content}</si>`;
-		sharedIndexMap.set(content, sharedStrings.length);
-		sharedStrings.push(fullSi);
-	}
-
-	return {
-		sharedIndexMap,
-		sharedStrings,
-		sharedStringsHeader,
-		sheetMergeCells,
-	};
-};
-
-function processRows(data: {
-	replacements: Record<string, unknown>;
-	sharedIndexMap: Map<string, number>;
-	mergeCellMatches: { from: string; to: string }[];
-	sharedStrings: string[];
-	sheetMergeCells: string[];
-	sheetXml: string;
-}) {
-	const {
-		mergeCellMatches,
-		replacements,
-		sharedIndexMap,
-		sharedStrings,
-		sheetMergeCells,
-		sheetXml,
-	} = data;
-	const TABLE_REGEX = /\$\{table:([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]+)\}/g;
-
-	// Array for storing resulting XML rows
-	const resultRows: string[] = [];
-
-	// Previous position of processed part of XML
-	let lastIndex = 0;
-
-	// Shift for row numbers
-	let rowShift = 0;
-
-	// Regular expression for finding <row> elements
-	const rowRegex = /<row[^>]*?>[\s\S]*?<\/row>/g;
-
-	// Process each <row> element
-	for (const match of sheetXml.matchAll(rowRegex)) {
-		// Full XML row
-		const fullRow = match[0];
-
-		// Start position of the row in XML
-		const matchStart = match.index!;
-
-		// End position of the row in XML
-		const matchEnd = matchStart + fullRow.length;
-
-		// Add the intermediate XML chunk (if any) between the previous and the current row
-		if (lastIndex !== matchStart) {
-			resultRows.push(sheetXml.slice(lastIndex, matchStart));
-		}
-
-		lastIndex = matchEnd;
-
-		// Get row number from r attribute
-		const originalRowNumber = parseInt(fullRow.match(/<row[^>]* r="(\d+)"/)?.[1] ?? "1", 10);
-
-		// Update row number based on rowShift
-		const shiftedRowNumber = originalRowNumber + rowShift;
-
-		// Find shared string indexes in cells of the current row
-		const sharedValueIndexes: number[] = [];
-
-		// Regular expression for finding a cell
-		const cellRegex = /<c[^>]*?r="([A-Z]+\d+)"[^>]*?>([\s\S]*?)<\/c>/g;
-
-		for (const cell of fullRow.matchAll(cellRegex)) {
-			const cellTag = cell[0];
-			// Check if the cell is a shared string
-			const isShared = /t="s"/.test(cellTag);
-			const valueMatch = cellTag.match(/<v>(\d+)<\/v>/);
-
-			if (isShared && valueMatch) {
-				sharedValueIndexes.push(parseInt(valueMatch[1]!, 10));
-			}
-		}
-
-		// Get the text content of shared strings by their indexes
-		const sharedTexts = sharedValueIndexes.map(i => sharedStrings[i]?.replace(/<\/?si>/g, "") ?? "");
-
-		// Find table placeholders in shared strings
-		const tablePlaceholders = sharedTexts.flatMap(e => [...e.matchAll(TABLE_REGEX)]);
-
-		// If there are no table placeholders, just shift the row
-		if (tablePlaceholders.length === 0) {
-			const updatedRow = fullRow
-				.replace(/(<row[^>]* r=")(\d+)(")/, `$1${shiftedRowNumber}$3`)
-				.replace(/<c r="([A-Z]+)(\d+)"/g, (_, col) => `<c r="${col}${shiftedRowNumber}"`);
-
-			resultRows.push(updatedRow);
-
-			// Update mergeCells for regular row with rowShift
-			const calculatedRowNumber = originalRowNumber + rowShift;
-
-			for (const { from, to } of mergeCellMatches) {
-				const [, fromCol, fromRow] = from.match(/^([A-Z]+)(\d+)$/)!;
-				const [, toCol] = to.match(/^([A-Z]+)(\d+)$/)!;
-
-				if (Number(fromRow) === calculatedRowNumber) {
-					const newFrom = `${fromCol}${shiftedRowNumber}`;
-					const newTo = `${toCol}${shiftedRowNumber}`;
-
-					sheetMergeCells.push(`<mergeCell ref="${newFrom}:${newTo}"/>`);
-				}
-			}
-
-			continue;
-		}
-
-		// Get the table name from the first placeholder
-		const firstMatch = tablePlaceholders[0];
-		const tableName = firstMatch?.[1];
-		if (!tableName) throw new Error("Table name not found");
-
-		// Get data for replacement from replacements
-		const array = replacements[tableName];
-		if (!array) continue;
-		if (!Array.isArray(array)) throw new Error("Table data is not an array");
-
-		const tableRowStart = shiftedRowNumber;
-
-		// Find mergeCells to duplicate (mergeCells that start with the current row)
-		const mergeCellsToDuplicate = mergeCellMatches.filter(({ from }) => {
-			const match = from.match(/^([A-Z]+)(\d+)$/);
-
-			if (!match) return false;
-
-			// Row number of the merge cell start position is in the second group
-			const rowNumber = match[2];
-
-			return Number(rowNumber) === tableRowStart;
-		});
-
-		// Change the current row to multiple rows from the data array
-		for (let i = 0; i < array.length; i++) {
-			const rowData = array[i];
-			let newRow = fullRow;
-
-			// Replace placeholders in shared strings with real data
-			sharedValueIndexes.forEach((originalIdx, idx) => {
-				const originalText = sharedTexts[idx];
-				if (!originalText) throw new Error("Shared value not found");
-
-				// Replace placeholders ${tableName.field} with real data from array data
-				const replacedText = originalText.replace(TABLE_REGEX, (_, tbl, field) =>
-					tbl === tableName ? String(rowData?.[field] ?? "") : "",
-				);
-
-				// Add new text to shared strings if it doesn't exist
-				let newIndex: number;
-				if (sharedIndexMap.has(replacedText)) {
-					newIndex = sharedIndexMap.get(replacedText)!;
-				} else {
-					newIndex = sharedStrings.length;
-					sharedIndexMap.set(replacedText, newIndex);
-					sharedStrings.push(`<si>${replacedText}</si>`);
-				}
-
-				// Replace the shared string index in the cell
-				newRow = newRow.replace(`<v>${originalIdx}</v>`, `<v>${newIndex}</v>`);
-			});
-
-			// Update row number and cell references
-			const newRowNum = shiftedRowNumber + i;
-			newRow = newRow
-				.replace(/<row[^>]* r="\d+"/, rowTag => rowTag.replace(/r="\d+"/, `r="${newRowNum}"`))
-				.replace(/<c r="([A-Z]+)\d+"/g, (_, col) => `<c r="${col}${newRowNum}"`);
-
-			resultRows.push(newRow);
-
-			// Add duplicate mergeCells for new rows
-			for (const { from, to } of mergeCellsToDuplicate) {
-				const [, colFrom, rowFrom] = from.match(/^([A-Z]+)(\d+)$/)!;
-				const [, colTo, rowTo] = to.match(/^([A-Z]+)(\d+)$/)!;
-				const newFrom = `${colFrom}${Number(rowFrom) + i}`;
-				const newTo = `${colTo}${Number(rowTo) + i}`;
-
-				sheetMergeCells.push(`<mergeCell ref="${newFrom}:${newTo}"/>`);
-			}
-		}
-
-		// It increases the row shift by the number of added rows minus one replaced
-		rowShift += array.length - 1;
-
-		const delta = array.length - 1;
-
-		const calculatedRowNumber = originalRowNumber + rowShift - array.length + 1;
-
-		if (delta > 0) {
-			for (const merge of mergeCellMatches) {
-				const fromRow = parseInt(merge.from.match(/\d+$/)![0], 10);
-				if (fromRow > calculatedRowNumber) {
-					merge.from = merge.from.replace(/\d+$/, r => `${parseInt(r) + delta}`);
-					merge.to = merge.to.replace(/\d+$/, r => `${parseInt(r) + delta}`);
-				}
-			}
-		}
-	}
-
-	return { lastIndex, resultRows, rowShift };
-};
-
-function processBuild(data: {
-	initialMergeCells: string[];
-	lastIndex: number;
-	mergeCellMatches: { from: string; to: string }[];
-	resultRows: string[];
-	rowShift: number;
-	sharedStrings: string[];
-	sharedStringsHeader: string | null;
-	sheetMergeCells: string[];
-	sheetXml: string;
-}) {
-	const {
-		initialMergeCells,
-		lastIndex,
-		mergeCellMatches,
-		resultRows,
-		rowShift,
-		sharedStrings,
-		sharedStringsHeader,
-		sheetMergeCells,
-		sheetXml,
-	} = data;
-
-	for (const { from, to } of mergeCellMatches) {
-		const [, fromCol, fromRow] = from.match(/^([A-Z]+)(\d+)$/)!;
-		const [, toCol, toRow] = to.match(/^([A-Z]+)(\d+)$/)!;
-
-		const fromRowNum = Number(fromRow);
-		// These rows have already been processed, don't add duplicates
-		if (fromRowNum <= lastIndex) continue;
-
-		const newFrom = `${fromCol}${fromRowNum + rowShift}`;
-		const newTo = `${toCol}${Number(toRow) + rowShift}`;
-
-		sheetMergeCells.push(`<mergeCell ref="${newFrom}:${newTo}"/>`);
-	}
-
-	resultRows.push(sheetXml.slice(lastIndex));
-
-	// Form XML for mergeCells if there are any
-	const mergeXml = sheetMergeCells.length
-		? `<mergeCells count="${sheetMergeCells.length}">${sheetMergeCells.join("")}</mergeCells>`
-		: initialMergeCells;
-
-	// Insert mergeCells before the closing sheetData tag
-	const sheetWithMerge = resultRows.join("").replace(/<\/sheetData>/, `</sheetData>${mergeXml}`);
-
-	// Return modified sheet XML and shared strings
-	return {
-		shared: `${sharedStringsHeader}\n<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="${sharedStrings.length}" uniqueCount="${sharedStrings.length}">${sharedStrings.join("")}</sst>`,
-		sheet: Utils.updateDimension(sheetWithMerge),
-	};
-}

src/lib/template/utils/column-index-to-letter.ts

@@ -18,9 +18,11 @@ export function columnIndexToLetter(index: number): string {
 	}
 
 	let letters = "";
+
 	while (index >= 0) {
 		letters = String.fromCharCode((index % 26) + 65) + letters;
 		index = Math.floor(index / 26) - 1;
 	}
+
 	return letters;
 }