@nuasite/cms 0.25.0 → 0.26.0

package/package.json

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

package/src/build-processor.ts

@@ -10,7 +10,6 @@ import { extractComponentName, processHtml } from './html-processor'
 import type { ManifestWriter } from './manifest-writer'
 import { generateComponentPreviews } from './preview-generator'
 import {
-	clearCollectionTextIndex,
 	clearSourceFinderCache,
 	extractOpeningTagWithLine,
 	findCollectionSource,
@@ -777,7 +776,6 @@ export async function processBuildOutput(
 
 	// Clear caches from previous builds and initialize search index
 	clearSourceFinderCache()
-	clearCollectionTextIndex()
 
 	const htmlFiles = await findHtmlFiles(outDir)
 

package/src/collection-scanner.ts

@@ -454,12 +454,12 @@ function parseContentConfigReferences(
 	return result
 }
 
-/** Valid field type names exported by `field` helper from @nuasite/cms */
+/** Valid field type names exported by `n` helper from @nuasite/cms */
 const FIELD_HELPER_TYPES = new Set(['image', 'url', 'email', 'color', 'date', 'datetime', 'time', 'textarea'])
 
 /**
  * Parse the content config file to extract explicit field type hints:
- * - `field.image(...)`, `field.url(...)`, etc. from @nuasite/cms
+ * - `n.image()`, `n.url()`, etc. from @nuasite/cms
  * - `z.enum([...])` for select options
  *
  * Returns a map: collectionName → fieldName → { type, options? }
@@ -472,8 +472,8 @@ function parseContentConfigFieldTypes(
 	for (const { collectionName, schemaBody } of schemaBlocks) {
 		const fields = new Map<string, { type: FieldType; options?: string[] }>()
 
-		// Detect field.image(...), field.url(...), etc.
-		const fieldHelpers = schemaBody.matchAll(/(\w+)\s*:\s*field\.(\w+)\s*\(/g)
+		// Detect n.image(), n.url(), etc.
+		const fieldHelpers = schemaBody.matchAll(/(\w+)\s*:\s*n\.(\w+)/g)
 		for (const m of fieldHelpers) {
 			const fieldName = m[1]!
 			const helperName = m[2]!

package/src/dev-middleware.ts

@@ -17,10 +17,10 @@ import { processHtml } from './html-processor'
 import type { ManifestWriter } from './manifest-writer'
 import type { MediaStorageAdapter } from './media/types'
 import {
+	enhanceManifestWithSourceSnippets,
 	findCollectionSource,
 	findImageSourceLocation,
 	findSourceLocation,
-	initializeSearchIndex,
 	parseMarkdownContent,
 	reindexDirtyFiles,
 } from './source-finder'
@@ -424,7 +424,7 @@ async function markHtmlForDev(
  * Phase 2 (background): Resolve source locations, enhance snippets, populate
  * component props, and update the manifest. Runs after the HTML response is sent.
  */
-async function enhanceManifestInBackground(
+export async function enhanceManifestInBackground(
 	pagePath: string,
 	entries: Record<string, ManifestEntry>,
 	components: Record<string, ComponentInstance>,
@@ -541,31 +541,31 @@ async function enhanceManifestInBackground(
 			}
 		}
 
-		// Ensure the search index is initialized
-		await initializeSearchIndex()
+		const enhanced = await enhanceManifestWithSourceSnippets(entries, collectionDefinitions)
 
-		// Re-resolve sources with the search index
-		for (const entry of Object.values(entries)) {
+		// Fallback for entries without sourcePath — search index can still find them
+		for (const entry of Object.values(enhanced)) {
+			if (entry.sourceSnippet || entry.sourcePath) continue
 			if (entry.imageMetadata?.src) {
-				const imageSource = await findImageSourceLocation(entry.imageMetadata.src, entry.imageMetadata.srcSet)
-				if (imageSource) {
-					entry.sourcePath = imageSource.file
-					entry.sourceLine = imageSource.line
-					entry.sourceSnippet = imageSource.snippet
+				const loc = await findImageSourceLocation(entry.imageMetadata.src, entry.imageMetadata.srcSet)
+				if (loc) {
+					entry.sourcePath = loc.file
+					entry.sourceLine = loc.line
+					entry.sourceSnippet = loc.snippet
 				}
 			} else if (entry.text && entry.tag) {
-				const textSource = await findSourceLocation(entry.text, entry.tag)
-				if (textSource) {
-					entry.sourcePath = textSource.file
-					entry.sourceLine = textSource.line
-					entry.sourceSnippet = textSource.snippet
-					if (textSource.variableName) entry.variableName = textSource.variableName
+				const loc = await findSourceLocation(entry.text, entry.tag)
+				if (loc) {
+					entry.sourcePath = loc.file
+					entry.sourceLine = loc.line
+					entry.sourceSnippet = loc.snippet
+					if (loc.variableName) entry.variableName = loc.variableName
 				}
 			}
 		}
 
 		// Update the manifest with fully-resolved entries and component props
-		manifestWriter.addPage(pagePath, entries, components, collection, seo)
+		manifestWriter.addPage(pagePath, enhanced, components, collection, seo)
 	} catch (error) {
 		console.error('[cms] Background enhancement failed:', error)
 	}

package/src/field-types.ts

@@ -1,42 +1,47 @@
+import { z } from 'astro/zod'
+
 /**
- * Semantic field type wrappers for Zod schemas in content collections.
+ * Semantic field type schemas for content collections.
  *
- * These are identity functions — they return exactly what's passed in.
- * The CMS collection scanner detects them by name in the source and
- * renders the appropriate editor input.
+ * Each method returns a `z.string()` schema that Astro resolves
+ * statically (concrete return type, no generics). The CMS collection
+ * scanner detects them by name in the source and renders the
+ * appropriate editor input.
+ *
+ * Chain Zod methods as usual (`.optional()`, `.default()`, etc.).
  *
  * @example
  * ```ts
- * import { field } from '@nuasite/cms'
+ * import { n } from '@nuasite/cms'
  * import { z } from 'astro/zod'
  *
  * const schema = z.object({
- *   photo: field.image(z.string()),
- *   website: field.url(z.string()),
- *   contact: field.email(z.string()),
- *   accent: field.color(z.string()),
- *   publishedAt: field.date(z.string()),
- *   startsAt: field.datetime(z.string()),
- *   opensAt: field.time(z.string()),
- *   bio: field.textarea(z.string()),
+ *   photo: n.image(),
+ *   website: n.url().optional(),
+ *   contact: n.email(),
+ *   accent: n.color(),
+ *   publishedAt: n.date(),
+ *   startsAt: n.datetime(),
+ *   opensAt: n.time(),
+ *   bio: n.textarea(),
  * })
  * ```
  */
-export const field = {
+export const n = {
 	/** Image picker (opens media library) */
-	image: <T>(schema: T): T => schema,
+	image: () => z.string().describe('cms:image'),
 	/** URL input */
-	url: <T>(schema: T): T => schema,
+	url: () => z.string().describe('cms:url'),
 	/** Email input */
-	email: <T>(schema: T): T => schema,
+	email: () => z.string().describe('cms:email'),
 	/** Color picker */
-	color: <T>(schema: T): T => schema,
+	color: () => z.string().describe('cms:color'),
 	/** Date picker */
-	date: <T>(schema: T): T => schema,
+	date: () => z.string().describe('cms:date'),
 	/** Date + time picker */
-	datetime: <T>(schema: T): T => schema,
+	datetime: () => z.string().describe('cms:datetime'),
 	/** Time picker */
-	time: <T>(schema: T): T => schema,
+	time: () => z.string().describe('cms:time'),
 	/** Multiline textarea */
-	textarea: <T>(schema: T): T => schema,
+	textarea: () => z.string().describe('cms:textarea'),
 }

package/src/index.ts

@@ -346,7 +346,7 @@ async function mergeRedirects(dir: URL, logger: { info: (msg: string) => void })
 	logger.info(`Merged ${lineCount} CMS redirect(s) into _redirects`)
 }
 
-export { field } from './field-types'
+export { n } from './field-types'
 export { createContemberStorageAdapter as contemberMedia } from './media/contember'
 export { createLocalStorageAdapter as localMedia } from './media/local'
 export { createS3StorageAdapter as s3Media } from './media/s3'

package/src/source-finder/cache.ts

@@ -1,4 +1,4 @@
-import type { CachedParsedFile, ImageIndexEntry, SearchIndexEntry } from './types'
+import type { CachedParsedFile, ImageIndexEntry, SearchIndexEntry, SourceLocation } from './types'
 
 // ============================================================================
 // File Parsing Cache - Avoid re-parsing the same files
@@ -18,6 +18,9 @@ const textSearchIndex: SearchIndexEntry[] = []
 const imageSearchIndex: ImageIndexEntry[] = []
 let searchIndexInitialized = false
 
+/** Pre-built reverse index: normalizedText → SourceLocation[] (collection data files) */
+let collectionTextIndex: Map<string, SourceLocation[]> | null = null
+
 /** Files that changed since last indexing — tracked by Vite watcher */
 const dirtyFiles = new Set<string>()
 
@@ -61,6 +64,14 @@ export function addToImageSearchIndex(entry: ImageIndexEntry): void {
 	imageSearchIndex.push(entry)
 }
 
+export function getCollectionTextIndex(): Map<string, SourceLocation[]> | null {
+	return collectionTextIndex
+}
+
+export function setCollectionTextIndex(index: Map<string, SourceLocation[]> | null): void {
+	collectionTextIndex = index
+}
+
 // ============================================================================
 // Dirty File Tracking (incremental re-indexing)
 // ============================================================================
@@ -120,4 +131,5 @@ export function clearSourceFinderCache(): void {
 	textSearchIndex.length = 0
 	imageSearchIndex.length = 0
 	searchIndexInitialized = false
+	collectionTextIndex = null
 }

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

@@ -4,7 +4,7 @@ import { isMap, isPair, isScalar, isSeq, LineCounter, parseDocument } from 'yaml
 
 import { getProjectRoot } from '../config'
 import type { CollectionDefinition } from '../types'
-import { getMarkdownFileCache } from './cache'
+import { getCollectionTextIndex, getMarkdownFileCache, setCollectionTextIndex } from './cache'
 import { normalizeText } from './snippet-utils'
 import type { CollectionInfo, MarkdownContent, SourceLocation } from './types'
 
@@ -12,8 +12,6 @@ import type { CollectionInfo, MarkdownContent, SourceLocation } from './types'
 // Collection Text Index — pre-built reverse index for fast text→source lookups
 // ============================================================================
 
-/** Pre-built index: normalizedText → SourceLocation (with collection metadata) */
-let collectionTextIndex: Map<string, SourceLocation[]> | null = null
 let collectionTextIndexPromise: Promise<void> | null = null
 
 /**
@@ -23,7 +21,7 @@ let collectionTextIndexPromise: Promise<void> | null = null
 export async function buildCollectionTextIndex(
 	collections: Record<string, CollectionDefinition>,
 ): Promise<void> {
-	if (collectionTextIndex) return
+	if (getCollectionTextIndex()) return
 	if (collectionTextIndexPromise) return collectionTextIndexPromise
 	collectionTextIndexPromise = doBuildCollectionTextIndex(collections)
 	try {
@@ -76,7 +74,7 @@ async function doBuildCollectionTextIndex(
 		}))
 	}
 
-	collectionTextIndex = index
+	setCollectionTextIndex(index)
 }
 
 /**
@@ -168,9 +166,10 @@ export function lookupCollectionText(
 	textContent: string,
 	referenceIndex?: Map<string, Array<{ collection: string; fieldName: string; isArray?: boolean }>>,
 ): SourceLocation | undefined {
-	if (!collectionTextIndex) return undefined
+	const index = getCollectionTextIndex()
+	if (!index) return undefined
 	const normalized = normalizeText(textContent)
-	const locations = collectionTextIndex.get(normalized)
+	const locations = index.get(normalized)
 	if (!locations || locations.length === 0) return undefined
 
 	// Prefer locations from referenced collections
@@ -184,11 +183,6 @@ export function lookupCollectionText(
 	return locations[0]
 }
 
-/** Clear the collection text index (called when collection files change) */
-export function clearCollectionTextIndex(): void {
-	collectionTextIndex = null
-}
-
 // ============================================================================
 // Markdown File Cache
 // ============================================================================

package/src/source-finder/index.ts

@@ -25,7 +25,6 @@ export { findImageSourceLocation } from './image-finder'
 // Collection/markdown finding
 export {
 	buildCollectionTextIndex,
-	clearCollectionTextIndex,
 	findCollectionSource,
 	findFieldInCollectionEntry,
 	findMarkdownSourceLocation,

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

@@ -17,9 +17,9 @@ import {
 	getTextSearchIndex,
 	isSearchIndexInitialized,
 	removeFileFromIndexes,
+	setCollectionTextIndex,
 	setSearchIndexInitialized,
 } from './cache'
-import { clearCollectionTextIndex } from './collection-finder'
 import { extractImageSnippet, extractInnerHtmlFromSnippet, normalizeText } from './snippet-utils'
 import type { CachedParsedFile, SearchIndexEntry, SourceLocation } from './types'
 
@@ -167,7 +167,7 @@ async function doReindexDirtyFiles(): Promise<void> {
 	// Also clear the markdown file cache and collection text index
 	// so collection content is re-read and re-indexed from disk
 	getMarkdownFileCache().clear()
-	clearCollectionTextIndex()
+	setCollectionTextIndex(null)
 
 	for (const absPath of filesToReindex) {
 		const relFile = path.relative(projectRoot, absPath)