@bbn/bbn 1.0.433 → 1.0.436

package/dist/fn/ajax/abortURL.js

@@ -1,5 +1,5 @@
 import each from '../loop/each.js';
-import filter from '../object/filter.js';
+import _filter from '../object/_filter.js';
 /**
  * Aborts (client side) all the XHR using the given URL if it still exists.
  *
@@ -21,7 +21,7 @@ import filter from '../object/filter.js';
  * @returns  {undefined}
  */
 export default function abortURL(url) {
-    each(filter(bbn.env.loaders, { url: url }), function (a) {
+    each(_filter(bbn.env.loaders, { url: url }), function (a) {
         if (a && a.source) {
             a.source.cancel('Operation canceled by the user.');
         }

package/dist/fn/ajax/setNavigationVars.js

@@ -1,5 +1,4 @@
 import substr from '../string/substr.js';
-import filter from '../object/filter.js';
 import extend from '../object/extend.js';
 import html2text from '../html/html2text.js';
 /**
@@ -35,9 +34,7 @@ export default function setNavigationVars(url, title, data, repl) {
     // Path does not
     bbn.env.path = substr(bbn.env.url, bbn.env.root.length);
     // Params will include each part of the URL
-    bbn.env.params = filter(bbn.env.path.split('/'), function (v) {
-        return v !== '';
-    });
+    bbn.env.params = bbn.env.path.split('/').filter(function (v) { return v !== ''; });
     // Managing history
     var h = window.history;
     if (h) {

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

@@ -0,0 +1,49 @@
+import { Filter } from './filterToConditions.js';
+/**
+ * Returns a new array with only the data matching the given filter.
+ *
+ * The filtering arguments follow the same scheme as bbn.fn.search.
+ *
+ * @method   _filter
+ * @global
+ * @example
+ * ```javascript
+ * let ar = [
+ *   {name: "Raiders of the lost ark", director: "Steven Spielberg", year: 1981, id: 589},
+ *   {name: "Goonies", director: "Richard Donner", year: 1985, id: 689},
+ *   {name: "Star wars", director: "George Lucas", year: 1977, id: 256},
+ *   {name: "Jaws", director: "Steven Spielberg", year: 1975, id: 423}
+ * ];
+ * bbn.fn.filter(ar, {director: "Steven Spielberg"});
+ * // [
+ * //   {name: "Raiders of the lost ark", director: "Steven Spielberg", year: 1981, id: 589},
+ * //   {name: "Jaws", director: "Steven Spielberg", year: 1975, id: 423}
+ * // ]
+ * bbn.fn.filter(ar, "director", "Steven Spielberg");
+ * // Same result as the previous example
+ * bbn.fn.filter(ar, {
+ *   logic: "OR",
+ *   conditions: [
+ *     {
+ *        field: "director",
+ *        value: "Richard Donner"
+ *     }, {
+ *        field: "director",
+ *        value: "George Lucas"
+ *     }
+ *   ]
+ * );
+ * // [
+ * //   {name: "Goonies", director: "Richard Donner", year: 1985, id: 689},
+ * //   {name: "Star wars", director: "George Lucas", year: 1977, id: 256},
+ * // ]
+ * ```
+ *
+ * @memberof bbn.fn
+ * @param    {Array}                    arr       The subject array
+ * @param    {(String|Object|Function)} prop      A property's name or a filter object or function
+ * @param    {*}                        val       The value with which comparing the given property
+ * @param    {String}                   operator  The operator to use for comparison with the value as used in bbn.fn.compare
+ * @returns  {Array}                    A new filtered array
+ */
+export default function _filter(arr: any[], prop: Filter | object | string | ((a: any, i: string | number | symbol) => boolean), val?: any, operator?: string, limit?: number): any[];

package/dist/fn/object/_filter.js

@@ -0,0 +1,100 @@
+import isArray from '../type/isArray.js';
+import compareConditions from './compareConditions.js';
+/**
+ * Returns a new array with only the data matching the given filter.
+ *
+ * The filtering arguments follow the same scheme as bbn.fn.search.
+ *
+ * @method   _filter
+ * @global
+ * @example
+ * ```javascript
+ * let ar = [
+ *   {name: "Raiders of the lost ark", director: "Steven Spielberg", year: 1981, id: 589},
+ *   {name: "Goonies", director: "Richard Donner", year: 1985, id: 689},
+ *   {name: "Star wars", director: "George Lucas", year: 1977, id: 256},
+ *   {name: "Jaws", director: "Steven Spielberg", year: 1975, id: 423}
+ * ];
+ * bbn.fn.filter(ar, {director: "Steven Spielberg"});
+ * // [
+ * //   {name: "Raiders of the lost ark", director: "Steven Spielberg", year: 1981, id: 589},
+ * //   {name: "Jaws", director: "Steven Spielberg", year: 1975, id: 423}
+ * // ]
+ * bbn.fn.filter(ar, "director", "Steven Spielberg");
+ * // Same result as the previous example
+ * bbn.fn.filter(ar, {
+ *   logic: "OR",
+ *   conditions: [
+ *     {
+ *        field: "director",
+ *        value: "Richard Donner"
+ *     }, {
+ *        field: "director",
+ *        value: "George Lucas"
+ *     }
+ *   ]
+ * );
+ * // [
+ * //   {name: "Goonies", director: "Richard Donner", year: 1985, id: 689},
+ * //   {name: "Star wars", director: "George Lucas", year: 1977, id: 256},
+ * // ]
+ * ```
+ *
+ * @memberof bbn.fn
+ * @param    {Array}                    arr       The subject array
+ * @param    {(String|Object|Function)} prop      A property's name or a filter object or function
+ * @param    {*}                        val       The value with which comparing the given property
+ * @param    {String}                   operator  The operator to use for comparison with the value as used in bbn.fn.compare
+ * @returns  {Array}                    A new filtered array
+ */
+export default function _filter(arr, prop, val, operator, limit) {
+    if (val === void 0) { val = null; }
+    if (operator === void 0) { operator = '='; }
+    if (limit === void 0) { limit = 0; }
+    if (!isArray(arr)) {
+        try {
+            arr = Array.from(arr);
+        }
+        catch (_a) {
+            bbn.fn.log("NOT ARRAY", arr);
+            throw new Error('Error in filter: The first argument must be an array');
+        }
+    }
+    var cfg = {};
+    var res = [];
+    var isFn = typeof (prop) === 'function';
+    if (!prop || !arr.length) {
+        return arr;
+    }
+    if (typeof prop === 'object') {
+        operator = val;
+        cfg = prop;
+    }
+    else if (typeof prop === 'string') {
+        cfg[prop] = val;
+    }
+    else if (!isFn) {
+        throw new Error('Search function error: The prop argument should be a string or an object');
+    }
+    var fn;
+    if (typeof (prop) === 'function') {
+        fn = prop;
+    }
+    else {
+        fn = function (a, i) { return compareConditions(a, cfg); };
+    }
+    for (var i = 0; i < arr.length; i++) {
+        bbn.env._enumerated.push(true);
+        if (fn(arr[i], i)) {
+            bbn.env._enumerated.pop();
+            res.push(arr[i]);
+            bbn.env._enumerated.push(true);
+            if (limit && (res.length >= limit)) {
+                break;
+            }
+        }
+        bbn.env._enumerated.pop();
+    }
+    return res;
+}
+;

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

@@ -1,11 +1,5 @@
-interface Condition {
-    field: string;
-    operator?: string;
-    value?: any;
-}
 interface Filter {
-    conditions?: Condition[];
-    logic?: string;
+    [key: string]: any;
 }
 /**
  * Converts the given object 'filter' to a valid format of condition.

package/dist/fn/object/getFieldValues.js

@@ -1,5 +1,5 @@
 import checkType from '../type/checkType.js';
-import filter from './filter.js';
+import _filter from './_filter.js';
 import each from '../loop/each.js';
 /**
  * Returns all the unique values of the given field (property) from the first object matching the given filter in an array.
@@ -32,7 +32,7 @@ import each from '../loop/each.js';
 export default function getFieldValues(arr, field, prop, val, operator) {
     checkType(field, 'string');
     if (prop) {
-        arr = filter(arr, prop, val, operator);
+        arr = _filter(arr, prop, val, operator);
     }
     var res = [];
     each(arr, function (a) { return (res.indexOf(a[field]) === -1 ? res.push(a[field]) : null); });

package/dist/fn/object/search.js

@@ -114,9 +114,10 @@ export default function search(arr, prop, val, operator, startFrom, backward) {
     }
     var filter;
     var isFn = false;
+    var fn;
     if (!prop) {
         isFn = true;
-        filter = function (a) {
+        fn = function (a) {
             return compareConditions({ value: a }, filterToConditions({
                 logic: 'AND',
                 conditions: [
@@ -145,7 +146,7 @@ export default function search(arr, prop, val, operator, startFrom, backward) {
         startFrom = typeof (val) === 'number' ? val : (backward ? arr.length - 1 : 0);
         if (typeof prop === 'function') {
             isFn = true;
-            filter = prop;
+            fn = prop;
         }
         else if (isObject(prop)) {
             if ('field' in prop && 'value' in prop) {
@@ -184,37 +185,30 @@ export default function search(arr, prop, val, operator, startFrom, backward) {
         if (typeof startFrom !== 'number') {
             startFrom = backward ? arr.length - 1 : 0;
         }
-        if (typeof filter === 'function') {
-            if (backward) {
-                for (var i = startFrom; i >= 0; i--) {
-                    if (filter(arr[i])) {
-                        res = i;
-                    }
-                }
-            }
-            else {
-                for (var i = startFrom; i < arr.length; i++) {
-                    if (filter(arr[i])) {
-                        res = i;
-                    }
+        if (!fn) {
+            var subfilter_1 = filterToConditions(filter);
+            fn = function (ele) { return compareConditions(ele, subfilter_1); };
+        }
+        if (backward) {
+            for (var i = startFrom; i >= 0; i--) {
+                bbn.env._enumerated.push(true);
+                if (fn(arr[i])) {
+                    bbn.env._enumerated.pop();
+                    arr[i];
+                    return i;
                 }
+                bbn.env._enumerated.pop();
             }
         }
         else {
-            filter = filterToConditions(filter);
-            if (backward) {
-                for (var i = startFrom; i >= 0; i--) {
-                    if (compareConditions(arr[i], filter)) {
-                        res = i;
-                    }
-                }
-            }
-            else {
-                for (var i = startFrom; i < arr.length; i++) {
-                    if (compareConditions(arr[i], filter)) {
-                        res = i;
-                    }
+            for (var i = startFrom; i < arr.length; i++) {
+                bbn.env._enumerated.push(true);
+                if (fn(arr[i])) {
+                    bbn.env._enumerated.pop();
+                    arr[i];
+                    return i;
                 }
+                bbn.env._enumerated.pop();
             }
         }
     }

package/dist/fn/object/unique.js

@@ -15,8 +15,6 @@
  * @returns  {Array}
  */
 export default function unique(arr) {
-    return arr.filter(function (el, index, ar) {
-        return index === ar.indexOf(el);
-    });
+    return arr.filter(function (el, index, ar) { return index === ar.indexOf(el); });
 }
 ;

package/package.json

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