Merge pull request #3614 from hey-api/copilot/fix-unwrap-refs-abortsignal

mrlubos · web-flow · commit 5f3a5a09da37 · 2026-03-18T02:40:23.000+01:00
diff --git a/.changeset/five-cats-begin.md b/.changeset/five-cats-begin.md
@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+**plugin(@hey-api/client-nuxt)**: preserve AbortSignal, FormData, and ReadableStream in unwrapRefs
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/utils.gen.ts
@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/__tests__/utils.test.ts b/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/__tests__/utils.test.ts
@@ -29,6 +29,43 @@ describe('unwrapRefs', () => {
     const result = unwrapRefs(file);
     expect(result).toBe(file);
   });
+
+  it('returns AbortSignal as-is', () => {
+    const controller = new AbortController();
+    const result = unwrapRefs(controller.signal);
+    expect(result).toBe(controller.signal);
+  });
+
+  it('preserves AbortSignal in object', () => {
+    const controller = new AbortController();
+    const input = { signal: controller.signal, url: '/test' };
+    const result = unwrapRefs(input);
+    expect(result.signal).toBe(controller.signal);
+    expect(result.signal instanceof AbortSignal).toBe(true);
+    expect(result.url).toBe('/test');
+  });
+
+  it('returns FormData as-is', () => {
+    const formData = new FormData();
+    formData.append('key', 'value');
+    const result = unwrapRefs(formData);
+    expect(result).toBe(formData);
+  });
+
+  it('preserves FormData in object', () => {
+    const formData = new FormData();
+    formData.append('key', 'value');
+    const input = { body: formData, url: '/upload' };
+    const result = unwrapRefs(input);
+    expect(result.body).toBe(formData);
+    expect(result.body instanceof FormData).toBe(true);
+  });
+
+  it('returns ReadableStream as-is', () => {
+    const stream = new ReadableStream();
+    const result = unwrapRefs(stream);
+    expect(result).toBe(stream);
+  });
 });
 
 describe('mergeInterceptors', () => {
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/bundle/utils.ts b/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/bundle/utils.ts
@@ -344,7 +344,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {
     return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;
   }
 
-  if (value instanceof Blob) {
+  if (
+    value instanceof Blob ||
+    value instanceof FormData ||
+    value instanceof ReadableStream ||
+    value instanceof AbortSignal
+  ) {
     return value as UnwrapRefs<T>;
   }
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@hey-api/openapi-ts": patch
 +---
++
 +**plugin(@hey-api/client-nuxt)**: preserve AbortSignal, FormData, and ReadableStream in unwrapRefs
Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,12 @@ export const unwrapRefs = <T>(value: T): UnwrapRefs<T> => {`
`346`	`346`	`return (isRef(value) ? unref(value) : value) as UnwrapRefs<T>;`
`347`	`347`	`}`
`348`	`348`
`349`		`- if (value instanceof Blob) {`
	`349`	`+ if (`
	`350`	`+ value instanceof Blob \|\|`
	`351`	`+ value instanceof FormData \|\|`
	`352`	`+ value instanceof ReadableStream \|\|`
	`353`	`+ value instanceof AbortSignal`
	`354`	`+ ) {`
`350`	`355`	`return value as UnwrapRefs<T>;`
`351`	`356`	`}`
`352`	`357`