From afb9d2760f3e1dc99d0244c162f8d0fce9192b7a Mon Sep 17 00:00:00 2001
From: Bart Veneman <bartveneman@gmail.com>
Date: Tue, 17 Mar 2026 22:17:31 +0100
Subject: [PATCH] fix: use search_from offset in indexOf to correctly locate
 duplicate style blocks

---
 src/lib/remap-html.test.ts | 14 ++++++++++++++
 src/lib/remap-html.ts      |  7 +++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/lib/remap-html.test.ts b/src/lib/remap-html.test.ts
index cf5bc16..38e0dca 100644
--- a/src/lib/remap-html.test.ts
+++ b/src/lib/remap-html.test.ts
@@ -44,6 +44,20 @@ test('remaps a single style block', () => {
 	})
 })
 
+test('remaps correctly when two style blocks have identical content', () => {
+	let css = `h1 { color: red; }`
+	// Two style tags with identical CSS — indexOf always finds the first occurrence,
+	// so a range inside the second block falls outside [first_start, first_end] and gets dropped
+	let html = `<style>${css}</style><style>${css}</style>`
+	let second_start = html.lastIndexOf('<style>') + '<style>'.length
+	let range = { start: second_start, end: second_start + css.length }
+	let result = remap_html(html, [range])
+	expect(result).toEqual({
+		css: css + css,
+		ranges: [{ start: css.length, end: css.length * 2 }],
+	})
+})
+
 test('remaps multiple style blocks', () => {
 	let css_head = `h1 { color: red; }`
 	let css_body = `h2 { font-size: 24px; }`
diff --git a/src/lib/remap-html.ts b/src/lib/remap-html.ts
index 1a9c738..80b9401 100644
--- a/src/lib/remap-html.ts
+++ b/src/lib/remap-html.ts
@@ -16,6 +16,7 @@ export function remap_html(html: string, old_ranges: Range[]) {
 	let new_ranges = []
 	let current_offset = 0
 	let style_elements = doc.querySelectorAll('style')
+	let search_from = 0
 
 	for (let style_element of Array.from(style_elements)) {
 		let style_content = style_element.textContent
@@ -24,9 +25,11 @@ export function remap_html(html: string, old_ranges: Range[]) {
 		// Append the style content directly to the combined CSS
 		combined_css += style_content
 
-		// Find the offsets of this style element's content in the original HTML
-		let start_index = html.indexOf(style_content)
+		// Find the offsets of this style element's content in the original HTML,
+		// starting after the previous style block to avoid matching an earlier occurrence
+		let start_index = html.indexOf(style_content, search_from)
 		let end_index = start_index + style_content.length
+		search_from = end_index
 
 		// Iterate through ranges and adjust if they fall within the current style tag
 		for (let range of old_ranges) {