bare-script 2.2.2 → 2.2.4

package/lib/bare.js

@@ -42,6 +42,7 @@ options:
  * @ignore
  */
 export async function main(options) {
+    let statusCode = 0;
     let currentFile = null;
     try {
         const args = parseArgs(options.argv);
@@ -101,7 +102,7 @@ export async function main(options) {
             // 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 +111,26 @@ 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;
+        statusCode = 1;
     }
 
-    return 0;
+    return statusCode;
 }
 
 

package/lib/library.js

@@ -28,7 +28,7 @@ export const scriptFunctions = {
     // $doc: Create a copy of an array
     // $arg array: The array to copy
     // $return: The array copy
-    'arrayCopy': ([array]) => (Array.isArray(array) ? [...array] : null),
+    'arrayCopy': ([array]) => (Array.isArray(array) ? [...array] : []),
 
     // $function: arrayExtend
     // $group: Array
@@ -37,10 +37,9 @@ export const scriptFunctions = {
     // $arg array2: The array to extend with
     // $return: The extended array
     'arrayExtend': ([array, array2]) => {
-        if (!Array.isArray(array)) {
-            return null;
+        if (Array.isArray(array) && Array.isArray(array2)) {
+            array.push(...array2);
         }
-        array.push(...array2);
         return array;
     },
 
@@ -67,7 +66,7 @@ export const scriptFunctions = {
     // $arg array: The array
     // $arg separator: The separator string
     // $return: The joined string
-    'arrayJoin': ([array, separator]) => (Array.isArray(array) ? array.join(separator) : null),
+    'arrayJoin': ([array, separator]) => (Array.isArray(array) ? array.join(separator) : ''),
 
     // $function: arrayLastIndexOf
     // $group: Array
@@ -84,7 +83,7 @@ export const scriptFunctions = {
     // $group: Array
     // $doc: Get the length of an array
     // $arg array: The array
-    // $return: The array's length
+    // $return: The array's length; null if not an array
     'arrayLength': ([array]) => (Array.isArray(array) ? array.length : null),
 
     // $function: arrayNew
@@ -114,8 +113,13 @@ export const scriptFunctions = {
     // $doc: Add one or more values to the end of the array
     // $arg array: The array
     // $arg values: The values to add to the end of the array
-    // $return: The new length of the array
-    'arrayPush': ([array, ...values]) => (Array.isArray(array) ? array.push(...values) : null),
+    // $return: The array
+    'arrayPush': ([array, ...values]) => {
+        if (Array.isArray(array)) {
+            array.push(...values);
+        }
+        return array;
+    },
 
     // $function: arraySet
     // $group: Array
@@ -127,9 +131,8 @@ export const scriptFunctions = {
     'arraySet': ([array, index, value]) => {
         if (Array.isArray(array)) {
             array[index] = value;
-            return value;
         }
-        return null;
+        return value;
     },
 
     // $function: arraySlice
@@ -568,9 +571,9 @@ export const scriptFunctions = {
     'objectAssign': ([object, object2]) => {
         if (object !== null && typeof object === 'object' && !Array.isArray(object) &&
             object2 !== null && typeof object2 === 'object' && !Array.isArray(object2)) {
-            return Object.assign(object, object2);
+            Object.assign(object, object2);
         }
-        return null;
+        return object;
     },
 
     // $function: objectCopy
@@ -578,7 +581,7 @@ export const scriptFunctions = {
     // $doc: Create a copy of an object
     // $arg object: The object to copy
     // $return: The object copy
-    'objectCopy': ([object]) => (object !== null && typeof object === 'object' && !Array.isArray(object) ? {...object} : null),
+    'objectCopy': ([object]) => (object !== null && typeof object === 'object' && !Array.isArray(object) ? {...object} : {}),
 
     // $function: objectDelete
     // $group: Object
@@ -614,7 +617,7 @@ export const scriptFunctions = {
     // $group: Object
     // $doc: Get an object's keys
     // $arg object: The object
-    // $return: The array of keys
+    // $return: The array of keys; null if not an object
     'objectKeys': ([object]) => (object !== null && typeof object === 'object' && !Array.isArray(object) ? Object.keys(object) : null),
 
     // $function: objectNew
@@ -640,9 +643,8 @@ export const scriptFunctions = {
     'objectSet': ([object, key, value]) => {
         if (object !== null && typeof object === 'object' && !Array.isArray(object)) {
             object[key] = value;
-            return value;
         }
-        return null;
+        return value;
     },
 
 
@@ -789,7 +791,7 @@ export const scriptFunctions = {
     // $group: String
     // $doc: Get the length of a string
     // $arg string: The string
-    // $return: The string's length
+    // $return: The string's length; null if not a string
     'stringLength': ([string]) => (typeof string === 'string' ? string.length : null),
 
     // $function: stringLower

package/package.json

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