feat(hey-api): adapt and improve compatibility (#593)

Author: dinwwwh

.github/dependabot.yml

@@ -7,6 +7,9 @@ updates:
       interval: daily
     versioning-strategy: increase
     groups:
+      hey-api:
+        patterns:
+          - '@hey-api/*'
       dev-dependencies-minor-patch:
         dependency-type: development
         update-types:

apps/content/docs/integrations/hey-api.md

@@ -7,6 +7,10 @@ description: Easily convert a Hey API generated client into an oRPC client to ta
 
 Easily convert a [Hey API](https://heyapi.dev/) generated client into an oRPC client to take full advantage of the oRPC ecosystem.
 
+::: warning
+[Hey API](https://heyapi.dev/) is still in an unstable stage. As a result, this integration may introduce breaking changes in the future to keep up with its ongoing development.
+:::
+
 ## Installation
 
 ::: code-group

apps/content/docs/integrations/pinia-colada.md

@@ -12,7 +12,7 @@ This documentation assumes you are already familiar with [Pinia Colada](https://
 :::
 
 ::: warning
-[Pinia Colada](https://pinia-colada.esm.dev/) is still in an unstable stage. As a result, oRPC's integration with Pinia Colada may introduce breaking changes in the future to keep up with its ongoing development.
+[Pinia Colada](https://pinia-colada.esm.dev/) is still in an unstable stage. As a result, this integration may introduce breaking changes in the future to keep up with its ongoing development.
 :::
 
 ## Installation

packages/hey-api/package.json

@@ -35,15 +35,12 @@
     "type:check": "tsc -b",
     "prepare": "openapi-ts -i ./tests/spec.json -o ./tests/client -c @hey-api/client-fetch"
   },
-  "peerDependencies": {
-    "@hey-api/client-fetch": "*"
-  },
   "dependencies": {
     "@orpc/client": "workspace:*",
     "@orpc/shared": "workspace:*"
   },
   "devDependencies": {
-    "@hey-api/client-fetch": "^0.10.1",
+    "@hey-api/client-fetch": "^0.11.0",
     "@hey-api/openapi-ts": "^0.69.2"
   }
 }

packages/hey-api/src/to-orpc-client.ts

@@ -1,12 +1,11 @@
-import type { RequestResult } from '@hey-api/client-fetch'
 import type { Client, ThrowableError } from '@orpc/client'
 
 export type experimental_ToORPCClientResult<T extends Record<string, any>> = {
   [K in keyof T]:
   T[K] extends (options: infer UInput extends Record<any, any> | undefined)
-  => RequestResult<infer USuccessResponse extends Record<number, any> | undefined, any, any>
+  => Promise<infer UResult>
     ? Client<Record<never, never>, UInput, {
-      body: Exclude<USuccessResponse, undefined>[keyof Exclude<USuccessResponse, undefined>]
+      body: UResult extends { data: infer USuccess } ? Exclude<USuccess, undefined> : never
       request: Request
       response: Response
     }, ThrowableError>