bimba-cli 0.4.7 → 0.4.8

package/package.json

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

package/plugin.js

@@ -89,18 +89,28 @@ plugin(imbaPlugin);
 
 // print an error generated by the imba compiler
 export function printerr(err) {
-  
+
   // halper function to produce empty strings
   const fill = (len = 0) => {return new Array(len + 1).join(' ')}
-  
-   // gather the needed information from the compiler error
+
+  // gather the needed information from the compiler error
   const snippet = err.toSnippet().split("\n");
+  const errs = snippet[2] ? snippet[2].indexOf('^') : -1;
+
+  // no source context available — print compact fallback
+  if (!snippet[1] || errs === -1) {
+    console.log('');
+    console.log(fill(10) + theme.error(" " + err.message + " "));
+    console.log('');
+    return;
+  }
+
   const display = {
     error: " " + err.message + " ",
     outdent: fill(10),
     source: snippet[1] + "  ",
-    margin: " line " + err.range.start.line + " ",
-    errs: snippet[2].indexOf('^'),
+    margin: " line " + (err.range.start.line + 1) + " ",
+    errs: errs,
     erre: snippet[2].lastIndexOf('^') + 1,
   };
 

package/serve.js

@@ -184,10 +184,9 @@ export function serve(entrypoint, flags) {
 	const sockets = new Set()
 	let importMapTag = null
 
-	let _lastLines = 0
 	let _fadeTimers = []
 	let _fadeId = 0
-	let _cursorOnLine = false
+	let _statusSaved = false
 
 	function cancelFade() {
 		_fadeTimers.forEach(t => clearTimeout(t))
@@ -196,22 +195,18 @@ export function serve(entrypoint, flags) {
 
 	function printStatus(file, state, errors) {
 		cancelFade()
-		if (_cursorOnLine) {
-			process.stdout.write('\x1b[1G\x1b[J')
-			_lastLines = 0
-			_cursorOnLine = false
-		} else if (_lastLines > 0) {
-			process.stdout.write(`\x1b[${_lastLines}A\x1b[J`)
-			_lastLines = 0
+		if (_statusSaved) {
+			process.stdout.write('\x1b[u\x1b[J')
+			_statusSaved = false
 		}
 		const now = new Date().toLocaleTimeString('ru-RU', { hour: '2-digit', minute: '2-digit', second: '2-digit' })
 		const status = state === 'ok' ? theme.success(' ok ') : theme.failure(' fail ')
+		process.stdout.write('\x1b[s')
+		_statusSaved = true
 		if (errors?.length) {
 			process.stdout.write(`  ${theme.folder(now)}  ${theme.filename(file)}  ${status}\n`)
-			_lastLines = 1
 			for (const err of errors) {
-				printerr(err)
-				_lastLines += 5
+				try { printerr(err) } catch(_) { process.stdout.write('  ' + err.message + '\n') }
 			}
 		} else {
 			const myId = ++_fadeId
@@ -221,16 +216,13 @@ export function serve(entrypoint, flags) {
 			const charDelay = 22
 
 			process.stdout.write(`  ${theme.folder(now)}  ${theme.filename(file)}  ${status}`)
-			_lastLines = 1
-			_cursorOnLine = true
 
 			for (let i = 1; i <= totalLen; i++) {
 				_fadeTimers.push(setTimeout(() => {
-					if (_fadeId !== myId || _lastLines !== 1) return
-					process.stdout.write('\x1b[1D\x1b[K')
+					if (_fadeId !== myId) return
+					process.stdout.write('\x1b[1D \x1b[1D')
 					if (i === totalLen) {
-						_lastLines = 0
-						_cursorOnLine = false
+						_statusSaved = false
 					}
 				}, startDelay + i * charDelay))
 			}
@@ -274,7 +266,7 @@ export function serve(entrypoint, flags) {
 					if (out.errors?.length) {
 						if (!out.cached) {
 							printStatus(file, 'fail', out.errors)
-							const payload = JSON.stringify({ type: 'error', file, errors: out.errors.map(e => ({ message: e.message, line: e.range?.start?.line, snippet: e.toSnippet() })) })
+							const payload = JSON.stringify({ type: 'error', file, errors: out.errors.map(e => ({ message: e.message, line: e.range?.start?.line, snippet: e.toSnippet().split('\n').slice(1).join('\n').trim() })) })
 							for (const socket of sockets) socket.send(payload)
 						}
 						return new Response(out.errors.map(e => e.message).join('\n'), { status: 500 })
@@ -285,7 +277,10 @@ export function serve(entrypoint, flags) {
 					}
 					return new Response(out.js, { headers: { 'Content-Type': 'application/javascript' } })
 				} catch (e) {
-					console.error(theme.failure('Compile error: ') + theme.filename(pathname) + '\n' + e.message)
+					const file = pathname.replace(/^\//, '')
+					printStatus(file, 'fail', [{ message: e.message }])
+					const payload = JSON.stringify({ type: 'error', file, errors: [{ message: e.message }] })
+					for (const socket of sockets) socket.send(payload)
 					return new Response(e.message, { status: 500 })
 				}
 			}