bimba-cli 0.7.24 → 0.7.26

package/package.json

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

package/serve.js

@@ -1,6 +1,6 @@
 import { serve as bunServe } from 'bun'
 import * as compiler from 'imba/compiler'
-import { mkdirSync, watch, existsSync, statSync, writeFileSync } from 'fs'
+import { mkdirSync, watch, existsSync, statSync, writeFileSync, realpathSync } from 'fs'
 import path from 'path'
 import { theme } from './utils.js'
 import { printerr } from './plugin.js'
@@ -219,12 +219,19 @@ const hmrClient = `
 	const _compileErrors = new Map();
 
 	function normalizeFile(file) {
-		let value = String(file || '').split(String.fromCharCode(92)).join('/');
+		let value = String(file || '').split(/[?#]/)[0].split(String.fromCharCode(92)).join('/');
 		while (value.startsWith('./')) value = value.slice(2);
 		while (value.startsWith('/')) value = value.slice(1);
 		return value;
 	}
 
+	function sameFile(left, right) {
+		const a = normalizeFile(left);
+		const b = normalizeFile(right);
+		if (!a || !b) return false;
+		return a === b || a.endsWith('/' + b) || b.endsWith('/' + a);
+	}
+
 	function escapeHtml(value) {
 		return String(value ?? '').replace(/[&<>"']/g, ch => ({
 			'&': '&amp;',
@@ -281,6 +288,9 @@ const hmrClient = `
 
 	function showError(file, errors, time) {
 		const displayFile = normalizeFile(file);
+		for (const key of Array.from(_compileErrors.keys())) {
+			if (sameFile(key, displayFile)) _compileErrors.delete(key);
+		}
 		_compileErrors.set(displayFile, {
 			errors: Array.isArray(errors) ? errors : [errors],
 			time: time || new Date().toLocaleTimeString(),
@@ -289,8 +299,14 @@ const hmrClient = `
 	}
 
 	function clearError(file) {
-		if (file) _compileErrors.delete(normalizeFile(file));
-		else _compileErrors.clear();
+		if (file) {
+			const displayFile = normalizeFile(file);
+			for (const key of Array.from(_compileErrors.keys())) {
+				if (sameFile(key, displayFile)) _compileErrors.delete(key);
+			}
+		} else {
+			_compileErrors.clear();
+		}
 		renderErrors();
 	}
 
@@ -691,7 +707,8 @@ export function serve(entrypoint, flags) {
 		_statusSaved = true
 		_statusKind = 'errors'
 
-		for (const [file, item] of _activeErrors.entries()) {
+		for (const item of _activeErrors.values()) {
+			const file = item.file
 			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') }
@@ -708,6 +725,7 @@ export function serve(entrypoint, flags) {
 
 	function normalizeFile(file) {
 		let value = String(file || '')
+		value = value.split(/[?#]/)[0]
 		if (path.isAbsolute(value)) {
 			const rel = path.relative(process.cwd(), value)
 			if (!rel.startsWith('..')) value = rel
@@ -721,6 +739,78 @@ export function serve(entrypoint, flags) {
 	const srcRoot = path.resolve(srcDir)
 	const srcRel = normalizeFile(srcRoot)
 
+	function unprefixFile(file) {
+		return normalizeFile(file).replace(/^(?:html|css|js|static):/, '')
+	}
+
+	function fileVariants(file) {
+		const key = unprefixFile(file)
+		const variants = new Set([key])
+
+		if (srcRel && key.startsWith(srcRel + '/')) variants.add(key.slice(srcRel.length + 1))
+		else if (srcRel && key) variants.add(srcRel + '/' + key)
+
+		return Array.from(variants).filter(Boolean)
+	}
+
+	function fileCandidates(file) {
+		const candidates = []
+		for (const variant of fileVariants(file)) {
+			candidates.push(path.resolve(variant))
+			if (!variant.startsWith(srcRel + '/')) candidates.push(path.resolve(srcRoot, variant))
+		}
+		return candidates
+	}
+
+	function physicalFileKey(file) {
+		for (const candidate of fileCandidates(file)) {
+			try {
+				const stat = statSync(candidate)
+				if (!stat.isFile()) continue
+				const real = realpathSync(candidate).replaceAll('\\', '/')
+				return `fs:${stat.dev}:${stat.ino}:${real}`
+			} catch(_) {
+				// ignore non-existing aliases
+			}
+		}
+		return null
+	}
+
+	function errorKey(file) {
+		return physicalFileKey(file) || `path:${normalizeFile(file)}`
+	}
+
+	function sameFile(left, right) {
+		const leftPhysical = physicalFileKey(left)
+		const rightPhysical = physicalFileKey(right)
+		if (leftPhysical && rightPhysical && leftPhysical === rightPhysical) return true
+
+		const lefts = fileVariants(left)
+		const rights = fileVariants(right)
+
+		for (const a of lefts) {
+			for (const b of rights) {
+				if (a === b || a.endsWith('/' + b) || b.endsWith('/' + a)) return true
+			}
+		}
+
+		return false
+	}
+
+	function takeError(file) {
+		let previous = null
+		const target = errorKey(file)
+		const keys = Array.from(_activeErrors.keys())
+		for (const key of keys) {
+			const item = _activeErrors.get(key)
+			const storedFile = item?.file || key.replace(/^path:/, '')
+			if (key !== target && !sameFile(storedFile, file)) continue
+			previous ||= _activeErrors.get(key)
+			_activeErrors.delete(key)
+		}
+		return previous
+	}
+
 	function errorMessage(error) {
 		return error?.message || String(error)
 	}
@@ -751,19 +841,22 @@ export function serve(entrypoint, flags) {
 			.join('\n---\n')
 	}
 
-	function showTrackedError(file, item) {
+	function showTrackedError(item) {
+		const file = item.file
 		if (_isTTY) renderErrorPanel()
 		else printStatus(file, 'fail', item.errors)
 		broadcast({ type: 'error', file, time: item.time, errors: item.payload })
 	}
 
 	function reportError(file, errors) {
-		const key = normalizeFile(file)
+		const display = normalizeFile(file)
+		const key = errorKey(display)
 		const list = Array.isArray(errors) ? errors : [errors]
 		const signature = errorSignature(list)
-		const previous = _activeErrors.get(key)
+		const previous = takeError(display)
 
 		const item = {
+			file: display,
 			signature,
 			errors: list,
 			payload: serializeErrors(list),
@@ -771,11 +864,11 @@ export function serve(entrypoint, flags) {
 		}
 		_activeErrors.set(key, item)
 		if (previous?.signature === signature && !_isTTY) {
-			broadcast({ type: 'error', file: key, time: item.time, errors: item.payload })
+			broadcast({ type: 'error', file: display, time: item.time, errors: item.payload })
 			return
 		}
 
-		showTrackedError(key, item)
+		showTrackedError(item)
 	}
 
 	function errorText(errors) {
@@ -790,26 +883,24 @@ export function serve(entrypoint, flags) {
 
 	function clearError(file) {
 		const key = file ? normalizeFile(file) : null
-		const wasStatusFile = key && _statusFile === key
-		const hadError = key ? _activeErrors.has(key) : _activeErrors.size > 0
+		const hadPanel = _statusKind === 'errors'
+		const wasStatusFile = key && _statusFile && sameFile(_statusFile, key)
+		const hadError = key ? !!takeError(key) : _activeErrors.size > 0
 
-		if (key) _activeErrors.delete(key)
-		else _activeErrors.clear()
-
-		if (key && !hadError && !wasStatusFile) return
+		if (!key) _activeErrors.clear()
 
 		let showedNext = false
-		if (_isTTY && (hadError || _statusKind === 'errors')) {
+		if (_isTTY && (hadError || wasStatusFile || hadPanel)) {
 			showedNext = renderErrorPanel()
-		} else {
+		} else if (!key || hadError || wasStatusFile) {
 			clearStatus(key)
 		}
 
 		broadcast({ type: 'clear-error', file: key })
 
 		if (!_isTTY && wasStatusFile && _activeErrors.size) {
-			const [nextFile, nextItem] = Array.from(_activeErrors.entries()).at(-1)
-			showTrackedError(nextFile, nextItem)
+			const nextItem = Array.from(_activeErrors.values()).at(-1)
+			showTrackedError(nextItem)
 			showedNext = true
 		}