@bbn/bbn 1.0.480 → 1.0.482

package/dist/com.js

@@ -45,6 +45,64 @@ const normalizeDataAndHeaders = (data, headersObj) => {
     return { body, headers };
 };
 const fetchRequest = (method, url, config = {}, aborter) => {
+    const fetchConfig = {
+        method,
+        headers: new Headers(config.headers || {}),
+        signal: aborter === null || aborter === void 0 ? void 0 : aborter.signal,
+    };
+    const hasBody = methodsWithBody.includes(method);
+    if (config.data != null && hasBody) {
+        // You can get fancier here (JSON, FormData, etc.)
+        bbn.fn.log('DATA', config.data);
+        if (typeof config.data === 'object' && !(config.data instanceof FormData)) {
+            fetchConfig.headers.set('Content-Type', 'application/json');
+            fetchConfig.body = JSON.stringify(config.data);
+        }
+        else {
+            fetchConfig.body = config.data;
+        }
+    }
+    // Add query params support if needed
+    if (config.params) {
+        const usp = new URLSearchParams(config.params).toString();
+        url += (url.includes('?') ? '&' : '?') + usp;
+    }
+    const fetchPromise = fetch(url, fetchConfig).then((res) => __awaiter(void 0, void 0, void 0, function* () {
+        let data;
+        const contentType = res.headers.get('content-type') || '';
+        if (contentType.includes('application/json')) {
+            data = yield res.json();
+        }
+        else {
+            data = yield res.text();
+        }
+        const response = {
+            data,
+            status: res.status,
+            statusText: res.statusText,
+            headers: Object.fromEntries(res.headers.entries()),
+            config,
+            request: res,
+        };
+        if (!res.ok) {
+            // axios rejects for 4xx/5xx
+            const error = new Error('Request failed with status code ' + res.status);
+            error.response = response;
+            error.config = config;
+            error.request = res;
+            throw error;
+        }
+        return response;
+    })).catch((err) => {
+        if (err.name === 'AbortError') {
+            throw new Cancel('Request canceled');
+        }
+        throw err;
+    });
+    // axios usually gives you the cancel token separately;
+    // here we return both for convenience.
+    fetchPromise.cancel = () => aborter.abort();
+    return fetchPromise;
 };
 const xhrRequest = (method, url, config = {}, aborter) => {
     const xhr = new XMLHttpRequest();
@@ -269,63 +327,21 @@ const isCancel = (value) => {
     return !!(value && value.__BBN_CANCEL__ === true);
 };
 const run = (method, url, config = {}, aborter) => {
-    const fetchConfig = {
-        method,
-        headers: new Headers(config.headers || {}),
-        signal: aborter === null || aborter === void 0 ? void 0 : aborter.signal,
-    };
-    const hasBody = methodsWithBody.includes(method);
-    if (config.data != null && hasBody) {
-        // You can get fancier here (JSON, FormData, etc.)
-        if (typeof config.data === 'object' && !(config.data instanceof FormData)) {
-            fetchConfig.headers.set('Content-Type', 'application/json');
-            fetchConfig.body = JSON.stringify(config.data);
-        }
-        else {
-            fetchConfig.body = config.data;
-        }
+    // Optionally handle baseURL
+    if (config.baseURL && !/^https?:\/\//i.test(url)) {
+        url = config.baseURL.replace(/\/+$/, '') + '/' + url.replace(/^\/+/, '');
     }
-    // Add query params support if needed
-    if (config.params) {
-        const usp = new URLSearchParams(config.params).toString();
-        url += (url.includes('?') ? '&' : '?') + usp;
+    url = buildURL(url, config.params);
+    const wantsUploadProgress = typeof config.onUploadProgress === 'function' &&
+        methodsWithBody.includes(method);
+    if (wantsUploadProgress) {
+        // Use XHR when upload progress is requested
+        return xhrRequest(method, url, config, aborter);
+    }
+    else {
+        // Default to fetch
+        return fetchRequest(method, url, config, aborter);
     }
-    const fetchPromise = fetch(url, fetchConfig).then((res) => __awaiter(void 0, void 0, void 0, function* () {
-        let data;
-        const contentType = res.headers.get('content-type') || '';
-        if (contentType.includes('application/json')) {
-            data = yield res.json();
-        }
-        else {
-            data = yield res.text();
-        }
-        const response = {
-            data,
-            status: res.status,
-            statusText: res.statusText,
-            headers: Object.fromEntries(res.headers.entries()),
-            config,
-            request: res,
-        };
-        if (!res.ok) {
-            // axios rejects for 4xx/5xx
-            const error = new Error('Request failed with status code ' + res.status);
-            error.response = response;
-            error.config = config;
-            error.request = res;
-            throw error;
-        }
-        return response;
-    })).catch((err) => {
-        if (err.name === 'AbortError') {
-            throw new Cancel('Request canceled');
-        }
-        throw err;
-    });
-    // axios usually gives you the cancel token separately;
-    // here we return both for convenience.
-    fetchPromise.cancel = () => aborter.abort();
-    return fetchPromise;
 };
 export default {
     isCancel,

package/dist/fn/ajax/upload.js

@@ -1,5 +1,6 @@
 import objectToFormData from '../form/objectToFormData.js';
 import log from '../browser/log.js';
+import com from '../../com.js';
 /**
  * Uploads a file synchronously through an XHR indicating progress.
  *
@@ -17,8 +18,9 @@ import log from '../browser/log.js';
  * @returns  {Promise}
  */
 export default function upload(url, file, success = null, failure = null, progress = null) {
-    let fn = () => {
-        return axios.post(url || bbn.env.path, objectToFormData(file), {
+    const fn = () => {
+        return com.run('post', url || bbn.env.path, {
+            data: objectToFormData({ file }),
             headers: {
                 'Content-Type': 'multipart/form-data',
             },

package/package.json

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