bimba-cli 0.7.21 → 0.7.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bimba-cli",
-  "version": "0.7.21",
+  "version": "0.7.23",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/HeapVoid/bimba.git"

package/serve.js

@@ -265,7 +265,7 @@ const hmrClient = `
 
 // ─── Server-side compile cache ────────────────────────────────────────────────
 
-const _compileCache = new Map()  // filepath → { mtime, result }
+const _compileCache = new Map()  // filepath → { stamp, result }
 const _prevJs = new Map()  // filepath → compiled js — for change detection
 const _prevSlots = new Map()  // filepath → previous symbol slot count
 const _importScanner = new Bun.Transpiler({ loader: 'js' })
@@ -367,7 +367,7 @@ async function compileFile(filepath) {
 	const abs = path.resolve(filepath)
 	if (!existsSync(abs)) return missingCompileResult(abs)
 
-	const file = Bun.file(filepath)
+	const file = Bun.file(abs)
 	let stat
 	try {
 		stat = await file.stat()
@@ -375,10 +375,10 @@ async function compileFile(filepath) {
 		if (isMissingFileError(error)) return missingCompileResult(abs)
 		throw error
 	}
-	const mtime = stat.mtime.getTime()
+	const stamp = `${stat.mtimeMs ?? stat.mtime?.getTime?.() ?? 0}:${stat.size ?? 0}`
 
 	const cached = _compileCache.get(abs)
-	if (cached && cached.mtime === mtime) return _normalizeResult(cached.result, { changeType: 'cached' })
+	if (cached && cached.stamp === stamp) return _normalizeResult(cached.result, { changeType: 'cached' })
 
 	let code
 	try {
@@ -406,7 +406,7 @@ async function compileFile(filepath) {
 	const baked = { js: result.js, errors, slots: result.slots }
 	const changeType = _prevJs.get(abs) === baked.js ? 'none' : 'full'
 	_prevJs.set(abs, baked.js)
-	_compileCache.set(abs, { mtime, result: baked })
+	_compileCache.set(abs, { stamp, result: baked })
 	return _normalizeResult(baked, { changeType })
 }
 
@@ -652,6 +652,9 @@ export function serve(entrypoint, flags) {
 		return value
 	}
 
+	const srcRoot = path.resolve(srcDir)
+	const srcRel = normalizeFile(srcRoot)
+
 	function errorMessage(error) {
 		return error?.message || String(error)
 	}
@@ -731,42 +734,71 @@ export function serve(entrypoint, flags) {
 		clearStatus(key)
 		broadcast({ type: 'clear-error', file: key })
 
+		let showedNext = false
 		if (wasStatusFile && _activeErrors.size) {
 			const [nextFile, nextItem] = Array.from(_activeErrors.entries()).at(-1)
 			showTrackedError(nextFile, nextItem)
+			showedNext = true
 		}
+
+		return { cleared: hadError || wasStatusFile, file: key, showedNext }
+	}
+
+	function markSuccess(file) {
+		const key = normalizeFile(file)
+		const result = clearError(key)
+		const shouldPrint = result?.cleared && !result.showedNext
+		if (shouldPrint) printStatus(key, 'ok')
+		return { cleared: !!result?.cleared, printed: !!shouldPrint, showedNext: !!result?.showedNext }
 	}
 
 	const _debounce = new Map()
 	const _watchVersion = new Map()
 
-	function scheduleCompile(filename) {
+	function watchedFile(filename) {
 		filename = filename && String(filename)
-		if (!filename || !filename.endsWith('.imba')) return
+		if (!filename) return null
+
+		let filepath
+		if (path.isAbsolute(filename)) {
+			filepath = path.resolve(filename)
+		} else {
+			const rel = normalizeFile(filename)
+			filepath = (rel === srcRel || rel.startsWith(srcRel + '/'))
+				? path.resolve(filename)
+				: path.resolve(srcRoot, filename)
+		}
+
+		const rel = normalizeFile(filepath)
+		return { filepath, rel }
+	}
+
+	function scheduleCompile(filename) {
+		const file = watchedFile(filename)
+		if (!file || !file.rel.endsWith('.imba')) return
 
-		const version = (_watchVersion.get(filename) || 0) + 1
-		_watchVersion.set(filename, version)
+		const version = (_watchVersion.get(file.rel) || 0) + 1
+		_watchVersion.set(file.rel, version)
 
-		const pending = _debounce.get(filename)
+		const pending = _debounce.get(file.rel)
 		if (pending) clearTimeout(pending)
 
-		_debounce.set(filename, setTimeout(() => {
-			_debounce.delete(filename)
-			compileChangedFile(filename, version)
+		_debounce.set(file.rel, setTimeout(() => {
+			_debounce.delete(file.rel)
+			compileChangedFile(file, version)
 		}, 150))
 	}
 
-	function isCurrentChange(filename, version) {
-		return _watchVersion.get(filename) === version
+	function isCurrentChange(file, version) {
+		return _watchVersion.get(file.rel) === version
 	}
 
-	async function compileChangedFile(filename, version) {
-		const filepath = path.join(srcDir, filename)
-		const rel = normalizeFile(path.join(path.relative('.', srcDir), filename))
+	async function compileChangedFile(file, version) {
+		const { filepath, rel } = file
 
 		try {
 			if (!existsSync(filepath)) {
-				if (!isCurrentChange(filename, version)) return
+				if (!isCurrentChange(file, version)) return
 				dropFileState(filepath)
 				clearError(rel)
 				return
@@ -774,7 +806,7 @@ export function serve(entrypoint, flags) {
 
 			const out = await compileFile(filepath)
 
-			if (!isCurrentChange(filename, version)) return
+			if (!isCurrentChange(file, version)) return
 			if (out.missing) {
 				clearError(rel)
 				return
@@ -785,15 +817,15 @@ export function serve(entrypoint, flags) {
 				return
 			}
 
-			clearError(rel)
+			const success = markSuccess(rel)
 
 			// No change at all — skip
 			if (out.changeType === 'none' || out.changeType === 'cached') return
 
-			printStatus(rel, 'ok')
+			if (!success.printed && !success.showedNext) printStatus(rel, 'ok')
 			broadcast({ type: 'update', file: rel, slots: out.slots || 'shifted' })
 		} catch(e) {
-			if (!isCurrentChange(filename, version)) return
+			if (!isCurrentChange(file, version)) return
 			if (isMissingFileError(e)) {
 				dropFileState(filepath)
 				clearError(rel)
@@ -828,7 +860,7 @@ export function serve(entrypoint, flags) {
 				const file = 'vendor:' + (specifier || pathname)
 				const bundled = specifier ? await bundleVendor(specifier) : null
 				if (bundled?.code) {
-					clearError(file)
+					markSuccess(file)
 					return new Response(bundled.code, { headers: { 'Content-Type': 'application/javascript' } })
 				}
 
@@ -841,7 +873,7 @@ export function serve(entrypoint, flags) {
 				const file = 'html:' + normalizeFile(htmlFile)
 				try {
 					let html = await Bun.file(htmlFile).text()
-					clearError(file)
+					markSuccess(file)
 					return new Response(transformHtml(html, entrypoint), {
 						headers: { 'Content-Type': 'text/html' },
 					})
@@ -867,7 +899,7 @@ export function serve(entrypoint, flags) {
 					if (out.errors?.length) {
 						return errorResponse(file, out.errors)
 					}
-					clearError(file)
+					markSuccess(file)
 					return new Response(out.js, { headers: { 'Content-Type': 'application/javascript' } })
 				} catch(e) {
 					if (isMissingFileError(e)) {
@@ -889,7 +921,7 @@ export function serve(entrypoint, flags) {
 				try {
 					if (cssFile && await cssFile.exists()) {
 						if (req.headers.get('sec-fetch-dest') === 'style') {
-							clearError(file)
+							markSuccess(file)
 							return new Response(cssFile, { headers: { 'Content-Type': 'text/css' } })
 						}
 
@@ -901,7 +933,7 @@ export function serve(entrypoint, flags) {
 							`if (!el) { el = document.createElement('style'); el.setAttribute('data-bimba-css', id); document.head.appendChild(el); }`,
 							`el.textContent = ${JSON.stringify(css)};`,
 						].join('\n')
-						clearError(file)
+						markSuccess(file)
 						return new Response(js, { headers: { 'Content-Type': 'application/javascript' } })
 					}
 				} catch (error) {
@@ -919,7 +951,7 @@ export function serve(entrypoint, flags) {
 					const file = 'js:' + normalizeFile(jsFile)
 					try {
 						const response = await serveJavaScriptFile(jsFile)
-						clearError(file)
+						markSuccess(file)
 						return response
 					} catch (error) {
 						if (isMissingFileError(error)) {
@@ -946,7 +978,7 @@ export function serve(entrypoint, flags) {
 					if (out.errors?.length) {
 						return errorResponse(file, out.errors)
 					}
-					clearError(file)
+					markSuccess(file)
 					return new Response(out.js, { headers: { 'Content-Type': 'application/javascript' } })
 				}
 
@@ -954,7 +986,7 @@ export function serve(entrypoint, flags) {
 					const file = 'vendor:' + normalizeFile(pathname)
 					const bundled = await bundleVendor(path.resolve(resolved))
 					if (bundled?.code) {
-						clearError(file)
+						markSuccess(file)
 						return new Response(bundled.code, { headers: { 'Content-Type': 'application/javascript' } })
 					}
 					return errorResponse(file, bundled?.errors || [`Could not bundle ${pathname}`])
@@ -966,13 +998,13 @@ export function serve(entrypoint, flags) {
 				const inHtmlDirPath = path.join(htmlDir, pathname)
 				const inHtmlDir = Bun.file(inHtmlDirPath)
 				if (await inHtmlDir.exists()) {
-					clearError('static:' + normalizeFile(inHtmlDirPath))
+					markSuccess('static:' + normalizeFile(inHtmlDirPath))
 					return new Response(inHtmlDir)
 				}
 				const inRootPath = '.' + pathname
 				const inRoot = Bun.file(inRootPath)
 				if (await inRoot.exists()) {
-					clearError('static:' + normalizeFile(inRootPath))
+					markSuccess('static:' + normalizeFile(inRootPath))
 					return new Response(inRoot)
 				}
 			} catch (error) {
@@ -994,7 +1026,7 @@ export function serve(entrypoint, flags) {
 					if (out.errors?.length) {
 						return errorResponse(file, out.errors)
 					}
-					clearError(file)
+					markSuccess(file)
 					return new Response(out.js, { headers: { 'Content-Type': 'application/javascript' } })
 				}
 				for (const ext of ['.js', '.mjs']) {
@@ -1003,7 +1035,7 @@ export function serve(entrypoint, flags) {
 						const file = 'js:' + normalizeFile(withExt)
 						try {
 							const response = await serveJavaScriptFile(withExt)
-							clearError(file)
+							markSuccess(file)
 							return response
 						} catch (error) {
 							if (isMissingFileError(error)) {
@@ -1021,7 +1053,7 @@ export function serve(entrypoint, flags) {
 				const file = 'html:' + normalizeFile(htmlPath)
 				try {
 					let html = await Bun.file(htmlPath).text()
-					clearError(file)
+					markSuccess(file)
 					return new Response(transformHtml(html, entrypoint), {
 						headers: { 'Content-Type': 'text/html' },
 					})