Merge pull request #232 from am1rb/master

🐛 Do not jasonify FormData instances
elbywan · Jun 1, 2024 · 0619303 · 0619303
2 parents cd1b822 + 71aa327
commit 0619303
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 4 deletions.
diff --git a/src/core.ts b/src/core.ts
@@ -51,9 +51,9 @@ export const core: Wretch = {
   headers(headerValues) {
     const headers =
       !headerValues ? {} :
-      Array.isArray(headerValues) ? Object.fromEntries(headerValues) :
-      "entries" in headerValues ? Object.fromEntries((headerValues as Headers).entries()) :
-      headerValues
+        Array.isArray(headerValues) ? Object.fromEntries(headerValues) :
+          "entries" in headerValues ? Object.fromEntries((headerValues as Headers).entries()) :
+            headerValues
     return { ...this, _options: mix(this._options, { headers }) }
   },
   accept(headerValue) {
@@ -92,7 +92,11 @@ export const core: Wretch = {
     let base = this.url(url).options({ method })
     // "Jsonify" the body if it is an object and if it is likely that the content type targets json.
     const contentType = extractContentType(base._options.headers)
-    const jsonify = typeof body === "object" && (!base._options.headers || !contentType || isLikelyJsonMime(contentType))
+    const formDataClass = this._config.polyfill("FormData", false)
+    const jsonify =
+      typeof body === "object" &&
+      !(formDataClass && body instanceof formDataClass) &&
+      (!base._options.headers || !contentType || isLikelyJsonMime(contentType))
     base =
       !body ? base :
         jsonify ? base.json(body, contentType) :

diff --git a/test/browser/wretch.spec.js b/test/browser/wretch.spec.js
@@ -134,6 +134,25 @@ describe("Wretch", function () {
     })
   })
 
+  it("should not Jasonify a FormData instance", async function () {
+    const FormData = wretch()._config.polyfill(
+      "FormData",
+      false
+    );
+
+    let formData = new FormData()
+    formData.append("hello", "world")
+    formData.append("duck", "Muscovy")
+
+    let decoded = await wretch(`${_URL}/formData/decode`)
+      .post(formData)
+      .json()
+    expect(decoded).toEqual({
+      hello: "world",
+      duck: "Muscovy",
+    })
+  })
+
   it("should perform OPTIONS and HEAD requests", async function () {
     const optsRes = await wretch(_URL + "/options").opts().res()
     const optsRes2 = await wretch(_URL + "/options").opts("").res()

diff --git a/test/deno/wretch_test.ts b/test/deno/wretch_test.ts
@@ -164,6 +164,25 @@ describe("Wretch", function () {
     })
   })
 
+  it("should not Jasonify a FormData instance", async function () {
+    const FormData = wretch()._config.polyfill(
+      "FormData",
+      false
+    );
+
+    let formData = new FormData()
+    formData.append("hello", "world")
+    formData.append("duck", "Muscovy")
+
+    let decoded = await wretch(`${_URL}/formData/decode`)
+      .post(formData)
+      .json()
+    assertEquals(decoded, {
+      hello: "world",
+      duck: "Muscovy",
+    })
+  })
+
   it("should perform OPTIONS and HEAD requests", async function () {
     const optsRes = await wretch(_URL + "/options").opts().res()
     const optsRes2 = await wretch(_URL + "/options").opts("").res()

diff --git a/test/node/wretch.spec.ts b/test/node/wretch.spec.ts
@@ -254,6 +254,30 @@ describe("Wretch", function () {
     })
   })
 
+  it("should not Jasonify a FormData instance", async function () {
+    const FormData = wretch()._config.polyfill(
+      "FormData",
+      false
+    );
+
+    let formData: any = new FormData()
+    formData.append("hello", "world")
+    formData.append("duck", "Muscovy")
+    formData.append("duckImage", fs.createReadStream(duckImagePath))
+
+    let decoded = await wretch(`${_URL}/formData/decode`)
+      .post(formData)
+      .json()
+    expect(decoded).toMatchObject({
+      hello: "world",
+      duck: "Muscovy",
+      duckImage: {
+        data: duckImage,
+        type: "Buffer"
+      }
+    })
+  })
+
   it("should perform OPTIONS and HEAD requests", async function () {
     const optsRes = await wretch(_URL + "/options").opts().res()
     const optsRes2 = await wretch(_URL + "/options").opts("").res()