bruce-models 4.8.2 → 4.8.4

package/dist/bruce-models.umd.js

@@ -531,65 +531,30 @@
          */
         upload(url, blob, params) {
             return __awaiter(this, void 0, void 0, function* () {
-                return new Promise((res, rej) => {
-                    try {
-                        let xhr = new XMLHttpRequest();
-                        const headers = params === null || params === void 0 ? void 0 : params.headers;
-                        if (headers) {
-                            const headerKeys = Object.keys(headers);
-                            for (let i = 0; i < headerKeys.length; i++) {
-                                const key = headerKeys[i];
-                                const value = headers[key];
-                                xhr.setRequestHeader(key, value);
-                            }
-                        }
-                        if (params === null || params === void 0 ? void 0 : params.onProgress) {
-                            if (xhr.upload) {
-                                xhr.upload.onprogress = params === null || params === void 0 ? void 0 : params.onProgress;
-                            }
-                            else {
-                                xhr.addEventListener("progress", params === null || params === void 0 ? void 0 : params.onProgress);
-                            }
-                        }
-                        xhr.onreadystatechange = (e) => {
-                            if (xhr.readyState == 4) {
-                                if (xhr.status >= 400 || xhr.status < 200) {
-                                    rej(e);
-                                }
-                                else {
-                                    try {
-                                        res(JSON.parse(xhr.responseText));
-                                    }
-                                    catch (e) {
-                                        console.error(e, xhr.responseText);
-                                        res(xhr.responseText);
-                                    }
-                                }
-                            }
-                        };
-                        xhr.open("POST", url, true);
-                        if (this.ssidHeader && this.ssid) {
-                            xhr.setRequestHeader(this.ssidHeader, this.ssid);
-                        }
-                        let formData;
-                        if ((params === null || params === void 0 ? void 0 : params.formData) instanceof FormData) {
-                            formData = params === null || params === void 0 ? void 0 : params.formData;
-                        }
-                        else {
-                            formData = new FormData();
-                            if (params === null || params === void 0 ? void 0 : params.formData) {
-                                for (const key in params.formData) {
-                                    formData.append(key, params.formData[key]);
-                                }
-                            }
-                        }
-                        formData.append("file", blob);
-                        xhr.send(formData);
-                    }
-                    catch (e) {
-                        rej(e);
+                if (!params) {
+                    params = {};
+                }
+                params.headers = Object.assign({}, params.headers);
+                if (this.ssidHeader && this.ssid) {
+                    params.headers[this.ssidHeader] = this.ssid;
+                }
+                const formData = params.formData instanceof FormData ? params.formData : new FormData();
+                if (formData.has("file")) {
+                    formData.delete("file");
+                }
+                formData.append("file", blob);
+                // If the provided form data was a plain object, append its properties to the form data.
+                if (params.formData && !(params.formData instanceof FormData)) {
+                    for (let key in params.formData) {
+                        formData.append(key, params.formData[key]);
                     }
+                }
+                const res = yield fetch(url, {
+                    headers: params.headers,
+                    method: "POST",
+                    body: formData
                 });
+                return parseResult(res);
             });
         }
     }
@@ -14041,7 +14006,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.8.2";
+    const VERSION = "4.8.4";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;