@bbn/bbn 1.0.341 → 1.0.343

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

@@ -54,4 +54,4 @@
  *
  * @returns  {Promise}  The Promise created by the generated XHR.
  */
-export default function ajax(url: any, datatype?: any, data?: any, success?: any, failure?: any, abort?: any): any;
+export default function ajax(...args: any[]): Promise<any>;

package/dist/fn/ajax/ajax.js

@@ -1,9 +1,43 @@
-import isObject from '../type/isObject.js';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import replaceAll from '../string/replaceAll.js';
 import getRequestId from './getRequestId.js';
 import getLoader from './getLoader.js';
 import extend from '../object/extend.js';
-import numProperties from '../object/numProperties.js';
 import _deleteLoader from './_deleteLoader.js';
 import isFunction from '../type/isFunction.js';
 import _addLoader from './_addLoader.js';
@@ -63,110 +97,165 @@ import _addLoader from './_addLoader.js';
  *
  * @returns  {Promise}  The Promise created by the generated XHR.
  */
-export default function ajax(url, datatype, data, success, failure, abort) {
-    if (datatype === void 0) { datatype = null; }
-    if (data === void 0) { data = null; }
-    if (success === void 0) { success = null; }
-    if (failure === void 0) { failure = null; }
-    if (abort === void 0) { abort = null; }
-    if (arguments.length === 1 && url && typeof url === "object" && url.url) {
-        if (url.abort) {
-            abort = url.abort;
-        }
-        if (url.failure) {
-            failure = url.failure;
-        }
-        if (url.success) {
-            success = url.success;
-        }
-        if (url.data) {
-            data = url.data;
-        }
-        if (url.datatype) {
-            datatype = url.datatype;
-        }
-        url = url.url;
+export default function ajax() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
     }
-    if (!url) {
-        return;
-    }
-    if (url && typeof url === "string") {
-        if (url.indexOf("://") === -1) {
-            // Prevent protocol mismatch by Axios
-            url = replaceAll("//", "/", url);
-        }
-        if (!datatype) {
-            datatype = "json";
-        }
-        var requestId_1 = getRequestId(url, data, datatype);
-        var loaderObj = getLoader(requestId_1);
-        if (loaderObj === null || loaderObj === void 0 ? void 0 : loaderObj.loader) {
-            return loaderObj.loader;
-        }
-        if (bbn.env.token) {
-            extend(data || {}, { _bbn_token: bbn.env.token });
-        }
-        var aborter = new AbortController();
-        var options = {
-            responseType: datatype,
-            signal: aborter.signal
-        };
-        if (datatype === "text") {
-            options['headers'] = {
-                accept: "text/javascript",
-                "Content-Type": "text/javascript",
-            };
-        }
-        var args = [url];
-        if (isObject(data) && numProperties(data) > 0) {
-            args.push(data);
-        }
-        args.push(options);
-        var axiosMethod = args.length === 2 ? "get" : "post";
-        var loader_1 = axios[axiosMethod]
-            .apply(null, args)
-            .then(function (res) {
-            _deleteLoader(requestId_1, res);
-            bbn.fn.defaultEndLoadingFunction(url, tst_1, data, res);
-            switch (res.status) {
-                case 200:
-                    if (isFunction(success)) {
-                        //bbn.fn.log(["THERE US A SUCCESS FUNCTION", res, loader]);
-                        success(res.data, res.headers);
-                    }
-                    break;
-                default:
-                    //bbn.fn.log(["THIS IS THE DEFAULT FUNCTION", res, loader]);
-                    bbn.fn.defaultAjaxErrorFunction(loader_1, res);
-            }
-            return res;
-        })
-            .catch(function (err) {
-            var isAbort = axios.isCancel(err);
-            _deleteLoader(requestId_1, err.message || err.response.data, isAbort);
-            bbn.fn.defaultEndLoadingFunction(url, tst_1, data, err);
-            if (isAbort) {
-                var ok = 1;
-                if (isFunction(abort)) {
-                    ok = abort(err.message, url);
-                }
-                if (ok) {
-                    bbn.fn.defaultAjaxAbortFunction(err.message, url);
+    return __awaiter(this, void 0, void 0, function () {
+        var url, datatype, data, success, failure, abort, method, requestId_1, loaderObj, aborter, contentType, options, loader_1, tst_1;
+        return __generator(this, function (_a) {
+            datatype = null;
+            data = null;
+            success = null;
+            failure = null;
+            abort = null;
+            method = null;
+            if (args.length === 1 && args[0] && (typeof args[0] === "object") && args[0].url) {
+                url = args[0].url;
+                if (args[0].datatype) {
+                    datatype = args[0].datatype;
+                }
+                if (args[0].data) {
+                    data = args[0].data;
+                }
+                if (args[0].success) {
+                    success = args[0].success;
+                }
+                if (args[0].failure) {
+                    failure = args[0].failure;
+                }
+                if (args[0].abort) {
+                    abort = args[0].abort;
+                }
+                if (args[0].method) {
+                    method = args[0].method;
                 }
             }
             else {
-                var ok = 1;
-                if (isFunction(failure)) {
-                    ok = failure(loader_1, err.message, err);
+                if (args.length > 0) {
+                    url = args[0];
+                }
+                if (args.length > 1) {
+                    datatype = args[1];
+                }
+                if (args.length > 2) {
+                    data = args[2];
+                }
+                if (args.length > 3) {
+                    success = args[3];
+                }
+                if (args.length > 4) {
+                    failure = args[4];
+                }
+                if (args.length > 5) {
+                    abort = args[5];
                 }
-                if (ok) {
-                    bbn.fn.defaultAjaxErrorFunction(loader_1, err.message, err);
+                if (args.length > 6) {
+                    method = args[6];
                 }
             }
+            if (typeof url === "string") {
+                if (url.indexOf("://") === -1) {
+                    // Prevent protocol mismatch by Axios
+                    url = replaceAll("//", "/", url);
+                }
+                if (!datatype) {
+                    datatype = "json";
+                }
+                requestId_1 = getRequestId(url, data, datatype);
+                loaderObj = getLoader(requestId_1);
+                if (loaderObj === null || loaderObj === void 0 ? void 0 : loaderObj.loader) {
+                    return [2 /*return*/, loaderObj.loader];
+                }
+                if (bbn.env.token && bbn.fn.numProperties(data)) {
+                    data = extend({}, data, { _bbn_token: bbn.env.token });
+                    if (!method) {
+                        method = "POST";
+                    }
+                }
+                else if (!method) {
+                    method = "GET";
+                }
+                aborter = new AbortController();
+                contentType = "application/json";
+                if (datatype === "json") {
+                    contentType = "application/json";
+                }
+                else if (datatype === "text") {
+                    contentType = "text/javascript";
+                }
+                else if (datatype === "html") {
+                    contentType = "text/html";
+                }
+                else {
+                    contentType = datatype;
+                }
+                options = {
+                    method: method,
+                    responseType: datatype,
+                    signal: aborter.signal,
+                    mode: 'cors', // no-cors, *cors, same-origin
+                    cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
+                    credentials: 'same-origin', // include, *same-origin, omit
+                    redirect: 'follow', // manual, *follow, error
+                    referrerPolicy: 'no-referrer', // no-referrer, *client
+                    headers: {
+                        'Content-Type': contentType,
+                    }
+                };
+                if (data && bbn.fn.numProperties(data)) {
+                    options.body = JSON.stringify(data);
+                }
+                loader_1 = fetch(url, options).then(function (res) {
+                    _deleteLoader(requestId_1, res);
+                    bbn.fn.defaultEndLoadingFunction(url, tst_1, data, res);
+                    if (res.ok) {
+                        switch (res.status) {
+                            case 200:
+                                res.json().then(function (d) {
+                                    if (isFunction(success)) {
+                                        //bbn.fn.log(["THERE US A SUCCESS FUNCTION", res, loader]);
+                                        success(d, res.headers);
+                                    }
+                                });
+                                break;
+                            default:
+                                //bbn.fn.log(["THIS IS THE DEFAULT FUNCTION", res, loader]);
+                                bbn.fn.defaultAjaxErrorFunction(loader_1, res);
+                        }
+                        return res;
+                    }
+                })
+                    .catch(function (err) {
+                    var isAbort = axios.isCancel(err);
+                    _deleteLoader(requestId_1, err.message || err.response.data, isAbort);
+                    bbn.fn.defaultEndLoadingFunction(url, tst_1, data, err);
+                    if (isAbort) {
+                        var ok = 1;
+                        if (isFunction(abort)) {
+                            ok = abort(err.message, url);
+                        }
+                        if (ok) {
+                            bbn.fn.defaultAjaxAbortFunction(err.message, url);
+                        }
+                    }
+                    else {
+                        var ok = 1;
+                        if (isFunction(failure)) {
+                            ok = failure(loader_1, err.message, err);
+                        }
+                        if (ok) {
+                            bbn.fn.defaultAjaxErrorFunction(loader_1, err.message, err);
+                        }
+                    }
+                });
+                tst_1 = _addLoader(requestId_1, loader_1, aborter);
+                bbn.fn.defaultStartLoadingFunction(url, tst_1, data, requestId_1);
+                return [2 /*return*/, loader_1];
+            }
+            return [2 /*return*/];
         });
-        var tst_1 = _addLoader(requestId_1, loader_1, aborter);
-        bbn.fn.defaultStartLoadingFunction(url, tst_1, data, requestId_1);
-        return loader_1;
-    }
+    });
 }
 ;

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

@@ -26,4 +26,4 @@
  *
  * @returns  {undefined}
  */
-export default function download(url: any, filename?: string, params?: any): any;
+export default function download(url: any, filename?: string, params?: any): Promise<any>;

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

@@ -22,4 +22,4 @@
  *
  * @returns
  */
-export default function link(...args: any[]): any;
+export default function link(...args: any[]): boolean | Promise<any>;

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

@@ -31,4 +31,4 @@
  *
  * @returns  {undefined|Promise}
  */
-export default function post(...args: any[]): any;
+export default function post(...args: any[]): Promise<any>;

package/package.json

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