@bbn/bbn 1.0.187 → 1.0.189

package/dist/fn/ajax/_addLoader.d.ts

@@ -8,9 +8,9 @@
  *
  * @param    {String}  requestId
  * @param    {Promise} prom
- * @param    {Object}  source
+ * @param    {Object}  aborter
  *
  * @returns  {Number}  The timestamp (in ms)
  */
-declare const _addLoader: (requestId: any, prom: any, source: any) => number;
+declare const _addLoader: (requestId: any, prom: any, aborter: any) => number;
 export { _addLoader };

package/dist/fn/ajax/_addLoader.js

@@ -9,11 +9,11 @@ import { substr } from '../string/substr.js';
  *
  * @param    {String}  requestId
  * @param    {Promise} prom
- * @param    {Object}  source
+ * @param    {Object}  aborter
  *
  * @returns  {Number}  The timestamp (in ms)
  */
-var _addLoader = function (requestId, prom, source) {
+var _addLoader = function (requestId, prom, aborter) {
     /** @var {Number} tst Current timestamp */
     var tst = new Date().getTime();
     /** @var {String} url The original URL (part of requestId before : and md5) */
@@ -23,7 +23,7 @@ var _addLoader = function (requestId, prom, source) {
         key: requestId,
         url: url,
         loader: prom,
-        source: source,
+        aborter: aborter,
         loading: true,
         error: false,
         abort: false,

package/dist/fn/ajax/abort.js

@@ -23,14 +23,11 @@ import { getLoader } from './getLoader.js';
  */
 var abort = function (requestId) {
     var loader = getLoader(requestId);
-    if (loader && loader.source) {
-        //_deleteLoader(requestId);
-        loader.source.cancel('Operation canceled by the user.');
+    if (loader === null || loader === void 0 ? void 0 : loader.aborter) {
+        loader.aborter.abort('Operation canceled by the user.');
     }
-    /*
-      else {
+    else {
         throw new Error("Impossible to find the loader " + requestId);
-      }
-      */
+    }
 };
 export { abort };

package/dist/fn/ajax/ajax.js

@@ -107,11 +107,10 @@ var ajax = function (url, datatype, data, success, failure, abort) {
         if (bbn.env.token) {
             extend(data || {}, { _bbn_token: bbn.env.token });
         }
-        var cancelToken = axios.CancelToken;
-        var source = cancelToken.source();
+        var aborter = new AbortController();
         var options = {
             responseType: datatype,
-            cancelToken: source.token,
+            signal: aborter.signal
         };
         if (datatype === "text") {
             options['headers'] = {
@@ -164,7 +163,7 @@ var ajax = function (url, datatype, data, success, failure, abort) {
                 }
             }
         });
-        var tst_1 = _addLoader(requestId_1, loader_1, source);
+        var tst_1 = _addLoader(requestId_1, loader_1, aborter);
         bbn.fn.defaultStartLoadingFunction(url, tst_1, data, requestId_1);
         return loader_1;
     }

package/dist/fn/object/mutateArray.js

@@ -1,5 +1,7 @@
 import { isArray } from '../type/isArray.js';
 import { hash } from '../string/hash.js';
+import { isSame } from '../type/isSame.js';
+import { search } from './search.js';
 var mutateArray = function (a1, a2) {
     if (!isArray(a1, a2)) {
         throw new TypeError('mutateArray can only be called with arrays');
@@ -17,10 +19,11 @@ var mutateArray = function (a1, a2) {
             a1.splice(i, 1);
         }
     }
-    var _loop_1 = function (j) {
-        if (j >= a1.length || hash(a1[j]) !== hash(a1Ordered[j])) {
+    // Insert or move items to match the order of a2
+    for (var j = 0; j < a1Ordered.length; j++) {
+        if ((j >= a1.length) || !isSame(a1[j], a1Ordered[j])) {
             // Find the index of the item in a1, if it exists
-            var indexInA1 = a1.findIndex(function (item) { return hash(item) === hash(a1Ordered[j]); });
+            var indexInA1 = search(a1, a1Ordered[j]);
             if (indexInA1 !== -1) {
                 // Move the item to the correct position if it already exists in a1
                 var itemToMove = a1.splice(indexInA1, 1)[0];
@@ -31,10 +34,6 @@ var mutateArray = function (a1, a2) {
                 a1.splice(j, 0, a1Ordered[j]);
             }
         }
-    };
-    // Insert or move items to match the order of a2
-    for (var j = 0; j < a1Ordered.length; j++) {
-        _loop_1(j);
     }
     // If a1 has extra items at the end (not present in a2), remove them
     if (a1.length > a1Ordered.length) {

package/dist/fn.d.ts

@@ -1,5 +1,5 @@
 declare const fn: {
-    _addLoader: (requestId: any, prom: any, source: any) => number;
+    _addLoader: (requestId: any, prom: any, aborter: any) => number;
     _compareValues: (a: any, b: any, prop: any, dir?: string) => 0 | 1 | -1;
     _deleteLoader: (requestId: any, res?: any, isAbort?: boolean) => boolean;
     abort: (requestId: any) => void;

package/package.json

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