starlight-cli 1.0.12 → 1.0.13

package/dist/index.js

@@ -2449,12 +2449,14 @@ const fs = __nccwpck_require__(896);
 const path = __nccwpck_require__(928);
 const os = __nccwpck_require__(857);
 const { exec } = __nccwpck_require__(317);
+const readline = __nccwpck_require__(785);
+const readlineSync = __nccwpck_require__(552);
 
 const Lexer = __nccwpck_require__(211);
 const Parser = __nccwpck_require__(222);
 const Evaluator = __nccwpck_require__(112);
 
-const VERSION = '1.0.12';
+const VERSION = '1.0.13';
 
 const COLOR = {
     reset: '\x1b[0m',
@@ -2464,30 +2466,38 @@ const COLOR = {
     blue: '\x1b[34m',
     cyan: '\x1b[36m',
     gray: '\x1b[90m',
-    green: '\x1b[32m'
+    green: '\x1b[32m',
+    magenta: '\x1b[35m'
 };
 
+
 function waitAndExit(code = 0) {
+    try { process.stdin.setRawMode(true); } catch {}
     console.error(COLOR.gray + '\nPress any key to exit...' + COLOR.reset);
-    process.stdin.setRawMode(true);
     process.stdin.resume();
     process.stdin.once('data', () => process.exit(code));
 }
 
 function fatal(msg) {
     console.error(COLOR.red + msg + COLOR.reset);
-    return waitAndExit(1);
+    waitAndExit(1);
 }
 
-function printSourceContext(code, line, column) {
-    const lines = code.split('\n');
-    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);
+function highlightCode(line) {
+    return line
+        // strings
+        .replace(/"(?:\\.|[^"])*"/g, m => COLOR.yellow + m + COLOR.reset)
+        // numbers
+        .replace(/\b\d+(\.\d+)?\b/g, m => COLOR.magenta + m + COLOR.reset)
+        // keywords
+        .replace(
+            /\b(sldeploy|import|from|const|let|var|if|else|for|while|func|return|break|continue|define|ask)\b/g,
+            m => COLOR.blue + m + COLOR.reset
+        );
 }
 
