starlight-cli 1.0.10 → 1.0.12

package/dist/index.js

@@ -2454,7 +2454,7 @@ const Lexer = __nccwpck_require__(211);
 const Parser = __nccwpck_require__(222);
 const Evaluator = __nccwpck_require__(112);
 
-const VERSION = '1.0.10';
+const VERSION = '1.0.12';
 
 const COLOR = {
     reset: '\x1b[0m',
@@ -2467,7 +2467,7 @@ const COLOR = {
     green: '\x1b[32m'
 };
 
-function waitAndExit(code = 1) {
+function waitAndExit(code = 0) {
     console.error(COLOR.gray + '\nPress any key to exit...' + COLOR.reset);
     process.stdin.setRawMode(true);
     process.stdin.resume();
@@ -2484,14 +2484,8 @@ function printSourceContext(code, line, column) {
     const srcLine = lines[line - 1];
     if (!srcLine) return;
 
-    console.error(
-        COLOR.gray + `\n ${line} | ` + COLOR.reset + srcLine
-    );
-    console.error(
-        COLOR.gray + '    | ' +
-        COLOR.red + ' '.repeat(Math.max(0, column - 1)) + '^' +
-        COLOR.reset
-    );
+    console.error(COLOR.gray + `\n ${line} | ` + COLOR.reset + srcLine);
+    console.error(COLOR.gray + '    | ' + COLOR.red + ' '.repeat(Math.max(0, column - 1)) + '^' + COLOR.reset);
 }
 
 const args = process.argv.slice(2);
@@ -2537,14 +2531,10 @@ if (args[0] === '--learn') {
 }
 
 if (args[0] === '--viewfilelist') {
-    const readline = __nccwpck_require__(552);
-    let folderPath = readline.question(COLOR.cyan + 'Paste folder path to search .sl files: ' + COLOR.reset).trim();
+    const readlineSync = __nccwpck_require__(552);
+    const folderPath = readlineSync.question(COLOR.cyan + 'Paste folder path to search .sl files: ' + COLOR.reset).trim();
     if (!folderPath) return waitAndExit(0);
-
-    if (!fs.existsSync(folderPath) || !fs.lstatSync(folderPath).isDirectory()) {
-        return fatal('Invalid folder path.');
-    }
-
+    if (!fs.existsSync(folderPath) || !fs.lstatSync(folderPath).isDirectory()) return fatal('Invalid folder path.');
     const files = fs.readdirSync(folderPath).filter(f => f.endsWith('.sl'));
     if (files.length === 0) console.log(COLOR.yellow + 'No .sl files found in folder.' + COLOR.reset);
     else {
@@ -2568,8 +2558,16 @@ if (args[0] === '--writedirectly') {
     });
 
     let lines = [];
-    rl.prompt();
 
+    function highlightCode(line) {
+        // Strings first
+        line = line.replace(/"(.*?)"/g, COLOR.yellow + '"$1"' + COLOR.reset);
+        // Keywords
+        line = line.replace(/\b(sldeploy|import|from|const|let|var|if|else|for|while|func|return|break|continue|define|ask)\b/g, COLOR.blue + '$1' + COLOR.reset);
+        return line;
+    }
+
+    rl.prompt();
     rl.on('line', (line) => {
         if (line.trim() === ':run') {
             rl.close();
@@ -2578,13 +2576,8 @@ if (args[0] === '--writedirectly') {
             return;
         }
 
-        let coloredLine = line
-            .replace(/"(.*?)"/g, COLOR.yellow + '"$1"' + COLOR.reset)   
-            .replace(/\b(sldeploy|import|from|const|let|var|if|else|for|while|func|return|break|continue|define|ask)\b/g, COLOR.blue + '$1' + COLOR.reset); 
-
-        console.log(coloredLine);
-
         lines.push(line);
+        console.log(COLOR.cyan + '> ' + COLOR.reset + highlightCode(line));
         rl.prompt();
     });
 
@@ -2593,11 +2586,14 @@ if (args[0] === '--writedirectly') {
 
 function saveTempFilePrompt(lines) {
     const readlineSync = __nccwpck_require__(552);
-    let saveChoice = readlineSync.question(COLOR.cyan + 'Do you want to save this code? (y/n): ' + COLOR.reset).trim().toLowerCase();
-    if (saveChoice !== 'y') return;
+    const saveChoice = readlineSync.question(COLOR.cyan + 'Do you want to save this code? (y/n): ' + COLOR.reset).trim().toLowerCase();
+    if (saveChoice !== 'y') return waitAndExit(0);
 
     let folderPath = readlineSync.question(COLOR.cyan + 'Paste folder path to save (C:/ or D:/...): ' + COLOR.reset).trim();
-    if (!folderPath || !fs.existsSync(folderPath) || !fs.lstatSync(folderPath).isDirectory()) return console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
+    if (!folderPath || !fs.existsSync(folderPath) || !fs.lstatSync(folderPath).isDirectory()) {
+        console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
+        return waitAndExit(0);
+    }
 
     let fileName = readlineSync.question(COLOR.cyan + 'Enter file name (without extension): ' + COLOR.reset).trim();
     if (!fileName) return console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
@@ -2605,25 +2601,24 @@ function saveTempFilePrompt(lines) {
     let fullPath = path.join(folderPath, fileName.endsWith('.sl') ? fileName : fileName + '.sl');
     while (fs.existsSync(fullPath)) {
         fileName = readlineSync.question(COLOR.red + 'File exists! Enter a new name (or leave blank to cancel): ' + COLOR.reset).trim();
-        if (!fileName) return console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
+        if (!fileName) {
+            console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
+            return waitAndExit(0);
+        }
         fullPath = path.join(folderPath, fileName.endsWith('.sl') ? fileName : fileName + '.sl');
     }
 
     fs.writeFileSync(fullPath, lines.join('\n'), 'utf8');
     console.log(COLOR.green + `Saved to ${fullPath}` + COLOR.reset);
+    waitAndExit(0);
 }
 
 function runFile(filePath, isTemp = false, callback = null) {
-    if (!fs.existsSync(filePath)) {
-        return fatal(`File not found: ${filePath}`);
-    }
+    if (!fs.existsSync(filePath)) return fatal(`File not found: ${filePath}`);
 
     let code;
-    try {
-        code = fs.readFileSync(filePath, 'utf-8');
-    } catch (err) {
-        return fatal(`Failed to read file: ${err.message}`);
-    }
+    try { code = fs.readFileSync(filePath, 'utf-8'); } 
+    catch (err) { return fatal(`Failed to read file: ${err.message}`); }
 
     let tokens;
     try {
@@ -2661,17 +2656,12 @@ function runFile(filePath, isTemp = false, callback = null) {
     }
 
     console.log(COLOR.green + '\nProgram finished successfully.' + COLOR.reset);
-
     if (callback) callback();
-
-    if (isTemp) {
-        try { fs.unlinkSync(filePath); } catch {}
-    }
-
-    waitAndExit(0);
+    if (isTemp) { try { fs.unlinkSync(filePath); } catch {} }
+}
+if (!['--writedirectly', '--viewfilelist', '--learn', '--help', '-v', '--version'].includes(args[0])) {
+    runFile(path.resolve(args[0]));
 }
-
-runFile(path.resolve(args[0]));
 
 module.exports = __webpack_exports__;
 /******/ })()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starlight-cli",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Starlight Programming Language CLI",
   "bin": {
     "starlight": "index.js"

package/src/starlight.js

@@ -7,7 +7,7 @@ const Lexer = require('./lexer');
 const Parser = require('./parser');
 const Evaluator = require('./evaluator');
 
-const VERSION = '1.0.10';
+const VERSION = '1.0.12';
 
 const COLOR = {
     reset: '\x1b[0m',
@@ -20,7 +20,7 @@ const COLOR = {
     green: '\x1b[32m'
 };
 
-function waitAndExit(code = 1) {
+function waitAndExit(code = 0) {
     console.error(COLOR.gray + '\nPress any key to exit...' + COLOR.reset);
     process.stdin.setRawMode(true);
     process.stdin.resume();
@@ -37,14 +37,8 @@ function printSourceContext(code, line, column) {
     const srcLine = lines[line - 1];
     if (!srcLine) return;
 
-    console.error(
-        COLOR.gray + `\n ${line} | ` + COLOR.reset + srcLine
-    );
-    console.error(
-        COLOR.gray + '    | ' +
-        COLOR.red + ' '.repeat(Math.max(0, column - 1)) + '^' +
-        COLOR.reset
-    );
+    console.error(COLOR.gray + `\n ${line} | ` + COLOR.reset + srcLine);
+    console.error(COLOR.gray + '    | ' + COLOR.red + ' '.repeat(Math.max(0, column - 1)) + '^' + COLOR.reset);
 }
 
 const args = process.argv.slice(2);
@@ -90,14 +84,10 @@ if (args[0] === '--learn') {
 }
 
 if (args[0] === '--viewfilelist') {
-    const readline = require('readline-sync');
-    let folderPath = readline.question(COLOR.cyan + 'Paste folder path to search .sl files: ' + COLOR.reset).trim();
+    const readlineSync = require('readline-sync');
+    const folderPath = readlineSync.question(COLOR.cyan + 'Paste folder path to search .sl files: ' + COLOR.reset).trim();
     if (!folderPath) return waitAndExit(0);
-
-    if (!fs.existsSync(folderPath) || !fs.lstatSync(folderPath).isDirectory()) {
-        return fatal('Invalid folder path.');
-    }
-
+    if (!fs.existsSync(folderPath) || !fs.lstatSync(folderPath).isDirectory()) return fatal('Invalid folder path.');
     const files = fs.readdirSync(folderPath).filter(f => f.endsWith('.sl'));
     if (files.length === 0) console.log(COLOR.yellow + 'No .sl files found in folder.' + COLOR.reset);
     else {
@@ -121,8 +111,16 @@ if (args[0] === '--writedirectly') {
     });
 
     let lines = [];
-    rl.prompt();
 
+    function highlightCode(line) {
+        // Strings first
+        line = line.replace(/"(.*?)"/g, COLOR.yellow + '"$1"' + COLOR.reset);
+        // Keywords
+        line = line.replace(/\b(sldeploy|import|from|const|let|var|if|else|for|while|func|return|break|continue|define|ask)\b/g, COLOR.blue + '$1' + COLOR.reset);
+        return line;
+    }
+
+    rl.prompt();
     rl.on('line', (line) => {
         if (line.trim() === ':run') {
             rl.close();
@@ -131,13 +129,8 @@ if (args[0] === '--writedirectly') {
             return;
         }
 
-        let coloredLine = line
-            .replace(/"(.*?)"/g, COLOR.yellow + '"$1"' + COLOR.reset)   
-            .replace(/\b(sldeploy|import|from|const|let|var|if|else|for|while|func|return|break|continue|define|ask)\b/g, COLOR.blue + '$1' + COLOR.reset); 
-
-        console.log(coloredLine);
-
         lines.push(line);
+        console.log(COLOR.cyan + '> ' + COLOR.reset + highlightCode(line));
         rl.prompt();
     });
 
@@ -146,11 +139,14 @@ if (args[0] === '--writedirectly') {
 
 function saveTempFilePrompt(lines) {
     const readlineSync = require('readline-sync');
-    let saveChoice = readlineSync.question(COLOR.cyan + 'Do you want to save this code? (y/n): ' + COLOR.reset).trim().toLowerCase();
-    if (saveChoice !== 'y') return;
+    const saveChoice = readlineSync.question(COLOR.cyan + 'Do you want to save this code? (y/n): ' + COLOR.reset).trim().toLowerCase();
+    if (saveChoice !== 'y') return waitAndExit(0);
 
     let folderPath = readlineSync.question(COLOR.cyan + 'Paste folder path to save (C:/ or D:/...): ' + COLOR.reset).trim();
-    if (!folderPath || !fs.existsSync(folderPath) || !fs.lstatSync(folderPath).isDirectory()) return console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
+    if (!folderPath || !fs.existsSync(folderPath) || !fs.lstatSync(folderPath).isDirectory()) {
+        console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
+        return waitAndExit(0);
+    }
 
     let fileName = readlineSync.question(COLOR.cyan + 'Enter file name (without extension): ' + COLOR.reset).trim();
     if (!fileName) return console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
@@ -158,25 +154,24 @@ function saveTempFilePrompt(lines) {
     let fullPath = path.join(folderPath, fileName.endsWith('.sl') ? fileName : fileName + '.sl');
     while (fs.existsSync(fullPath)) {
         fileName = readlineSync.question(COLOR.red + 'File exists! Enter a new name (or leave blank to cancel): ' + COLOR.reset).trim();
-        if (!fileName) return console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
+        if (!fileName) {
+            console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
+            return waitAndExit(0);
+        }
         fullPath = path.join(folderPath, fileName.endsWith('.sl') ? fileName : fileName + '.sl');
     }
 
     fs.writeFileSync(fullPath, lines.join('\n'), 'utf8');
     console.log(COLOR.green + `Saved to ${fullPath}` + COLOR.reset);
+    waitAndExit(0);
 }
 
 function runFile(filePath, isTemp = false, callback = null) {
-    if (!fs.existsSync(filePath)) {
-        return fatal(`File not found: ${filePath}`);
-    }
+    if (!fs.existsSync(filePath)) return fatal(`File not found: ${filePath}`);
 
     let code;
-    try {
-        code = fs.readFileSync(filePath, 'utf-8');
-    } catch (err) {
-        return fatal(`Failed to read file: ${err.message}`);
-    }
+    try { code = fs.readFileSync(filePath, 'utf-8'); } 
+    catch (err) { return fatal(`Failed to read file: ${err.message}`); }
 
     let tokens;
     try {
@@ -214,14 +209,9 @@ function runFile(filePath, isTemp = false, callback = null) {
     }
 
     console.log(COLOR.green + '\nProgram finished successfully.' + COLOR.reset);
-
     if (callback) callback();
-
-    if (isTemp) {
-        try { fs.unlinkSync(filePath); } catch {}
-    }
-
-    waitAndExit(0);
+    if (isTemp) { try { fs.unlinkSync(filePath); } catch {} }
+}
+if (!['--writedirectly', '--viewfilelist', '--learn', '--help', '-v', '--version'].includes(args[0])) {
+    runFile(path.resolve(args[0]));
 }
-
-runFile(path.resolve(args[0]));