@bbn/bbn 1.0.374 → 1.0.375

package/dist/fn/object/search.d.ts

@@ -97,4 +97,4 @@ import { Filter } from './filterToConditions.js';
  * @param    {Number}                   startFrom The index from which the search should start
  * @returns  {Number}                   The index if found, otherwise -1
  */
-export default function search(arr: any[], prop: Filter | object | string | ((a: any, i: string | number | symbol) => boolean), val?: any, operator?: number | string, startFrom?: boolean | number, backward?: boolean): number;
+export default function search(arr: any[], prop: Filter | object | string | ((a: any, i: string | number | symbol) => boolean), val?: any, operator?: number | string | boolean, startFrom?: boolean | number, backward?: boolean): number;

package/dist/fn/object/search.js

@@ -2,8 +2,7 @@ import isIterable from '../type/isIterable.js';
 import compareConditions from './compareConditions.js';
 import { filterToConditions } from './filterToConditions.js';
 import isObject from '../type/isObject.js';
-import numProperties from './numProperties.js';
-import isNumber from '../type/isNumber.js';
+import isArray from '../type/isArray.js';
 /**
  * Retrieves the index of the array's first element corresponding to the given filter.
  *
@@ -115,6 +114,9 @@ export default function search(arr, prop, val, operator, startFrom, backward) {
     }
     var filter;
     var isFn = false;
+    if (!prop) {
+        throw new Error(bbn._('The second argument for a search cannot be null or undefined'));
+    }
     if (typeof prop === 'string') {
         filter = {
             conditions: [
@@ -126,38 +128,32 @@ export default function search(arr, prop, val, operator, startFrom, backward) {
             ]
         };
     }
-    else if (!prop) {
-        isFn = true;
-        filter = function (a) {
-            return compareConditions({ value: a }, filterToConditions({
-                logic: 'AND',
-                conditions: [
-                    {
-                        field: 'value',
-                        operator: operator || '=',
-                        value: val,
-                    },
-                ],
-            }));
-        };
-    }
     else {
-        backward = startFrom === true ? true : false;
-        startFrom = typeof (operator) === 'number' ? operator : (backward ? arr.length - 1 : 0);
-        operator = val;
-        if (isObject(prop)) {
-            filter = prop;
-        }
-        else if (typeof (prop) === 'function') {
+        backward = operator === true ? true : false;
+        startFrom = typeof (val) === 'number' ? val : (backward ? arr.length - 1 : 0);
+        if (typeof prop === 'function') {
             isFn = true;
             filter = prop;
         }
-    }
-    if (isFn || (isObject(filter) && numProperties(filter))) {
-        if (isNumber(operator)) {
-            startFrom = typeof (operator) === 'number' ? operator : 0;
-            operator = undefined;
+        else if (isObject(prop)) {
+            if (!('conditions' in prop)) {
+                filter = {
+                    conditions: [prop],
+                    logic: 'AND'
+                };
+            }
+            else {
+                filter = prop;
+            }
         }
+        else if (isArray(prop)) {
+            filter = {
+                conditions: prop,
+                logic: 'AND'
+            };
+        }
+    }
+    if (isFn || filter) {
         if (typeof startFrom !== 'number') {
             startFrom = backward ? arr.length - 1 : 0;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbn/bbn",
-  "version": "1.0.374",
+  "version": "1.0.375",
   "description": "Javascript toolkit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",