@mojir/lits 2.5.0 → 2.5.1

package/dist/cli/cli.js

@@ -7,7 +7,7 @@ var readline = require('node:readline');
 var os = require('node:os');
 var process$1 = require('node:process');
 
-var version = "2.5.0";
+var version = "2.5.1";
 
 function getCodeMarker(sourceCodeInfo) {
     if (!sourceCodeInfo.position || !sourceCodeInfo.code)
@@ -34668,6 +34668,7 @@ const HIST_SIZE = 1000;
 const PROMPT = fmt.bright.gray('> ');
 const historyResults = [];
 const formatValue = getInlineCodeFormatter(fmt);
+const booleanFlags = new Set(['-s', '--silent', '--pure']);
 const commands = ['`help', '`quit', '`builtins', '`context'];
 const expressionRegExp = new RegExp(`^(.*\\(\\s*)(${polishSymbolFirstCharacterClass}${polishSymbolCharacterClass}*)$`);
 const nameRegExp = new RegExp(`^(.*?)(${polishSymbolFirstCharacterClass}${polishSymbolCharacterClass}*)$`);
@@ -34846,14 +34847,26 @@ function setReplHistoryVariables(context) {
 }
 function parseOption(args, i) {
     const option = args[i];
-    if (option === '-s') {
-        return { option, argument: null, count: 1 };
-    }
-    if (/^-[a-z]$/i.test(option))
+    // Short option: -x
+    if (/^-[a-z]$/i.test(option)) {
+        if (booleanFlags.has(option)) {
+            return { option, argument: null, count: 1 };
+        }
         return { option, argument: args[i + 1] ?? null, count: 2 };
+    }
+    // Long option: --foo or --foo=value
     const match = /^(--[a-z-]+)(?:=(.*))?$/i.exec(option);
-    if (match)
-        return { option: match[1], argument: match[2] ?? null, count: 1 };
+    if (match) {
+        const name = match[1];
+        const inlineArg = match[2];
+        if (inlineArg !== undefined) {
+            return { option: name, argument: inlineArg, count: 1 };
+        }
+        if (booleanFlags.has(name)) {
+            return { option: name, argument: null, count: 1 };
+        }
+        return { option: name, argument: args[i + 1] ?? null, count: 2 };
+    }
     return null;
 }
 function parseContextOptions(args, startIndex) {
@@ -34928,11 +34941,19 @@ function parseRunEvalOptions(args, startIndex) {
     let context = {};
     let printResult = true;
     let pure = false;
+    let positional = null;
     let i = startIndex;
     while (i < args.length) {
         const parsed = parseOption(args, i);
-        if (!parsed)
-            break;
+        if (!parsed) {
+            if (positional !== null) {
+                printErrorMessage(`Unexpected argument "${args[i]}"`);
+                process.exit(1);
+            }
+            positional = args[i];
+            i += 1;
+            continue;
+        }
         switch (parsed.option) {
             case '-c':
             case '--context':
@@ -34959,11 +34980,7 @@ function parseRunEvalOptions(args, startIndex) {
                 process.exit(1);
         }
     }
-    if (i < args.length) {
-        printErrorMessage(`Unknown argument "${args[i]}"`);
-        process.exit(1);
-    }
-    return { context, printResult, pure, nextIndex: i };
+    return { context, printResult, pure, positional, nextIndex: i };
 }
 function processArguments(args) {
     // Global flags (no subcommand)
@@ -34979,45 +34996,43 @@ function processArguments(args) {
     }
     switch (first) {
         case 'run': {
-            const filename = args[1];
-            if (!filename || filename.startsWith('-')) {
+            const { positional: filename, context, printResult, pure } = parseRunEvalOptions(args, 1);
+            if (!filename) {
                 printErrorMessage('Missing filename after "run"');
                 process.exit(1);
             }
-            const { context, printResult, pure } = parseRunEvalOptions(args, 2);
             return { subcommand: 'run', filename, context, printResult, pure };
         }
         case 'run-bundle': {
-            const filename = args[1];
-            if (!filename || filename.startsWith('-')) {
+            const { positional: filename, context, printResult, pure } = parseRunEvalOptions(args, 1);
+            if (!filename) {
                 printErrorMessage('Missing filename after "run-bundle"');
                 process.exit(1);
             }
-            const { context, printResult, pure } = parseRunEvalOptions(args, 2);
             return { subcommand: 'run-bundle', filename, context, printResult, pure };
         }
         case 'eval': {
-            const expression = args[1];
-            if (!expression || expression.startsWith('-')) {
+            const { positional: expression, context, printResult, pure } = parseRunEvalOptions(args, 1);
+            if (!expression) {
                 printErrorMessage('Missing expression after "eval"');
                 process.exit(1);
             }
-            const { context, printResult, pure } = parseRunEvalOptions(args, 2);
             return { subcommand: 'eval', expression, context, printResult, pure };
         }
         case 'bundle': {
-            const filename = args[1];
-            if (!filename || filename.startsWith('-')) {
-                printErrorMessage('Missing filename after "bundle"');
-                process.exit(1);
-            }
+            let filename = null;
             let output = null;
-            let i = 2;
+            let i = 1;
             while (i < args.length) {
                 const parsed = parseOption(args, i);
                 if (!parsed) {
-                    printErrorMessage(`Unknown argument "${args[i]}"`);
-                    process.exit(1);
+                    if (filename !== null) {
+                        printErrorMessage(`Unexpected argument "${args[i]}"`);
+                        process.exit(1);
+                    }
+                    filename = args[i];
+                    i += 1;
+                    continue;
                 }
                 switch (parsed.option) {
                     case '-o':
@@ -35034,21 +35049,26 @@ function processArguments(args) {
                         process.exit(1);
                 }
             }
+            if (!filename) {
+                printErrorMessage('Missing filename after "bundle"');
+                process.exit(1);
+            }
             return { subcommand: 'bundle', filename, output };
         }
         case 'test': {
-            const filename = args[1];
-            if (!filename || filename.startsWith('-')) {
-                printErrorMessage('Missing filename after "test"');
-                process.exit(1);
-            }
+            let filename = null;
             let testPattern = null;
-            let i = 2;
+            let i = 1;
             while (i < args.length) {
                 const parsed = parseOption(args, i);
                 if (!parsed) {
-                    printErrorMessage(`Unknown argument "${args[i]}"`);
-                    process.exit(1);
+                    if (filename !== null) {
+                        printErrorMessage(`Unexpected argument "${args[i]}"`);
+                        process.exit(1);
+                    }
+                    filename = args[i];
+                    i += 1;
+                    continue;
                 }
                 switch (parsed.option) {
                     case '--pattern':
@@ -35064,6 +35084,10 @@ function processArguments(args) {
                         process.exit(1);
                 }
             }
+            if (!filename) {
+                printErrorMessage('Missing filename after "test"');
+                process.exit(1);
+            }
             return { subcommand: 'test', filename, testPattern };
         }
         case 'repl': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojir/lits",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Lits is a pure functional programming language implemented in TypeScript",
   "author": "Albert Mojir",
   "license": "MIT",