@bbn/bbn 1.0.342 → 1.0.343

package/dist/fn/ajax/ajax.js

@@ -34,12 +34,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import isObject from '../type/isObject.js';
 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';
@@ -105,29 +103,33 @@ export default function ajax() {
         args[_i] = arguments[_i];
     }
     return __awaiter(this, void 0, void 0, function () {
-        var url, datatype, data, success, failure, abort, requestId_1, loaderObj, aborter, options, args_1, axiosMethod, loader_1, tst_1;
+        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].abort) {
-                    abort = args[0].abort;
+                if (args[0].datatype) {
+                    datatype = args[0].datatype;
                 }
-                if (args[0].failure) {
-                    failure = args[0].failure;
+                if (args[0].data) {
+                    data = args[0].data;
                 }
                 if (args[0].success) {
                     success = args[0].success;
                 }
-                if (args[0].data) {
-                    data = args[0].data;
+                if (args[0].failure) {
+                    failure = args[0].failure;
                 }
-                if (args[0].datatype) {
-                    datatype = args[0].datatype;
+                if (args[0].abort) {
+                    abort = args[0].abort;
+                }
+                if (args[0].method) {
+                    method = args[0].method;
                 }
             }
             else {
@@ -149,6 +151,9 @@ export default function ajax() {
                 if (args.length > 5) {
                     abort = args[5];
                 }
+                if (args.length > 6) {
+                    method = args[6];
+                }
             }
             if (typeof url === "string") {
                 if (url.indexOf("://") === -1) {
@@ -163,43 +168,64 @@ export default function ajax() {
                 if (loaderObj === null || loaderObj === void 0 ? void 0 : loaderObj.loader) {
                     return [2 /*return*/, loaderObj.loader];
                 }
-                if (bbn.env.token) {
-                    extend(data || {}, { _bbn_token: bbn.env.token });
+                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
+                    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 (datatype === "text") {
-                    options['headers'] = {
-                        accept: "text/javascript",
-                        "Content-Type": "text/javascript",
-                    };
-                }
-                args_1 = [url];
-                if (isObject(data) && numProperties(data) > 0) {
-                    args_1.push(data);
-                }
-                args_1.push(options);
-                axiosMethod = args_1.length === 2 ? "get" : "post";
-                loader_1 = axios[axiosMethod]
-                    .apply(null, args_1)
-                    .then(function (res) {
+                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);
-                    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);
+                    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;
                     }
-                    return res;
                 })
                     .catch(function (err) {
                     var isAbort = axios.isCancel(err);

package/package.json

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