@nuasite/cms-marker 0.0.46 → 0.0.48

package/package.json

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

package/src/astro-transform.ts

@@ -5,6 +5,7 @@ import type { Plugin } from 'vite'
 
 export interface AstroTransformOptions {
 	markComponents?: boolean
+	enabled?: boolean
 }
 
 /**
@@ -15,16 +16,27 @@ export interface AstroTransformOptions {
  * NOTE: Component marking is NOT done here because modifying component tags
  * in the raw .astro source breaks Astro's JSX-like parser. Component marking
  * is done at the HTML output level instead (in dev-middleware and build-processor).
+ *
+ * IMPORTANT: This plugin should only run in dev mode. During build, modifying
+ * .astro source files can cause Vite's build-import-analysis to fail with
+ * parsing errors. In build mode, source locations are extracted from Astro's
+ * compiler output in build-processor.ts instead.
  */
 export function createAstroTransformPlugin(options: AstroTransformOptions = {}): Plugin {
 	// Component marking is intentionally disabled at the transform level
 	// const { markComponents = true } = options;
+	const { enabled = true } = options
 
 	return {
 		name: 'astro-cms-source-injector',
 		enforce: 'pre', // Run before Astro's own transforms
 
 		async transform(code: string, id: string) {
+			// Skip transformation if disabled (e.g., during build mode)
+			if (!enabled) {
+				return null
+			}
+
 			if (!id.endsWith('.astro')) {
 				return null
 			}

package/src/build-processor.ts

@@ -4,6 +4,7 @@ import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { processHtml } from './html-processor'
 import type { ManifestWriter } from './manifest-writer'
+import { findSourceLocation } from './source-finder'
 import type { CmsMarkerOptions } from './types'
 
 // Concurrency limit for parallel processing
@@ -66,8 +67,23 @@ async function processFile(
 		idGenerator,
 	)
 
-	// Note: Source locations are now extracted from Astro's compiler attributes
-	// in html-processor.ts, so we don't need the expensive findSourceLocation calls
+	// During build, source location attributes are not injected by astro-transform.ts
+	// (disabled to avoid Vite parse errors). Use findSourceLocation to look up source files.
+	for (const entry of Object.values(result.entries)) {
+		// Skip entries that already have source info from component detection
+		if (entry.sourcePath && !entry.sourcePath.endsWith('.html')) {
+			continue
+		}
+
+		const sourceLocation = await findSourceLocation(entry.text, entry.tag)
+		if (sourceLocation) {
+			entry.sourcePath = sourceLocation.file
+			entry.sourceLine = sourceLocation.line
+			entry.sourceSnippet = sourceLocation.snippet
+			entry.sourceType = sourceLocation.type
+			entry.variableName = sourceLocation.variableName
+		}
+	}
 
 	// Add to manifest writer (handles per-page manifest writes)
 	manifestWriter.addPage(pagePath, result.entries, result.components)

package/src/component-registry.ts

@@ -94,7 +94,7 @@ export class ComponentRegistry {
 
 		while (i < content.length) {
 			// Skip whitespace and newlines
-			while (i < content.length && /\s/.test(content[i])) i++
+			while (i < content.length && /\s/.test(content[i] ?? '')) i++
 			if (i >= content.length) break
 
 			// Skip comments
@@ -113,27 +113,27 @@ export class ComponentRegistry {
 
 			// Extract property name
 			const nameStart = i
-			while (i < content.length && /\w/.test(content[i])) i++
+			while (i < content.length && /\w/.test(content[i] ?? '')) i++
 			const name = content.substring(nameStart, i)
 
 			if (!name) break
 
 			// Skip whitespace
-			while (i < content.length && /\s/.test(content[i])) i++
+			while (i < content.length && /\s/.test(content[i] ?? '')) i++
 
 			// Check for optional marker
 			const optional = content[i] === '?'
 			if (optional) i++
 
 			// Skip whitespace
-			while (i < content.length && /\s/.test(content[i])) i++
+			while (i < content.length && /\s/.test(content[i] ?? '')) i++
 
 			// Expect colon
 			if (content[i] !== ':') break
 			i++
 
 			// Skip whitespace
-			while (i < content.length && /\s/.test(content[i])) i++
+			while (i < content.length && /\s/.test(content[i] ?? '')) i++
 
 			// Extract type (up to semicolon, handling nested braces)
 			const typeStart = i
@@ -154,7 +154,7 @@ export class ComponentRegistry {
 			if (content[i] === ';') i++
 
 			// Skip whitespace
-			while (i < content.length && /[ \t]/.test(content[i])) i++
+			while (i < content.length && /[ \t]/.test(content[i] ?? '')) i++
 
 			// Check for inline comment
 			let description: string | undefined
@@ -215,7 +215,7 @@ export class ComponentRegistry {
 
 		// Find the frontmatter section
 		const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/)
-		if (!frontmatterMatch) return props
+		if (!frontmatterMatch?.[1]) return props
 
 		const frontmatter = frontmatterMatch[1]
 

package/src/index.ts

@@ -64,6 +64,7 @@ export default function cmsMarker(options: CmsMarkerOptions = {}): AstroIntegrat
 					componentDefinitions,
 					config,
 					idCounter,
+					command,
 				}
 
 				updateConfig({

package/src/vite-plugin.ts

@@ -8,10 +8,11 @@ export interface VitePluginContext {
 	componentDefinitions: Record<string, ComponentDefinition>
 	config: Required<CmsMarkerOptions>
 	idCounter: { value: number }
+	command: 'dev' | 'build' | 'preview' | 'sync'
 }
 
 export function createVitePlugin(context: VitePluginContext): Plugin[] {
-	const { manifestWriter, componentDefinitions, config } = context
+	const { manifestWriter, componentDefinitions, config, command } = context
 
 	const virtualManifestPlugin: Plugin = {
 		name: 'cms-marker-virtual-manifest',
@@ -34,8 +35,11 @@ export function createVitePlugin(context: VitePluginContext): Plugin[] {
 	}
 
 	// Create the Astro transform plugin to inject source location attributes
+	// Only enabled in dev mode - during build, source locations are handled
+	// in build-processor.ts after HTML is generated
 	const astroTransformPlugin = createAstroTransformPlugin({
 		markComponents: config.markComponents,
+		enabled: command === 'dev',
 	})
 
 	// Note: We cannot use transformIndexHtml for static Astro builds because