bare-script 2.2.1 → 2.2.3

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;
     },
 
@@ -59,7 +58,7 @@ export const scriptFunctions = {
     // $arg value: The value to find in the array
     // $arg index: Optional (default is 0). The index at which to start the search.
     // $return: The first index of the value in the array; -1 if not found.
-    'arrayIndexOf': ([array, value, index = 0]) => (Array.isArray(array) ? array.indexOf(value, index) : null),
+    'arrayIndexOf': ([array, value, index = 0]) => (Array.isArray(array) ? array.indexOf(value, index) : -1),
 
     // $function: arrayJoin
     // $group: 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
@@ -77,14 +76,14 @@ export const scriptFunctions = {
     // $arg index: Optional (default is the end of the array). The index at which to start the search.
     // $return: The last index of the value in the array; -1 if not found.
     'arrayLastIndexOf': ([array, value, index = null]) => (
-        Array.isArray(array) ? (index === null ? array.lastIndexOf(value) : array.lastIndexOf(value, index)) : null
+        Array.isArray(array) ? (index === null ? array.lastIndexOf(value) : array.lastIndexOf(value, index)) : -1
     ),
 
     // $function: arrayLength
     // $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;
     },
 
 
@@ -774,7 +776,7 @@ export const scriptFunctions = {
     // $arg searchString: The search string
     // $arg index: Optional (default is 0). The index at which to start the search.
     // $return: The first index of the search string; -1 if not found.
-    'stringIndexOf': ([string, searchString, index]) => (typeof string === 'string' ? string.indexOf(searchString, index) : null),
+    'stringIndexOf': ([string, searchString, index]) => (typeof string === 'string' ? string.indexOf(searchString, index) : -1),
 
     // $function: stringLastIndexOf
     // $group: String
@@ -783,15 +785,13 @@ export const scriptFunctions = {
     // $arg searchString: The search string
     // $arg index: Optional (default is the end of the string). The index at which to start the search.
     // $return: The last index of the search string; -1 if not found.
-    'stringLastIndexOf': ([string, searchString, index]) => (
-        typeof string === 'string' ? string.lastIndexOf(searchString, index) : null
-    ),
+    'stringLastIndexOf': ([string, searchString, index]) => (typeof string === 'string' ? string.lastIndexOf(searchString, index) : -1),
 
     // $function: stringLength
     // $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.1",
+    "version": "2.2.3",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",
@@ -31,7 +31,7 @@
     },
     "devDependencies": {
         "c8": "~8.0",
-        "eslint": "~8.48",
+        "eslint": "~8.50",
         "jsdoc": "~4.0"
     }
 }