@nuasite/cms 0.5.0 → 0.6.0

package/src/handlers/array-ops.ts

@@ -142,6 +142,108 @@ function extractElementBounds(
 	return bounds
 }
 
+/**
+ * Extract property values from a specific array element in the frontmatter.
+ *
+ * Parses the frontmatter code with Babel, finds the array variable declaration,
+ * and returns the property values from the element at the given index.
+ * Used to resolve spread props for array-rendered components (e.g. `{...item}`).
+ */
+export function extractArrayElementProps(
+	frontmatterContent: string,
+	arrayVarName: string,
+	elementIndex: number,
+): Record<string, any> | null {
+	let ast: ReturnType<typeof parseBabel>
+	try {
+		ast = parseBabel(frontmatterContent, {
+			sourceType: 'module',
+			plugins: ['typescript'],
+			errorRecovery: true,
+		})
+	} catch {
+		return null
+	}
+
+	for (const node of ast.program.body) {
+		const arrayExpr = findArrayExpression(node, arrayVarName)
+		if (arrayExpr && elementIndex < arrayExpr.elements.length) {
+			const element = arrayExpr.elements[elementIndex]
+			if (element?.type === 'ObjectExpression') {
+				return extractObjectValues(element, frontmatterContent)
+			}
+		}
+	}
+
+	return null
+}
+
+function findArrayExpression(node: any, varName: string): any | null {
+	if (node.type === 'VariableDeclaration') {
+		for (const decl of node.declarations) {
+			if (
+				decl.id.type === 'Identifier'
+				&& decl.id.name === varName
+				&& decl.init?.type === 'ArrayExpression'
+			) {
+				return decl.init
+			}
+		}
+	}
+	if (node.type === 'ExportNamedDeclaration' && node.declaration?.type === 'VariableDeclaration') {
+		for (const decl of node.declaration.declarations) {
+			if (
+				decl.id.type === 'Identifier'
+				&& decl.id.name === varName
+				&& decl.init?.type === 'ArrayExpression'
+			) {
+				return decl.init
+			}
+		}
+	}
+	return null
+}
+
+function extractObjectValues(node: any, source: string): Record<string, any> {
+	const props: Record<string, any> = {}
+	for (const prop of node.properties) {
+		if (prop.type !== 'ObjectProperty') continue
+		const key = prop.key.type === 'Identifier' ? prop.key.name : prop.key.value
+		if (!key) continue
+		props[key] = extractAstValue(prop.value, source)
+	}
+	return props
+}
+
+function extractAstValue(node: any, source: string): any {
+	switch (node.type) {
+		case 'StringLiteral':
+			return node.value
+		case 'NumericLiteral':
+			return node.value
+		case 'BooleanLiteral':
+			return node.value
+		case 'NullLiteral':
+			return null
+		case 'TemplateLiteral':
+			if (node.expressions.length === 0 && node.quasis.length === 1) {
+				return node.quasis[0].value.cooked
+			}
+			return source.slice(node.start, node.end)
+		case 'ArrayExpression':
+			return node.elements.map((el: any) => el ? extractAstValue(el, source) : null)
+		case 'ObjectExpression':
+			return extractObjectValues(node, source)
+		case 'UnaryExpression':
+			if (node.operator === '-' && node.argument.type === 'NumericLiteral') {
+				return -node.argument.value
+			}
+			return source.slice(node.start, node.end)
+		default:
+			return source.slice(node.start, node.end)
+	}
+}
+
 /**
  * Resolve the file, lines, invocation index, and array info for a component.
  */

package/src/index.ts

