@nuasite/cms 0.37.0 → 0.38.0

package/src/source-finder/snippet-utils.ts

@@ -22,6 +22,7 @@ import {
 	findInTextIndex,
 	findTemplateElementUsingStringLiteral,
 	findTranslationByKeyAndText,
+	findVariableHitInFile,
 	initializeSearchIndex,
 	isTranslationFilePath,
 } from './search-index'
@@ -110,20 +111,19 @@ export function findTextDefinitionLine(
  * this function searches backwards to find the opening tag first.
  */
 export function extractCompleteTagSnippet(lines: string[], startLine: number, tag: string): string {
-	// Pattern to match opening tag - either followed by whitespace/>, or at end of line (multi-line tag)
 	const escapedTag = escapeRegex(tag)
+	// Opening tag — followed by whitespace/`>`, or at end of line (multi-line tag).
 	const openTagPattern = new RegExp(`<${escapedTag}(?:[\\s>]|$)`, 'gi')
+	const selfClosingPattern = new RegExp(`<${escapedTag}[^>]*/>`, 'gi')
+	const closeTagPattern = new RegExp(`</${escapedTag}>`, 'gi')
 
-	// Check if the start line contains the opening tag
 	let actualStartLine = startLine
 	const startLineContent = lines[startLine] || ''
 	if (!openTagPattern.test(startLineContent)) {
-		// Search backwards to find the opening tag
+		// Search backwards for the opening tag.
 		for (let i = startLine - 1; i >= Math.max(0, startLine - 20); i--) {
 			const line = lines[i]
 			if (!line) continue
-
-			// Reset regex lastIndex for fresh test
 			openTagPattern.lastIndex = 0
 			if (openTagPattern.test(line)) {
 				actualStartLine = i
@@ -136,32 +136,27 @@ export function extractCompleteTagSnippet(lines: string[], startLine: number, ta
 	let depth = 0
 	let foundClosing = false
 
-	// Start from the opening tag line
 	for (let i = actualStartLine; i < Math.min(actualStartLine + 30, lines.length); i++) {
-		const line = lines[i]
-
-		if (!line) {
-			continue
-		}
+		const line = lines[i] ?? ''
 
+		// Preserve blank lines verbatim — the snippet must match the file byte-for-byte
+		// so the writer's `content.includes(sourceSnippet)` check passes. Blank lines
+		// are common between frontmatter and the template body.
 		snippetLines.push(line)
+		if (!line) continue
 
-		// Count opening and closing tags
-		// Opening tag can be followed by whitespace, >, or end of line (multi-line tag)
-		const openTags = (line.match(new RegExp(`<${escapedTag}(?:[\\s>]|$)`, 'gi')) || []).length
-		const selfClosing = (line.match(new RegExp(`<${escapedTag}[^>]*/>`, 'gi')) || []).length
-		const closeTags = (line.match(new RegExp(`</${escapedTag}>`, 'gi')) || []).length
+		const openTags = countMatches(line, openTagPattern)
+		const selfClosing = countMatches(line, selfClosingPattern)
+		const closeTags = countMatches(line, closeTagPattern)
 
 		depth += openTags - selfClosing - closeTags
 
-		// If we found a self-closing tag or closed all tags, we're done
 		if (selfClosing > 0 || (depth <= 0 && (closeTags > 0 || openTags > 0))) {
 			foundClosing = true
 			break
 		}
 	}
 
-	// If we didn't find closing tag, just return the first line
 	if (!foundClosing && snippetLines.length > 1) {
 		return snippetLines[0]!
 	}
@@ -169,6 +164,14 @@ export function extractCompleteTagSnippet(lines: string[], startLine: number, ta
 	return snippetLines.join('\n')
 }
 
+/** Count global-regex matches on a string without allocating the match array. */
+function countMatches(str: string, pattern: RegExp): number {
+	pattern.lastIndex = 0
+	let count = 0
+	while (pattern.exec(str) !== null) count++
+	return count
+}
+
 /**
  * Extract just the opening tag from source lines (e.g., `<a href="/foo" class="btn">`)
  * Handles multi-line opening tags.
@@ -199,8 +202,10 @@ export function extractOpeningTagWithLine(
 ): { snippet: string; startLine: number } | undefined {
 	const escapedTag = escapeRegex(tag)
 	const openTagPattern = new RegExp(`<${escapedTag}(?:[\\s>]|$)`, 'gi')
+	// Match `<tag …>` (the closing > of the opening tag), or `<tag … />` (self-closing).
+	const openTagMatcher = new RegExp(`<${escapedTag}[^>]*>`, 'i')
+	const selfClosingMatcher = new RegExp(`<${escapedTag}[^>]*/\\s*>`, 'i')
 
-	// Find the line containing the opening tag
 	let actualStartLine = startLine
 	const startLineContent = lines[startLine] || ''
 	if (!openTagPattern.test(startLineContent)) {
@@ -215,7 +220,6 @@ export function extractOpeningTagWithLine(
 		}
 	}
 
-	// Collect lines until we find the closing > of the opening tag
 	const snippetLines: string[] = []
 	for (let i = actualStartLine; i < Math.min(actualStartLine + 10, lines.length); i++) {
 		const line = lines[i]
@@ -224,15 +228,12 @@ export function extractOpeningTagWithLine(
 		snippetLines.push(line)
 		const combined = snippetLines.join('\n')
 
-		// Check if we have the complete opening tag (found the closing >)
-		// Match from <tag to the first > that's not part of => or />
-		const openTagMatch = combined.match(new RegExp(`<${escapedTag}[^>]*>`, 'i'))
+		const openTagMatch = combined.match(openTagMatcher)
 		if (openTagMatch) {
 			return { snippet: openTagMatch[0], startLine: actualStartLine }
 		}
 
-		// Also check for self-closing tag
-		const selfClosingMatch = combined.match(new RegExp(`<${escapedTag}[^>]*/\\s*>`, 'i'))
+		const selfClosingMatch = combined.match(selfClosingMatcher)
 		if (selfClosingMatch) {
 			return { snippet: selfClosingMatch[0], startLine: actualStartLine }
 		}
@@ -849,28 +850,30 @@ export async function enhanceManifestWithSourceSnippets(
 			}
 		}
 
-		// Missing source info — try the text search index as a last resort.
-		// Two cases reach here without a sourcePath/sourceLine:
-		// (1) text rendered through a translation helper (e.g. `{t(locale, 'key')}`),
-		//     which the marking phase can't trace to the originating i18n JSON;
-		// (2) static template text under runtimes that don't inject
-		//     `data-astro-source-*` attributes. Only (1) needs the translation
-		//     treatment (text edits target the JSON, styling disabled); (2) just
-		//     needs source coordinates so standard snippet extraction below picks
-		//     up the full element.
+		// Two cases want the index over the marking phase:
+		// (1) text rendered via translation helpers / runtimes that don't inject
+		//     `data-astro-source-*` (toast i18n the JSON; rendered template gets coords).
+		// (2) `{fact.value}`-style expressions where Astro points sourceLine at the
+		//     JSX template line — the real edit target is the variable definition.
 		const trimmedEntryText = entry.text?.trim()
-		if (!entry.sourceSnippet && trimmedEntryText && entry.tag && (!entry.sourcePath || !entry.sourceLine)) {
-			const indexHit = findInTextIndex(trimmedEntryText, entry.tag)
-			if (indexHit) {
-				if (isTranslationFilePath(indexHit.file)) {
-					const resolved = await applyTranslationSource(entry, indexHit, entry.attributes, entry.colorClasses)
+		const alreadyResolved = entry.sourceSnippet || entry.variableName
+		if (!alreadyResolved && trimmedEntryText && entry.tag) {
+			const sameFileHit = entry.sourcePath
+				? findVariableHitInFile(trimmedEntryText, entry.tag, entry.sourcePath)
+				: undefined
+			const noCoords = !entry.sourcePath || !entry.sourceLine
+			const winner = sameFileHit ?? (noCoords ? findInTextIndex(trimmedEntryText, entry.tag) : undefined)
+
+			if (winner) {
+				if (isTranslationFilePath(winner.file)) {
+					const resolved = await applyTranslationSource(entry, winner, entry.attributes, entry.colorClasses)
 					return [id, resolved] as const
 				}
 				entry = {
 					...entry,
-					sourcePath: indexHit.file,
-					sourceLine: indexHit.line,
-					...(indexHit.variableName ? { variableName: indexHit.variableName } : {}),
+					sourcePath: winner.file,
+					sourceLine: winner.line,
+					...(winner.variableName ? { variableName: winner.variableName } : {}),
 				}
 			}
 		}

package/src/source-finder/source-lookup.ts

@@ -24,10 +24,13 @@ export async function findSourceLocation(
 ): Promise<SourceLocation | undefined> {
 	// Use index if available (much faster)
 	if (isSearchIndexInitialized()) {
-		return findInTextIndex(textContent, tag)
+		const indexHit = findInTextIndex(textContent, tag)
+		if (indexHit) return indexHit
+		// Fall through to slow search on miss — covers cases the per-file
+		// indexer can't pre-emit, like a child component's `.map()` over a
+		// prop array whose source values live in the parent file.
 	}
 
-	// Fallback to slow search if index not initialized
 	const srcDir = path.join(getProjectRoot(), 'src')
 
 	try {