bimba-cli 0.7.22 → 0.7.24

package/package.json

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

package/serve.js

@@ -98,7 +98,7 @@ const hmrClient = `
 	}
 
 	async function _doUpdate(file, slots) {
-		clearError();
+		clearError(file);
 
 		const bodyBefore = new Set(document.body.children);
 		const tagsBefore = new Set();
@@ -216,6 +216,8 @@ const hmrClient = `
 
 	// ── Error overlay ──────────────────────────────────────────────────────────
 
+	const _compileErrors = new Map();
+
 	function normalizeFile(file) {
 		let value = String(file || '').split(String.fromCharCode(92)).join('/');
 		while (value.startsWith('./')) value = value.slice(2);
@@ -223,10 +225,24 @@ const hmrClient = `
 		return value;
 	}
 
-	function showError(file, errors, time) {
-		const displayFile = normalizeFile(file);
-		const displayTime = time || new Date().toLocaleTimeString();
+	function escapeHtml(value) {
+		return String(value ?? '').replace(/[&<>"']/g, ch => ({
+			'&': '&amp;',
+			'<': '&lt;',
+			'>': '&gt;',
+			'"': '&quot;',
+			"'": '&#39;',
+		})[ch]);
+	}
+
+	function renderErrors() {
 		let overlay = document.getElementById('__bimba_error__');
+
+		if (!_compileErrors.size) {
+			if (overlay) overlay.remove();
+			return;
+		}
+
 		if (!overlay) {
 			overlay = document.createElement('div');
 			overlay.id = '__bimba_error__';
@@ -234,29 +250,48 @@ const hmrClient = `
 			overlay.addEventListener('click', e => { if (e.target === overlay) overlay.remove(); });
 			document.body.appendChild(overlay);
 		}
