bare-script 2.2.0 → 2.2.2

package/lib/library.js

@@ -59,7 +59,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
@@ -77,7 +77,7 @@ 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
@@ -160,7 +160,7 @@ export const scriptFunctions = {
     // $group: Data
     // $doc: Aggregate a data array
     // $arg data: The data array
-    // $arg aggregation: The [aggregation model](model.html#var.vName='Aggregation')
+    // $arg aggregation: The [aggregation model](https://craigahobbs.github.io/bare-script/library/model.html#var.vName='Aggregation')
     // $return: The aggregated data array
     'dataAggregate': ([data, aggregation]) => aggregateData(data, validateAggregation(aggregation)),
 
@@ -599,7 +599,7 @@ export const scriptFunctions = {
     // $arg defaultValue: The default value (optional)
     // $return: The value or null if the key does not exist
     'objectGet': ([object, key, defaultValue = null]) => (
-        object !== null && typeof object === 'object' ? (Object.hasOwn(object, key) ? object[key] : defaultValue) : null
+        object !== null && typeof object === 'object' ? (Object.hasOwn(object, key) ? object[key] : defaultValue) : defaultValue
     ),
 
     // $function: objectHas
@@ -774,7 +774,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,9 +783,7 @@ 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

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "2.2.0",
+    "version": "2.2.2",
     "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"
     }
 }