bare-script 2.2.3 → 2.2.5

package/lib/bare.js

@@ -20,6 +20,7 @@ options:
   -h, --help          show this help message and exit
   -c, --code CODE     execute the BareScript code
   -d, --debug         enable debug mode
+  -s, --static        perform static analysis
   -v, --var VAR EXPR  set a global variable to an expression value`;
 
 
@@ -42,6 +43,7 @@ options:
  * @ignore
  */
 export async function main(options) {
+    let statusCode = 0;
     let currentFile = null;
     try {
         const args = parseArgs(options.argv);
@@ -85,7 +87,7 @@ export async function main(options) {
             currentFile = file;
 
             // Run the bare-script linter?
-            if (args.debug) {
+            if (args.static || args.debug) {
                 const warnings = lintScript(script);
                 const warningPrefix = `BareScript: Static analysis...`;
                 if (warnings.length === 0) {
@@ -95,13 +97,21 @@ export async function main(options) {
                     for (const warning of warnings) {
                         options.logFn(`BareScript:     ${warning}`);
                     }
+                    if (args.static) {
+                        throw Error('Static analysis failed');
+                    }
+                }
+
+                // Skip code execution if linter requested
+                if (args.static) {
+                    continue;
                 }
             }
 
             // Execute the script
             const timeBegin = performance.now();
             // eslint-disable-next-line no-await-in-loop
-            await executeScriptAsync(script, {
+            const result = await executeScriptAsync(script, {
                 'debug': args.debug ?? false,
                 'fetchFn': options.fetchFn,
                 'globals': args.variables,
@@ -110,20 +120,28 @@ export async function main(options) {
                 'urlFn': (url) => (rURL.test(url) || url.startsWith('/') ? url : `${file.slice(0, file.lastIndexOf('/') + 1)}${url}`)
 
             });
+            statusCode = (Number.isInteger(result) && result >= 0 && result <= 255 ? result : (result ? 1 : 0));
 
             // Log script execution end with timing
             if (args.debug) {
                 const timeEnd = performance.now();
                 options.logFn(`BareScript: Script executed in ${(timeEnd - timeBegin).toFixed(1)} milliseconds`);
             }
+
+            // Stop on error status code
+            if (statusCode !== 0) {
+                break;
+            }
         }
     } catch ({message}) {
-        const fileStr = (currentFile !== null ? `${currentFile}:\n` : '');
-        options.logFn(`${fileStr}${message}`);
-        return 1;
+        if (currentFile !== null) {
+            options.logFn(`${currentFile}:`);
+        }
+        options.logFn(message);
+        statusCode = 1;
     }
 
-    return 0;
+    return statusCode;
 }
 
 
@@ -154,6 +172,8 @@ export function parseArgs(argv) {
             args.debug = true;
         } else if (arg === '-h' || arg === '--help') {
             args.help = true;
+        } else if (arg === '-s' || arg === '--static') {
+            args.static = true;
         } else if (arg === '-v' || arg === '--var') {
             if (iArg + 2 >= argv.length) {
                 throw new Error(`Missing values for ${arg}`);

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "2.2.3",
+    "version": "2.2.5",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",