fix: NextResponse types

finom · May 12, 2024 · 79e5f19 · 79e5f19
1 parent a661189
commit 79e5f19
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 60 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/client/types.ts b/src/client/types.ts
@@ -7,7 +7,7 @@ import type {
   _VovkControllerParams,
 } from '../types';
 import { _StreamResponse as StreamResponse } from '../StreamResponse';
-import type { NextResponse } from 'next/server';
+import { NextResponse } from 'next/server';
 
 export type _StaticMethodInput<T extends _ControllerStaticMethod> = (_VovkControllerBody<T> extends undefined | void
   ? { body?: undefined }
@@ -46,10 +46,10 @@ type ClientMethod<
   | Iterator<infer U>
   | AsyncIterator<infer U>
   ? Promise<_StreamAsyncIterator<U>>
-  : R extends NextResponse<infer U>
-    ? U
-    : R extends object
-      ? Promise<R>
+  : R extends object
+    ? Promise<R>
+    : ReturnType<T> extends NextResponse<infer U> | Promise<NextResponse<infer U>>
+      ? ToPromise<U>
       : ToPromise<ReturnType<T>>;
 
 type OmitNever<T> = {

diff --git a/test/package-lock.json b/test/package-lock.json
diff --git a/test/package.json b/test/package.json
@@ -13,7 +13,7 @@
     "next": "14.1.0",
     "react": "^18",
     "react-dom": "^18",
-    "vovk": "^2.0.1",
+    "vovk": "^2.0.2-beta.1",
     "vovk-client": "^0.0.2",
     "vovk-zod": "^0.1.2"
   },