+
 const args = process.argv.slice(2);
 
 if (args.length === 0) {
@@ -2495,12 +2505,11 @@ if (args.length === 0) {
 Starlight Programming Language
 
 Usage:
-  starlight <file.sl>           Run a Starlight program
-  starlight -v                  Show version
-  starlight --help              Show help
-  starlight --learn             Open learning guide
-  starlight --writedirectly     Write and run temporary code
-  starlight --viewfilelist      View SL files in a folder
+  starlight <file.sl>
+  starlight -v
+  starlight --help
+  starlight --learn
+  starlight --writedirectly
 `);
     process.exit(0);
 }
@@ -2512,154 +2521,104 @@ if (args[0] === '-v' || args[0] === '--version') {
 
 if (args[0] === '--help') {
     console.log(`
-Starlight CLI Help
-
-Commands:
-  starlight file.sl             Run a Starlight program
-  starlight -v                  Show version
-  starlight --learn             Open learning guide
-  starlight --writedirectly     Write & run temporary code
-  starlight --viewfilelist      View SL files in a folder
+starlight <file.sl>        Run file
+starlight --writedirectly Interactive editor
+starlight --learn         Learning guide
 `);
     process.exit(0);
 }
 
 if (args[0] === '--learn') {
-    console.log(COLOR.cyan + 'Opening Starlight Learning Guide...' + COLOR.reset);
     exec('start https://programming-lang.pages.dev/learning-guide');
     process.exit(0);
 }
 
-if (args[0] === '--viewfilelist') {
-    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.');
-    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 {
-        console.log(COLOR.green + `Found ${files.length} .sl files:` + COLOR.reset);
-        files.forEach(f => console.log('  ' + f));
-    }
-    return waitAndExit(0);
-}
 
 if (args[0] === '--writedirectly') {
-    const readline = __nccwpck_require__(785);
-    const tempFile = path.join(os.tmpdir(), `starlight-temp-${Date.now()}.sl`);
+    const tempFile = path.join(os.tmpdir(), `starlight-${Date.now()}.sl`);
+    const lines = [];
 
     console.log(COLOR.green + 'Interactive Starlight Editor' + COLOR.reset);
-    console.log(COLOR.gray + 'Type your code. Enter ":run" on a new line to execute.\n' + COLOR.reset);
+    console.log(COLOR.gray + 'Type code. Use :run to execute.\n' + COLOR.reset);
 
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
-        prompt: COLOR.cyan + '> ' + COLOR.reset
+        terminal: false
     });
 
-    let lines = [];
-
-    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;
-    }
+    process.stdout.write(COLOR.cyan + '> ' + COLOR.reset);
 
-    rl.prompt();
     rl.on('line', (line) => {
         if (line.trim() === ':run') {
             rl.close();
             fs.writeFileSync(tempFile, lines.join('\n'), 'utf8');
-            runFile(tempFile, true, () => saveTempFilePrompt(lines));
+            runFile(tempFile, true, () => savePrompt(lines));
             return;
         }
 
         lines.push(line);
-        console.log(COLOR.cyan + '> ' + COLOR.reset + highlightCode(line));
-        rl.prompt();
+        process.stdout.write(
+            COLOR.cyan + '> ' + COLOR.reset + highlightCode(line) + '\n'
+        );
     });
 
     return;
 }
 
-function saveTempFilePrompt(lines) {
-    const readlineSync = __nccwpck_require__(552);
-    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()) {
-        console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
+function savePrompt(lines) {
+    try { process.stdin.setRawMode(false); } catch {}
+
+    const save = readlineSync
+        .question(COLOR.cyan + 'Do you want to save this code? (y/n): ' + COLOR.reset)
+        .trim()
+        .toLowerCase();
+
+    if (save !== 'y') return waitAndExit(0);
+
+    const dir = readlineSync.question(
+        COLOR.cyan + 'Folder path: ' + COLOR.reset
+    ).trim();
+
+    if (!fs.existsSync(dir)) {
+        console.log(COLOR.yellow + 'Invalid folder.' + 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);
+    const name = readlineSync.question(
+        COLOR.cyan + 'File name: ' + COLOR.reset
+    ).trim();
 
-    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) {
-            console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
-            return waitAndExit(0);
-        }
-        fullPath = path.join(folderPath, fileName.endsWith('.sl') ? fileName : fileName + '.sl');
-    }
+    if (!name) return waitAndExit(0);
 
-    fs.writeFileSync(fullPath, lines.join('\n'), 'utf8');
-    console.log(COLOR.green + `Saved to ${fullPath}` + COLOR.reset);
+    const file = path.join(dir, name.endsWith('.sl') ? name : name + '.sl');
+    fs.writeFileSync(file, lines.join('\n'), 'utf8');
+
+    console.log(COLOR.green + `Saved to ${file}` + COLOR.reset);
     waitAndExit(0);
 }
 
-function runFile(filePath, isTemp = false, callback = null) {
-    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}`); }
+function runFile(filePath, isTemp = false, callback) {
+    const code = fs.readFileSync(filePath, 'utf8');
 
-    let tokens;
     try {
         const lexer = new Lexer(code);
-        tokens = lexer.getTokens();
-    } catch (err) {
-        console.error(COLOR.red + COLOR.bold + 'Starlight Lexer Error' + COLOR.reset);
-        console.error(COLOR.cyan + `File: ${filePath}` + COLOR.reset);
-        console.error(COLOR.yellow + `Message: ${err.message}` + COLOR.reset);
-        if (err.line && err.column) printSourceContext(code, err.line, err.column);
-        return waitAndExit(1);
-    }
-
-    let ast;
-    try {
-        const parser = new Parser(tokens);
-        ast = parser.parse();
-    } catch (err) {
-        console.error(COLOR.red + COLOR.bold + 'Starlight Parser Error' + COLOR.reset);
-        console.error(COLOR.cyan + `File: ${filePath}` + COLOR.reset);
-        console.error(COLOR.yellow + `Message: ${err.message}` + COLOR.reset);
-        if (err.token && err.token.line && err.token.column) printSourceContext(code, err.token.line, err.token.column);
-        return waitAndExit(1);
-    }
-
-    try {
-        const evaluator = new Evaluator();
-        evaluator.evaluate(ast);
-    } catch (err) {
-        console.error(COLOR.red + COLOR.bold + 'Starlight Runtime Error' + COLOR.reset);
-        console.error(COLOR.cyan + `File: ${filePath}` + COLOR.reset);
-        console.error(COLOR.yellow + `Message: ${err.message}` + COLOR.reset);
-        if (err.line && err.column) printSourceContext(code, err.line, err.column);
+        const parser = new Parser(lexer.getTokens());
+        const ast = parser.parse();
+        new Evaluator().evaluate(ast);
+    } catch (e) {
+        console.error(COLOR.red + e.message + COLOR.reset);
         return waitAndExit(1);
     }
 
     console.log(COLOR.green + '\nProgram finished successfully.' + COLOR.reset);
+
     if (callback) callback();
-    if (isTemp) { try { fs.unlinkSync(filePath); } catch {} }
+    if (isTemp) try { fs.unlinkSync(filePath); } catch {}
 }
