@nuasite/cms 0.46.3 → 0.46.4

package/dist/editor.js

@@ -386,7 +386,7 @@ function IC(t, e) {
 function _C(t, e) {
   return typeof e == "function" ? e(t) : e;
 }
-const u5 = "0.46.3", h5 = u5, ct = {
+const u5 = "0.46.4", h5 = u5, ct = {
   /** 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.46.3",
+  "version": "0.46.4",
   "module": "src/index.ts",
   "types": "src/index.ts",
   "type": "module",
@@ -26,8 +26,8 @@
     }
   },
   "dependencies": {
-    "@nuasite/cms-core": "0.46.3",
-    "@nuasite/cms-types": "0.46.3",
+    "@nuasite/cms-core": "0.46.4",
+    "@nuasite/cms-types": "0.46.4",
     "@astrojs/compiler": "^3.0.1",
     "@babel/parser": "^7.29.2",
     "node-html-parser": "^7.1.0",
@@ -35,8 +35,8 @@
     "yaml": "^2.8.3"
   },
   "devDependencies": {
-    "@nuasite/cms-sidecar": "0.46.3",
-    "@nuasite/collections-admin": "0.46.3",
+    "@nuasite/cms-sidecar": "0.46.4",
+    "@nuasite/collections-admin": "0.46.4",
     "@babel/types": "^7.29.0",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
@@ -76,8 +76,8 @@
     "typescript": "^6.0.2",
     "vite": "^7.0.0",
     "@aws-sdk/client-s3": "^3.0.0",
-    "@nuasite/cms-sidecar": "0.46.3",
-    "@nuasite/collections-admin": "0.46.3",
+    "@nuasite/cms-sidecar": "0.46.4",
+    "@nuasite/collections-admin": "0.46.4",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },

package/src/source-finder/cache.ts

@@ -1,3 +1,4 @@
+import path from 'node:path'
 import type { CachedParsedFile, ImageIndexEntry, SearchIndexEntry, SourceLocation } from './types'
 
 // ============================================================================
@@ -113,10 +114,16 @@ export function markFileDirty(absPath: string): void {
 	dirtyFiles.add(absPath)
 	// Also evict the parsed file cache so it's re-read from disk
 	parsedFileCache.delete(absPath)
-	// A changed file may add/remove/alter a declared URL anywhere in its
-	// collection directory — cheaper to drop the whole cache than track
-	// per-directory membership for a rarely-hit index.
-	declaredUrlIndexCache.clear()
+	// A changed file may add/remove/alter its declared URL, so drop the URL→file
+	// index for its collection directory. The index is keyed by collection dir:
+	// for a flat `<dir>/<slug>.md` that's the file's directory; for Hugo-style
+	// `<dir>/<slug>/index.md` it's the parent of the file's directory. Evict both
+	// candidates (deleting a non-existent key is a no-op) instead of clearing the
+	// whole cache, which would rebuild every collection's index on the next
+	// unmatched-page lookup.
+	const fileDir = path.dirname(absPath)
+	declaredUrlIndexCache.delete(fileDir)
+	declaredUrlIndexCache.delete(path.dirname(fileDir))
 }
 
 export function getDirtyFiles(): Set<string> {

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

@@ -300,7 +300,7 @@ export async function findCollectionSource(
 		// Prefer the entry whose declared canonical URL equals the requested
 		// path. Only kicks in when an entry actually declares a URL, so
 		// URL-less projects fall through to the filename logic unchanged.
-		const byUrl = await resolveByDeclaredUrl(matches, requestedUrl, contentPath)
+		const byUrl = await resolveByDeclaredUrl(matches, requestedUrl, contentPath, pathParts[0])
 		if (byUrl) {
 			// byUrl.file may differ from the file the filename match found
 			// (that's the whole point of this fallback) — its slug must be
@@ -331,6 +331,29 @@ export async function findCollectionSource(
 		}
 	}
 
+	// No filename-based candidate matched any tail slug. The source file may be
+	// named unlike its URL entirely — e.g. people entries stored as
+	// `<role>__<slug>.md` but served at `/<family>/<slug>`, so no tail segment
+	// ever hits a `<slug>.md` file. Fall back to resolving by declared canonical
+	// URL across every collection.
+	//
+	// Guarded to multi-segment paths: the tail-slug loop above only ran for
+	// `pathParts.length >= 2`, so single-segment paths (bare static pages like
+	// `/about`) were never treated as collection pages. Keeping that boundary
+	// avoids both a full declared-URL scan on every such page and the risk of
+	// mis-attributing a static page to a collection entry that happens to
+	// declare the same URL.
+	if (pathParts.length >= 2) {
+		const byDeclaredUrl = await findByDeclaredUrlAcross(collectionDirs, contentPath, requestedUrl, pathParts[0])
+		if (byDeclaredUrl) {
+			return {
+				name: byDeclaredUrl.name,
+				slug: slugFromFilePath(byDeclaredUrl.file),
+				file: path.relative(getProjectRoot(), byDeclaredUrl.file),
+			}
+		}
+	}
+
 	return undefined
 }
 
@@ -428,6 +451,7 @@ async function resolveByDeclaredUrl(
 	matches: { name: string; file: string }[],
 	requestedUrl: string,
 	contentPath: string,
+	urlPrefix: string | undefined,
 ): Promise<{ name: string; file: string } | undefined> {
 	let sawDeclaredUrl = false
 	for (const m of matches) {
@@ -441,13 +465,30 @@ async function resolveByDeclaredUrl(
 
 	// Contradiction: the right entry is named differently from its slug. Scan
 	// the collection(s) that produced filename matches for a declared-URL hit.
-	// `matches` (and thus this Set) is built by iterating the sorted
-	// `collectionDirs`, so directory order here is deterministic.
-	for (const dir of new Set(matches.map(m => m.name))) {
+	return findByDeclaredUrlAcross([...new Set(matches.map(m => m.name))], contentPath, requestedUrl, urlPrefix)
+}
+
+/**
+ * Resolve `requestedUrl` to a source file by its declared canonical URL across
+ * the given collection directories, using the cached per-directory URL→file
+ * index. When more than one collection declares the same URL, a directory whose
+ * name equals the URL's first path segment wins; otherwise the sorted-first
+ * match is returned so the result is deterministic regardless of readdir order.
+ */
+async function findByDeclaredUrlAcross(
+	dirs: string[],
+	contentPath: string,
+	requestedUrl: string,
+	urlPrefix: string | undefined,
+): Promise<{ name: string; file: string } | undefined> {
+	let firstHit: { name: string; file: string } | undefined
+	for (const dir of [...dirs].sort()) {
 		const hit = await findFileByDeclaredUrl(path.join(contentPath, dir), requestedUrl)
-		if (hit) return { name: dir, file: hit }
+		if (!hit) continue
+		if (dir === urlPrefix) return { name: dir, file: hit }
+		firstHit ??= { name: dir, file: hit }
 	}
-	return undefined
+	return firstHit
 }
 
 /**