bimba-cli 0.7.17 → 0.7.19

package/index.js

@@ -90,6 +90,8 @@ if(flags.help) {
 
 
 let bundling = false;
+let rebuildQueued = false;
+let watchTimer = null;
 
 // typecheck mode
 if (flags.typecheck || flags.tscheck) {
@@ -131,7 +133,13 @@ else {
 
 function watch(callback) {
     if (flags.watch) {
-        const watcher = fs.watch(path.dirname(entrypoint), {recursive: true}, async (event, filename) => ( callback() ));
+        const watcher = fs.watch(path.dirname(entrypoint), {recursive: true}, () => {
+            if (watchTimer) clearTimeout(watchTimer);
+            watchTimer = setTimeout(() => {
+                watchTimer = null;
+                callback();
+            }, 150);
+        });
     
         process.on("SIGINT", () => {
             if(flags.clearcache) rmSync(cache, { recursive: true, force: true });
@@ -146,7 +154,10 @@ function watch(callback) {
 
 
 async function bundle() {
-    if (bundling) return;
+    if (bundling) {
+        rebuildQueued = true;
+        return false;
+    }
     bundling = true;
 
     if (!fs.existsSync(entrypoint)) {
@@ -220,5 +231,9 @@ async function bundle() {
     }
     finally {
         bundling = false;
+        if (rebuildQueued) {
+            rebuildQueued = false;
+            queueMicrotask(bundle);
+        }
     };
 }

package/package.json

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

package/serve.js

@@ -216,7 +216,15 @@ const hmrClient = `
 
 	// ── Error overlay ──────────────────────────────────────────────────────────
 
+	function normalizeFile(file) {
+		let value = String(file || '').split(String.fromCharCode(92)).join('/');
+		while (value.startsWith('./')) value = value.slice(2);
+		while (value.startsWith('/')) value = value.slice(1);
+		return value;
+	}
+
 	function showError(file, errors) {
+		const displayFile = normalizeFile(file);
 		let overlay = document.getElementById('__bimba_error__');
 		if (!overlay) {
 			overlay = document.createElement('div');
@@ -225,11 +233,11 @@ const hmrClient = `
 			overlay.addEventListener('click', e => { if (e.target === overlay) overlay.remove(); });
 			document.body.appendChild(overlay);
 		}
-		overlay.dataset.file = file;
+		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 — \${file}</span>
+					<span>Compile error — \${displayFile}</span>
 					<span onclick="document.getElementById('__bimba_error__').remove()" style="cursor:pointer;opacity:.7;font-size:16px">✕</span>
 				</div>
 				\${errors.map(err => \`
@@ -244,7 +252,10 @@ const hmrClient = `
 
 	function clearError(file) {
 		const overlay = document.getElementById('__bimba_error__');
-		if (overlay && (!file || overlay.dataset.file === file)) overlay.remove();
+		if (!overlay) return;
+
+		const activeFile = overlay.dataset.file;
+		if (!file || !activeFile || activeFile === normalizeFile(file)) overlay.remove();
 	}
 
 	connect();
@@ -609,17 +620,35 @@ export function serve(entrypoint, flags) {
 	}
 
 	const _debounce = new Map()
+	const _watchVersion = new Map()
 
-	watch(srcDir, { recursive: true }, async (_event, filename) => {
+	function scheduleCompile(filename) {
+		filename = filename && String(filename)
 		if (!filename || !filename.endsWith('.imba')) return
-		if (_debounce.has(filename)) return
-		_debounce.set(filename, setTimeout(() => _debounce.delete(filename), 150))
 
+		const version = (_watchVersion.get(filename) || 0) + 1
+		_watchVersion.set(filename, version)
+
+		const pending = _debounce.get(filename)
+		if (pending) clearTimeout(pending)
+
+		_debounce.set(filename, setTimeout(() => {
+			_debounce.delete(filename)
+			compileChangedFile(filename, version)
+		}, 150))
+	}
+
+	function isCurrentChange(filename, version) {
+		return _watchVersion.get(filename) === version
+	}
+
+	async function compileChangedFile(filename, version) {
 		const filepath = path.join(srcDir, filename)
 		const rel = path.join(path.relative('.', srcDir), filename).replaceAll('\\', '/')
 
 		try {
 			if (!existsSync(filepath)) {
+				if (!isCurrentChange(filename, version)) return
 				dropFileState(filepath)
 				clearError(rel)
 				return
@@ -627,6 +656,7 @@ export function serve(entrypoint, flags) {
 
 			const out = await compileFile(filepath)
 
+			if (!isCurrentChange(filename, version)) return
 
 			if (out.errors?.length) {
 				printStatus(rel, 'fail', out.errors)
@@ -638,7 +668,7 @@ export function serve(entrypoint, flags) {
 				return
 			}
 
-			clearError()
+			clearError(rel)
 
 			// No change at all — skip
 			if (out.changeType === 'none' || out.changeType === 'cached') return
@@ -646,9 +676,14 @@ export function serve(entrypoint, flags) {
 			printStatus(rel, 'ok')
 			broadcast({ type: 'update', file: rel, slots: out.slots || 'shifted' })
 		} catch(e) {
+			if (!isCurrentChange(filename, version)) return
 			printStatus(rel, 'fail', [{ message: e.message }])
 			broadcast({ type: 'error', file: rel, errors: [{ message: e.message, snippet: e.stack || e.message }] })
 		}
+	}
+
+	watch(srcDir, { recursive: true }, (_event, filename) => {
+		scheduleCompile(filename)
 	})
 
 	// ── HTTP + WebSocket server ────────────────────────────────────────────────