@@ -93,7 +93,7 @@ export default function nuaCms(options: NuaCmsOptions = {}): AstroIntegration {
 	}
 
 	return {
-		name: '@nuasite/astro-cms',
+		name: '@nuasite/cms',
 		hooks: {
 			'astro:config:setup': async ({ updateConfig, command, injectScript, logger }) => {
 				// --- CMS Marker setup ---

package/src/source-finder/cross-file-tracker.ts

@@ -158,6 +158,28 @@ async function searchDirForExpressionProp(
 					// we look for cardProps.title in the definitions
 					const spreadPropPath = `${spreadVarName}.${propName}`
 
+					// When spread is inside a .map() call, search for array element definitions
+					// e.g., packages.map(pkg => <Card {...pkg} />) -> look for packages[N].propName
+					if (spreadMatch.mapSourceArray) {
+						const mapSourceArray = spreadMatch.mapSourceArray
+						for (const def of cached.variableDefinitions) {
+							if (
+								def.name === propName
+								&& def.parentName?.startsWith(mapSourceArray + '[')
+								&& normalizeText(def.value) === normalizedSearch
+							) {
+								return {
+									file: path.relative(getProjectRoot(), fullPath),
+									line: def.line,
+									snippet: cached.lines[def.line - 1] || '',
+									type: 'variable',
+									variableName: buildDefinitionPath(def),
+									definitionLine: def.line,
+								}
+							}
+						}
+					}
+
 					for (const def of cached.variableDefinitions) {
 						const defPath = buildDefinitionPath(def)
 						if (defPath === spreadPropPath) {
@@ -671,6 +693,26 @@ async function searchDirForAttributeProp(
 				// Try spread prop usage
 				const spreadMatch = findSpreadProp(cached.ast, componentName)
 				if (spreadMatch) {
+					// When spread is inside a .map() call, search for array element definitions
+					if (spreadMatch.mapSourceArray) {
+						const mapSourceArray = spreadMatch.mapSourceArray
+						for (const def of cached.variableDefinitions) {
+							if (
+								def.name === propName
+								&& def.parentName?.startsWith(mapSourceArray + '[')
+							) {
+								return {
+									file: path.relative(getProjectRoot(), fullPath),
+									line: def.line,
+									snippet: cached.lines[def.line - 1] || '',
+									type: 'variable',
+									variableName: buildDefinitionPath(def),
+									definitionLine: def.line,
+								}
+							}
+						}
+					}
+
 					const spreadPropPath = `${spreadMatch.spreadVarName}.${propName}`
 					for (const def of cached.variableDefinitions) {
 						const defPath = buildDefinitionPath(def)

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

@@ -353,7 +353,7 @@ export function findSpreadProp(
 	ast: AstroNode,
 	componentName: string,
 ): SpreadPropMatch | null {
-	function visit(node: AstroNode): SpreadPropMatch | null {
+	function visit(node: AstroNode, parentExpression: AstroNode | null): SpreadPropMatch | null {
 		// Check component nodes matching the name
 		if (node.type === 'component') {
 			const compNode = node as ComponentNode
@@ -362,20 +362,34 @@ export function findSpreadProp(
 					// Check for spread attributes: {...cardProps}
 					// In Astro AST: type='attribute', kind='spread', name=variable name
 					if (attr.type === 'attribute' && attr.kind === 'spread' && attr.name) {
-						return {
+						const match: SpreadPropMatch = {
 							componentName,
 							spreadVarName: attr.name,
 							line: attr.position?.start.line ?? compNode.position?.start.line ?? 0,
 						}
+
+						// Check if this spread is inside a .map() call by examining parent expression
+						if (parentExpression) {
+							const exprText = getTextContent(parentExpression)
+							const mapMatch = exprText.match(/(\w+(?:\.\w+)*)\.map\s*\(\s*\(?(\w+)\)?\s*=>/)
+							if (mapMatch && mapMatch[2] === attr.name) {
+								match.mapSourceArray = mapMatch[1]
+							}
+						}
+
+						return match
 					}
 				}
 			}
 		}
 
+		// Track the nearest ancestor expression node
+		const nextParentExpression = node.type === 'expression' ? node : parentExpression
+
 		// Recursively visit children
 		if ('children' in node && Array.isArray(node.children)) {
 			for (const child of node.children) {
-				const result = visit(child)
+				const result = visit(child, nextParentExpression)
 				if (result) return result
 			}
 		}
@@ -383,5 +397,5 @@ export function findSpreadProp(
 		return null
 	}
 
-	return visit(ast)
+	return visit(ast, null)
 }

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

@@ -6,7 +6,7 @@ import type { Attribute, ManifestEntry } from '../types'
 import { escapeRegex, generateSourceHash } from '../utils'
 import { buildDefinitionPath } from './ast-extractors'
 import { getCachedParsedFile } from './ast-parser'
-import { findAttributeSourceLocation } from './cross-file-tracker'
+import { findAttributeSourceLocation, searchForExpressionProp, searchForPropInParents } from './cross-file-tracker'
 import { findImageElementNearLine, findImageSourceLocation } from './image-finder'
 
 // ============================================================================
@@ -640,6 +640,67 @@ export async function enhanceManifestWithSourceSnippets(
 							sourceHash,
 						}] as const
 					}
+
+					// Cross-file search for prop-driven dynamic text
+					// When text comes from a prop (e.g., {title} where title = Astro.props.title),
+					// trace it to where the prop value is actually defined in a parent component
+					if (cached) {
+						// Extract expression variables from the snippet to find props
+						const exprPattern = /\{(\w+(?:\.\w+|\[\d+\])*)\}/g
+						let exprMatch: RegExpExecArray | null
+						while ((exprMatch = exprPattern.exec(sourceSnippet)) !== null) {
+							const exprPath = exprMatch[1]!
+							const baseVar = exprPath.match(/^(\w+)/)?.[1]
+							if (baseVar && cached.propAliases.has(baseVar)) {
+								const propName = cached.propAliases.get(baseVar)!
+								const componentFileName = path.basename(filePath)
+								const result = await searchForExpressionProp(
+									componentFileName, propName, exprPath, entry.text!,
+								)
+								if (result) {
+									const propSnippet = result.snippet ?? trimmedText
+									const propSourceHash = generateSourceHash(propSnippet)
+									return [id, {
+										...entry,
+										sourcePath: result.file,
+										sourceLine: result.line,
+										sourceSnippet: propSnippet,
+										variableName: result.variableName,
+										attributes,
+										colorClasses,
+										sourceHash: propSourceHash,
+									}] as const
+								}
+							}
+						}
+
+						// Search for quoted prop values in parent components
+						// (handles <Component title="literal text" />)
+						const srcDir = path.join(getProjectRoot(), 'src')
+						for (const searchDir of ['pages', 'components', 'layouts']) {
+							try {
+								const result = await searchForPropInParents(
+									path.join(srcDir, searchDir), trimmedText,
+								)
+								if (result) {
+									const parentSnippet = result.snippet ?? trimmedText
+									const propSourceHash = generateSourceHash(parentSnippet)
+									return [id, {
+										...entry,
+										sourcePath: result.file,
+										sourceLine: result.line,
+										sourceSnippet: parentSnippet,
+										variableName: result.variableName,
+										attributes,
+										colorClasses,
+										sourceHash: propSourceHash,
+									}] as const
+								}
+							} catch {
+								// Directory doesn't exist
+							}
+						}
+					}
 				}
 
 				// Original static content path

package/src/source-finder/types.ts

@@ -184,6 +184,9 @@ export interface SpreadPropMatch {
 	/** The variable name being spread (e.g., 'cardProps' from {...cardProps}) */
 	spreadVarName: string
 	line: number
+	/** Source array name when spread is inside a .map() call
+	 *  e.g., 'packages' from packages.map((pkg) => <Card {...pkg} />) */
+	mapSourceArray?: string
 }
 
 export interface ImageMatch {

package/src/source-finder/variable-extraction.ts

@@ -300,8 +300,8 @@ export async function resolveImportPath(source: string, fromFile: string): Promi
 	for (const ext of extensions) {
 		const fullPath = basePath + ext
 		try {
-			await fs.access(fullPath)
-			return fullPath
+			const stat = await fs.stat(fullPath)
+			if (stat.isFile()) return fullPath
 		} catch {
 			// File doesn't exist with this extension
 		}