Cleanup

Author: drwpow

packages/openapi-fetch/package.json

@@ -58,7 +58,7 @@
     "test": "pnpm run test:ts && npm run test:js",
     "test:js": "vitest run",
     "test:ts": "tsc --noEmit",
-    "prepare": "openapi-typescript test/v1.yaml -o test/v1.d.ts",
+    "prepare": "openapi-typescript test/fixtures/api.yaml -o test/fixtures/api.d.ts",
     "prepublish": "pnpm run prepare && pnpm run build",
     "version": "pnpm run prepare && pnpm run build"
   },
@@ -69,7 +69,6 @@
     "axios": "^1.6.0",
     "del-cli": "^5.1.0",
     "esbuild": "^0.19.5",
-    "jsdom": "^22.1.0",
     "nanostores": "^0.9.4",
     "openapi-typescript": "^6.7.0",
     "openapi-typescript-codegen": "^0.25.0",

packages/openapi-fetch/src/index.js

@@ -78,20 +78,20 @@ export default function createClient(clientOptions) {
 
     // parse response (falling back to .text() when necessary)
     if (response.ok) {
-      let data; // we have to leave this empty here so that we don't consume the body
-      if (parseAs !== "stream") {
-        const cloned = response.clone();
-        data =
-          typeof cloned[parseAs] === "function"
-            ? await cloned[parseAs]()
-            : await cloned.text();
-      } else {
-        // fix for bun:
-        // bun consumes the body when calling response.body, therefore clone the response before accessing it
+      // if "stream", skip parsing entirely
+      if (parseAs === "stream") {
+        // fix for bun: bun consumes response.body, therefore clone before accessing
         // TODO: test this?
-        data = response.clone().body;
+        return { data: response.clone().body, response };
       }
-      return { data, response };
+      const cloned = response.clone();
+      return {
+        data:
+          typeof cloned[parseAs] === "function"
+            ? await cloned[parseAs]()
+            : await cloned.text(),
+        response,
+      };
     }
 
     // handle errors (always parse as .json() or .text())

packages/openapi-fetch/vitest.config.ts

@@ -2,7 +2,6 @@ import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
-    environment: "jsdom",
     globals: true,
   },
 });