-		overlay.dataset.file = displayFile;
-		overlay.innerHTML = \`
-			<div style="background:#1a1a1a;border:1px solid #ff4444;border-radius:8px;max-width:860px;width:100%;max-height:90vh;overflow:auto;box-shadow:0 0 40px rgba(255,68,68,.3)">
-				<div style="background:#ff4444;color:#fff;padding:10px 16px;font-size:13px;font-weight:600;display:flex;justify-content:space-between;align-items:center">
-					<span>Compile error — \${displayFile} <span style="opacity:.75;font-weight:400">\${displayTime}</span></span>
-					<span onclick="document.getElementById('__bimba_error__').remove()" style="cursor:pointer;opacity:.7;font-size:16px">✕</span>
-				</div>
-				\${errors.map(err => \`
-					<div style="padding:16px;border-bottom:1px solid #333">
-						<div style="color:#ff8080;font-size:13px;margin-bottom:10px">\${err.message}\${err.line ? \` <span style="color:#888">line \${err.line}</span>\` : ''}</div>
-						\${err.snippet ? \`<pre style="margin:0;padding:10px;background:#111;border-radius:4px;font-size:12px;line-height:1.6;color:#ccc;overflow-x:auto;white-space:pre">\${err.snippet.replace(/</g,'&lt;')}</pre>\` : ''}
-					</div>
-				\`).join('')}
-			</div>
-		\`;
+
+		const files = Array.from(_compileErrors.entries());
+		overlay.innerHTML =
+			'<div style="background:#1a1a1a;border:1px solid #ff4444;border-radius:8px;max-width:900px;width:100%;max-height:90vh;overflow:auto;box-shadow:0 0 40px rgba(255,68,68,.3)">' +
+				'<div style="background:#ff4444;color:#fff;padding:10px 16px;font-size:13px;font-weight:600;display:flex;justify-content:space-between;align-items:center">' +
+					'<span>Compile errors — ' + files.length + '</span>' +
+					'<span onclick="document.getElementById(\\'__bimba_error__\\').remove()" style="cursor:pointer;opacity:.7;font-size:16px">✕</span>' +
+				'</div>' +
+				files.map(([displayFile, item]) => {
+					const errors = item.errors || [];
+					return '<div style="border-bottom:1px solid #333">' +
+						'<div style="padding:10px 16px;background:#241616;color:#ffd1d1;font-size:13px;font-weight:600;display:flex;justify-content:space-between;gap:16px">' +
+							'<span>' + escapeHtml(displayFile) + '</span>' +
+							'<span style="opacity:.75;font-weight:400">' + escapeHtml(item.time || '') + '</span>' +
+						'</div>' +
+						errors.map(err =>
+							'<div style="padding:16px;border-top:1px solid #333">' +
+								'<div style="color:#ff8080;font-size:13px;margin-bottom:10px">' +
+									escapeHtml(err.message) +
+									(err.line ? ' <span style="color:#888">line ' + escapeHtml(err.line) + '</span>' : '') +
+								'</div>' +
+								(err.snippet ? '<pre style="margin:0;padding:10px;background:#111;border-radius:4px;font-size:12px;line-height:1.6;color:#ccc;overflow-x:auto;white-space:pre">' + escapeHtml(err.snippet) + '</pre>' : '') +
+							'</div>'
+						).join('') +
+					'</div>';
+				}).join('') +
+			'</div>';
 	}
 
-	function clearError(file) {
-		const overlay = document.getElementById('__bimba_error__');
-		if (!overlay) return;
+	function showError(file, errors, time) {
+		const displayFile = normalizeFile(file);
+		_compileErrors.set(displayFile, {
+			errors: Array.isArray(errors) ? errors : [errors],
+			time: time || new Date().toLocaleTimeString(),
+		});
+		renderErrors();
+	}
 
-		const activeFile = overlay.dataset.file;
-		if (!file || !activeFile || activeFile === normalizeFile(file)) overlay.remove();
+	function clearError(file) {
+		if (file) _compileErrors.delete(normalizeFile(file));
+		else _compileErrors.clear();
+		renderErrors();
 	}
 
 	connect();
@@ -265,7 +300,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 +402,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 +410,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 +441,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 })
 }
 
@@ -562,6 +597,7 @@ export function serve(entrypoint, flags) {
 	let _fadeId = 0
 	let _statusFile = null
 	let _statusSaved = false
+	let _statusKind = null
 	const _isTTY = process.stdout.isTTY
 
 	function cancelFade() {
@@ -577,6 +613,7 @@ export function serve(entrypoint, flags) {
 			_statusSaved = false
 		}
 		_statusFile = null
+		_statusKind = null
 	}
 
 	function printStatus(file, state, errors) {
@@ -607,6 +644,7 @@ export function serve(entrypoint, flags) {
 		process.stdout.write('\x1b[s')
 		_statusSaved = true
 		_statusFile = file
+		_statusKind = state
 
 		if (errors?.length) {
 			process.stdout.write(`  ${theme.folder(now)}  ${theme.filename(file)}  ${status}\n`)
@@ -625,6 +663,7 @@ export function serve(entrypoint, flags) {
 					if (i === total) {
 						_statusSaved = false
 						_statusFile = null
+						_statusKind = null
 					}
 				}, 5000 + i * 22))
 			}
@@ -635,6 +674,33 @@ export function serve(entrypoint, flags) {
 
 	const _activeErrors = new Map()
 
+	function renderErrorPanel() {
+		if (!_isTTY) return false
+
+		cancelFade()
+		if (_statusSaved) {
+			process.stdout.write('\x1b[u\x1b[J')
+			_statusSaved = false
+		}
+		_statusFile = null
+		_statusKind = null
+
+		if (!_activeErrors.size) return false
+
+		process.stdout.write('\x1b[s')
+		_statusSaved = true
+		_statusKind = 'errors'
+
+		for (const [file, item] of _activeErrors.entries()) {
+			process.stdout.write(`  ${theme.folder(item.time)}  ${theme.filename(file)}  ${theme.failure(' fail ')}\n`)
+			for (const err of item.errors) {
+				try { printerr(err) } catch(_) { process.stdout.write('  ' + err.message + '\n') }
+			}
+		}
+
+		return true
+	}
+
 	function broadcast(payload) {
 		const msg = JSON.stringify(payload)
 		for (const socket of sockets) socket.send(msg)
@@ -652,6 +718,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)
 	}
@@ -683,7 +752,8 @@ export function serve(entrypoint, flags) {
 	}
 
 	function showTrackedError(file, item) {
-		printStatus(file, 'fail', item.errors)
+		if (_isTTY) renderErrorPanel()
+		else printStatus(file, 'fail', item.errors)
 		broadcast({ type: 'error', file, time: item.time, errors: item.payload })
 	}
 
@@ -728,11 +798,16 @@ export function serve(entrypoint, flags) {
 
 		if (key && !hadError && !wasStatusFile) return
 
-		clearStatus(key)
+		let showedNext = false
+		if (_isTTY && (hadError || _statusKind === 'errors')) {
+			showedNext = renderErrorPanel()
+		} else {
+			clearStatus(key)
+		}
+
 		broadcast({ type: 'clear-error', file: key })
 
-		let showedNext = false
-		if (wasStatusFile && _activeErrors.size) {
+		if (!_isTTY && wasStatusFile && _activeErrors.size) {
 			const [nextFile, nextItem] = Array.from(_activeErrors.entries()).at(-1)
 			showTrackedError(nextFile, nextItem)
 			showedNext = true
@@ -744,41 +819,59 @@ export function serve(entrypoint, flags) {
 	function markSuccess(file) {
 		const key = normalizeFile(file)
 		const result = clearError(key)
-		const shouldPrint = result?.cleared && !result.showedNext
+		const active = _activeErrors.size
+		const shouldPrint = result?.cleared && !result.showedNext && !active
 		if (shouldPrint) printStatus(key, 'ok')
-		return { cleared: !!result?.cleared, printed: !!shouldPrint, showedNext: !!result?.showedNext }
+		return { cleared: !!result?.cleared, printed: !!shouldPrint, showedNext: !!result?.showedNext, active }
 	}
 
 	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
@@ -786,7 +879,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
@@ -802,10 +895,10 @@ export function serve(entrypoint, flags) {
 			// No change at all — skip
 			if (out.changeType === 'none' || out.changeType === 'cached') return
 
-			if (!success.printed && !success.showedNext) printStatus(rel, 'ok')
+			if (!success.printed && !success.showedNext && !success.active) 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)