@nuasite/cms 0.39.1 → 0.39.2

package/dist/editor.js

@@ -381,7 +381,7 @@ function WS(t, e) {
 function KS(t, e) {
   return typeof e == "function" ? e(t) : e;
 }
-const v3 = "0.39.1", k3 = v3, nt = {
+const v3 = "0.39.2", k3 = v3, nt = {
   /** Highlight overlay for hovered elements */
   HIGHLIGHT: 2147483644,
   /** Hover outline for elements/components */

package/package.json

@@ -14,7 +14,7 @@
     "directory": "packages/astro-cms"
   },
   "license": "Apache-2.0",
-  "version": "0.39.1",
+  "version": "0.39.2",
   "module": "src/index.ts",
   "types": "src/index.ts",
   "type": "module",

package/src/build-processor.ts

@@ -382,7 +382,7 @@ async function processFile(
 		// The sourcePath from HTML attributes may point to a shared Image component
 		// rather than the file that actually uses the component with the src value
 		if (entry.imageMetadata?.src) {
-			const preferredLocation = entry.sourcePath
+			const preferredLocation = entry.sourcePath || entry.imageMetadata.srcOccurrence !== undefined
 				? {
 					file: entry.sourcePath,
 					line: entry.sourceLine,

package/src/dev-middleware.ts

@@ -598,7 +598,7 @@ export async function enhanceManifestInBackground(
 		for (const entry of Object.values(enhanced)) {
 			if (entry.sourceSnippet || entry.sourcePath) continue
 			if (entry.imageMetadata?.src) {
-				const preferredLocation = entry.sourcePath
+				const preferredLocation = entry.sourcePath || entry.imageMetadata.srcOccurrence !== undefined
 					? {
 						file: entry.sourcePath,
 						line: entry.sourceLine,

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

@@ -151,7 +151,7 @@ export async function findImageSourceLocation(
 	imageSrc: string,
 	imageSrcSet?: string,
 	pageFiles?: readonly string[],
-	preferredLocation?: { file: string; line?: number; srcOccurrence?: number },
+	preferredLocation?: { file?: string; line?: number; srcOccurrence?: number },
 ): Promise<SourceLocation | undefined> {
 	// Use index if available (much faster)
 	if (isSearchIndexInitialized()) {

package/src/source-finder/search-index.ts

@@ -1436,7 +1436,7 @@ function extractPathname(src: string): string {
 export function findInImageIndex(
 	imageSrc: string,
 	pageFiles?: readonly string[],
-	preferredLocation?: { file: string; line?: number; srcOccurrence?: number },
+	preferredLocation?: { file?: string; line?: number; srcOccurrence?: number },
 ): SourceLocation | undefined {
 	const index = getImageSearchIndex()
 
@@ -1446,7 +1446,7 @@ export function findInImageIndex(
 	const candidates = decoded && decoded !== imageSrc ? [imageSrc, decoded] : [imageSrc]
 	// Astro stamps absolute paths in `data-astro-source-file`; the index uses
 	// project-relative paths. Normalize before comparing.
-	const preferredFile = preferredLocation ? toProjectRelativePath(preferredLocation.file) : undefined
+	const preferredFile = preferredLocation?.file ? toProjectRelativePath(preferredLocation.file) : undefined
 	const preferredLine = preferredLocation?.line
 	const preferredOccurrence = preferredLocation?.srcOccurrence
 
@@ -1454,13 +1454,21 @@ export function findInImageIndex(
 	let occurrenceCounter = 0
 	let occurrenceMatch: SourceLocation | undefined
 	let lineMatch: SourceLocation | undefined
+	const pageSet = pageFiles?.length ? new Set(pageFiles) : undefined
+	// Scope occurrence counting: if preferredFile is set, only that file.
+	// Otherwise fall back to pageFiles. Otherwise count across the whole index.
+	const occurrenceScope = (file: string): boolean => {
+		if (preferredFile) return file === preferredFile
+		if (pageSet) return pageSet.has(file)
+		return true
+	}
 	for (const entry of index) {
 		if (!candidates.includes(entry.src)) continue
-		if (preferredFile && entry.file === preferredFile) {
+		if (occurrenceScope(entry.file)) {
 			if (preferredOccurrence !== undefined && occurrenceCounter++ === preferredOccurrence) {
 				occurrenceMatch ??= imageEntryToLocation(entry)
 			}
-			if (preferredLine !== undefined && entry.line === preferredLine) {
+			if (preferredLine !== undefined && entry.line === preferredLine && (!preferredFile || entry.file === preferredFile)) {
 				lineMatch ??= imageEntryToLocation(entry)
 			}
 		}

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

@@ -751,7 +751,10 @@ export async function enhanceManifestWithSourceSnippets(
 			}
 
 			// ── Non-collection images: find via search index / AST ──
-			const preferredLocation = entry.sourcePath
+			// Always pass preferredLocation when srcOccurrence is set, even if
+			// entry.sourcePath is missing — html-processor populates srcOccurrence
+			// independently of Astro's source attribution.
+			const preferredLocation = entry.sourcePath || entry.imageMetadata.srcOccurrence !== undefined
 				? {
 					file: entry.sourcePath,
 					line: entry.sourceLine,