From ccd4f2ea14d2bf86d4f92b9a1b23520e63e53829 Mon Sep 17 00:00:00 2001
From: Jonas Kruckenberg <iterpre@protonmail.com>
Date: Mon, 14 Nov 2022 10:20:18 +0100
Subject: [PATCH] update tauri to 1.2.0

---
 src/http.js  | 36 ++++++++++++++++++++++++------------
 src/index.js | 36 ++++++++++++++++++++++++------------
 tauri        |  2 +-
 3 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/http.js b/src/http.js
index 7147405..078629f 100644
--- a/src/http.js
+++ b/src/http.js
@@ -55,19 +55,31 @@ var Body = class {
   }
   static form(data) {
     const form = {};
-    for (const key in data) {
-      const v = data[key];
-      let r;
-      if (typeof v === "string") {
-        r = v;
-      } else if (v instanceof Uint8Array || Array.isArray(v)) {
-        r = Array.from(v);
-      } else if (typeof v.file === "string") {
-        r = { file: v.file, mime: v.mime, fileName: v.fileName };
-      } else {
-        r = { file: Array.from(v.file), mime: v.mime, fileName: v.fileName };
+    const append = (key, v) => {
+      if (v !== null) {
+        let r;
+        if (typeof v === "string") {
+          r = v;
+        } else if (v instanceof Uint8Array || Array.isArray(v)) {
+          r = Array.from(v);
+        } else if (v instanceof File) {
+          r = { file: v.name, mime: v.type, fileName: v.name };
+        } else if (typeof v.file === "string") {
+          r = { file: v.file, mime: v.mime, fileName: v.fileName };
+        } else {
+          r = { file: Array.from(v.file), mime: v.mime, fileName: v.fileName };
+        }
+        form[String(key)] = r;
+      }
+    };
+    if (data instanceof FormData) {
+      for (const [key, value] of data) {
+        append(key, value);
+      }
+    } else {
+      for (const [key, value] of Object.entries(data)) {
+        append(key, value);
       }
-      form[key] = r;
     }
     return new Body("Form", form);
   }
diff --git a/src/index.js b/src/index.js
index 211e255..a683b61 100644
--- a/src/index.js
+++ b/src/index.js
@@ -583,19 +583,31 @@ var Body = class {
   }
   static form(data) {
     const form = {};
-    for (const key in data) {
-      const v = data[key];
-      let r;
-      if (typeof v === "string") {
-        r = v;
-      } else if (v instanceof Uint8Array || Array.isArray(v)) {
-        r = Array.from(v);
-      } else if (typeof v.file === "string") {
-        r = { file: v.file, mime: v.mime, fileName: v.fileName };
-      } else {
-        r = { file: Array.from(v.file), mime: v.mime, fileName: v.fileName };
+    const append = (key, v) => {
+      if (v !== null) {
+        let r;
+        if (typeof v === "string") {
+          r = v;
+        } else if (v instanceof Uint8Array || Array.isArray(v)) {
+          r = Array.from(v);
+        } else if (v instanceof File) {
+          r = { file: v.name, mime: v.type, fileName: v.name };
+        } else if (typeof v.file === "string") {
+          r = { file: v.file, mime: v.mime, fileName: v.fileName };
+        } else {
+          r = { file: Array.from(v.file), mime: v.mime, fileName: v.fileName };
+        }
+        form[String(key)] = r;
+      }
+    };
+    if (data instanceof FormData) {
+      for (const [key, value] of data) {
+        append(key, value);
+      }
+    } else {
+      for (const [key, value] of Object.entries(data)) {
+        append(key, value);
       }
-      form[key] = r;
     }
     return new Body("Form", form);
   }
diff --git a/tauri b/tauri
index 35264b4..2e1bd04 160000
--- a/tauri
+++ b/tauri
@@ -1 +1 @@
-Subproject commit 35264b4c1801b381e0b867c1c35540f0fbb43365
+Subproject commit 2e1bd04775c0f05f1c0b67605e6abec4465dbf84