starlight-cli 1.0.46 → 1.0.48

package/src/starlight.js

@@ -9,7 +9,7 @@ const Lexer = require('./lexer');
 const Parser = require('./parser');
 const Evaluator = require('./evaluator');
 
-const VERSION = '1.0.46';
+const VERSION = '1.0.48';
 
 const COLOR = {
     reset: '\x1b[0m',
@@ -20,7 +20,8 @@ const COLOR = {
     cyan: '\x1b[36m',
     gray: '\x1b[90m',
     green: '\x1b[32m',
-    magenta: '\x1b[35m'
+    magenta: '\x1b[35m',
+    white: '\x1b[37m'
 };
 
 function waitAndExit(code = 0) {
@@ -31,7 +32,7 @@ function waitAndExit(code = 0) {
 }
 
 function fatal(msg) {
-    console.error(COLOR.red + msg + COLOR.reset);
+    console.error(COLOR.white + msg + COLOR.reset);
     waitAndExit(1);
 }
 
@@ -172,24 +173,35 @@ function savePrompt(lines) {
     waitAndExit(0);
 }
 
-function runFile(filePath, isTemp = false, callback) {
+async function runFile(filePath, isTemp = false, callback) {
     const code = fs.readFileSync(filePath, 'utf8');
 
+    const lexer = new Lexer(code);
+    const tokens = lexer.getTokens();
+    const parser = new Parser(tokens, code);
+    const ast = parser.parse();
+    const evaluator = new Evaluator(code);
+
     try {
-        const lexer = new Lexer(code);
-        const parser = new Parser(lexer.getTokens());
-        const ast = parser.parse();
-        new Evaluator().evaluate(ast);
+        await evaluator.evaluate(ast);
     } catch (e) {
-        console.error(COLOR.red + e.message + COLOR.reset);
+        if (e.name === 'RuntimeError' || e.name === 'SyntaxError') {
+            console.error(COLOR.white + e.message + COLOR.reset);
+        } else {
+            console.error(COLOR.white + `Unexpected Error: ${e.message || e}` + COLOR.reset);
+        }
         return waitAndExit(1);
     }
 
-    
     if (callback) callback();
-    if (isTemp) try { fs.unlinkSync(filePath); } catch {}
+
+    if (isTemp) {
+        try { fs.unlinkSync(filePath); } catch {}
+    }
 }
 
+
+
 if (!args[0].startsWith('--')) {
     runFile(path.resolve(args[0]));
 }