-if (!['--writedirectly', '--viewfilelist', '--learn', '--help', '-v', '--version'].includes(args[0])) {
+
+if (!args[0].startsWith('--')) {
     runFile(path.resolve(args[0]));
 }
 

package/package.json

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

package/src/starlight.js

@@ -2,12 +2,14 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { exec } = require('child_process');
+const readline = require('readline');
+const readlineSync = require('readline-sync');
 
 const Lexer = require('./lexer');
 const Parser = require('./parser');
 const Evaluator = require('./evaluator');
 
-const VERSION = '1.0.12';
+const VERSION = '1.0.13';
 
 const COLOR = {
     reset: '\x1b[0m',
@@ -17,30 +19,38 @@ const COLOR = {
     blue: '\x1b[34m',
     cyan: '\x1b[36m',
     gray: '\x1b[90m',
-    green: '\x1b[32m'
+    green: '\x1b[32m',
+    magenta: '\x1b[35m'
 };
 
+
 function waitAndExit(code = 0) {
+    try { process.stdin.setRawMode(true); } catch {}
     console.error(COLOR.gray + '\nPress any key to exit...' + COLOR.reset);
-    process.stdin.setRawMode(true);
     process.stdin.resume();
     process.stdin.once('data', () => process.exit(code));
 }
 
 function fatal(msg) {
     console.error(COLOR.red + msg + COLOR.reset);
-    return waitAndExit(1);
+    waitAndExit(1);
 }
 
-function printSourceContext(code, line, column) {
-    const lines = code.split('\n');
-    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);
+function highlightCode(line) {
+    return line
+        // strings
+        .replace(/"(?:\\.|[^"])*"/g, m => COLOR.yellow + m + COLOR.reset)
+        // numbers
+        .replace(/\b\d+(\.\d+)?\b/g, m => COLOR.magenta + m + COLOR.reset)
+        // keywords
+        .replace(
+            /\b(sldeploy|import|from|const|let|var|if|else|for|while|func|return|break|continue|define|ask)\b/g,
+            m => COLOR.blue + m + COLOR.reset
+        );
 }
 
+
 const args = process.argv.slice(2);
 
 if (args.length === 0) {
@@ -48,12 +58,11 @@ if (args.length === 0) {
 Starlight Programming Language
 
 Usage:
-  starlight <file.sl>           Run a Starlight program
-  starlight -v                  Show version
-  starlight --help              Show help
-  starlight --learn             Open learning guide
-  starlight --writedirectly     Write and run temporary code
-  starlight --viewfilelist      View SL files in a folder
+  starlight <file.sl>
+  starlight -v
+  starlight --help
+  starlight --learn
+  starlight --writedirectly
 `);
     process.exit(0);
 }
@@ -65,153 +74,103 @@ if (args[0] === '-v' || args[0] === '--version') {
 
 if (args[0] === '--help') {
     console.log(`
-Starlight CLI Help
-
-Commands:
-  starlight file.sl             Run a Starlight program
-  starlight -v                  Show version
-  starlight --learn             Open learning guide
-  starlight --writedirectly     Write & run temporary code
-  starlight --viewfilelist      View SL files in a folder
+starlight <file.sl>        Run file
+starlight --writedirectly Interactive editor
+starlight --learn         Learning guide
 `);
     process.exit(0);
 }
 
 if (args[0] === '--learn') {
-    console.log(COLOR.cyan + 'Opening Starlight Learning Guide...' + COLOR.reset);
     exec('start https://programming-lang.pages.dev/learning-guide');
     process.exit(0);
 }
 
-if (args[0] === '--viewfilelist') {
-    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.');
-    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 {
-        console.log(COLOR.green + `Found ${files.length} .sl files:` + COLOR.reset);
-        files.forEach(f => console.log('  ' + f));
-    }
-    return waitAndExit(0);
-}
 
 if (args[0] === '--writedirectly') {
-    const readline = require('readline');
-    const tempFile = path.join(os.tmpdir(), `starlight-temp-${Date.now()}.sl`);
+    const tempFile = path.join(os.tmpdir(), `starlight-${Date.now()}.sl`);
+    const lines = [];
 
     console.log(COLOR.green + 'Interactive Starlight Editor' + COLOR.reset);
-    console.log(COLOR.gray + 'Type your code. Enter ":run" on a new line to execute.\n' + COLOR.reset);
+    console.log(COLOR.gray + 'Type code. Use :run to execute.\n' + COLOR.reset);
 
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
-        prompt: COLOR.cyan + '> ' + COLOR.reset
+        terminal: false
     });
 
-    let lines = [];
-
-    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;
-    }
+    process.stdout.write(COLOR.cyan + '> ' + COLOR.reset);
 
-    rl.prompt();
     rl.on('line', (line) => {
         if (line.trim() === ':run') {
             rl.close();
             fs.writeFileSync(tempFile, lines.join('\n'), 'utf8');
-            runFile(tempFile, true, () => saveTempFilePrompt(lines));
+            runFile(tempFile, true, () => savePrompt(lines));
             return;
         }
 
         lines.push(line);
-        console.log(COLOR.cyan + '> ' + COLOR.reset + highlightCode(line));
-        rl.prompt();
+        process.stdout.write(
+            COLOR.cyan + '> ' + COLOR.reset + highlightCode(line) + '\n'
+        );
     });
 
     return;
 }
 
-function saveTempFilePrompt(lines) {
-    const readlineSync = require('readline-sync');
-    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()) {
-        console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
+function savePrompt(lines) {
+    try { process.stdin.setRawMode(false); } catch {}
+
+    const save = readlineSync
+        .question(COLOR.cyan + 'Do you want to save this code? (y/n): ' + COLOR.reset)
+        .trim()
+        .toLowerCase();
+
+    if (save !== 'y') return waitAndExit(0);
+
+    const dir = readlineSync.question(
+        COLOR.cyan + 'Folder path: ' + COLOR.reset
+    ).trim();
+
+    if (!fs.existsSync(dir)) {
+        console.log(COLOR.yellow + 'Invalid folder.' + 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);
+    const name = readlineSync.question(
+        COLOR.cyan + 'File name: ' + COLOR.reset
+    ).trim();
 
-    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) {
-            console.log(COLOR.yellow + 'Skipping save.' + COLOR.reset);
-            return waitAndExit(0);
-        }
-        fullPath = path.join(folderPath, fileName.endsWith('.sl') ? fileName : fileName + '.sl');
-    }
+    if (!name) return waitAndExit(0);
 
-    fs.writeFileSync(fullPath, lines.join('\n'), 'utf8');
-    console.log(COLOR.green + `Saved to ${fullPath}` + COLOR.reset);
+    const file = path.join(dir, name.endsWith('.sl') ? name : name + '.sl');
+    fs.writeFileSync(file, lines.join('\n'), 'utf8');
+
+    console.log(COLOR.green + `Saved to ${file}` + COLOR.reset);
     waitAndExit(0);
 }
 
-function runFile(filePath, isTemp = false, callback = null) {
-    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}`); }
+function runFile(filePath, isTemp = false, callback) {
+    const code = fs.readFileSync(filePath, 'utf8');
 
-    let tokens;
     try {
         const lexer = new Lexer(code);
-        tokens = lexer.getTokens();
-    } catch (err) {
-        console.error(COLOR.red + COLOR.bold + 'Starlight Lexer Error' + COLOR.reset);
-        console.error(COLOR.cyan + `File: ${filePath}` + COLOR.reset);
-        console.error(COLOR.yellow + `Message: ${err.message}` + COLOR.reset);
-        if (err.line && err.column) printSourceContext(code, err.line, err.column);
-        return waitAndExit(1);
-    }
-
-    let ast;
-    try {
-        const parser = new Parser(tokens);
-        ast = parser.parse();
-    } catch (err) {
-        console.error(COLOR.red + COLOR.bold + 'Starlight Parser Error' + COLOR.reset);
-        console.error(COLOR.cyan + `File: ${filePath}` + COLOR.reset);
-        console.error(COLOR.yellow + `Message: ${err.message}` + COLOR.reset);
-        if (err.token && err.token.line && err.token.column) printSourceContext(code, err.token.line, err.token.column);
-        return waitAndExit(1);
-    }
-
-    try {
-        const evaluator = new Evaluator();
-        evaluator.evaluate(ast);
-    } catch (err) {
-        console.error(COLOR.red + COLOR.bold + 'Starlight Runtime Error' + COLOR.reset);
-        console.error(COLOR.cyan + `File: ${filePath}` + COLOR.reset);
-        console.error(COLOR.yellow + `Message: ${err.message}` + COLOR.reset);
-        if (err.line && err.column) printSourceContext(code, err.line, err.column);
+        const parser = new Parser(lexer.getTokens());
+        const ast = parser.parse();
+        new Evaluator().evaluate(ast);
+    } catch (e) {
+        console.error(COLOR.red + e.message + COLOR.reset);
         return waitAndExit(1);
     }
 
     console.log(COLOR.green + '\nProgram finished successfully.' + COLOR.reset);
+
     if (callback) callback();
-    if (isTemp) { try { fs.unlinkSync(filePath); } catch {} }
+    if (isTemp) try { fs.unlinkSync(filePath); } catch {}
 }
-if (!['--writedirectly', '--viewfilelist', '--learn', '--help', '-v', '--version'].includes(args[0])) {
+
+if (!args[0].startsWith('--')) {
     runFile(path.resolve(args[0]));
 }