chore: release v0.10.2

Update `HTTPLinkOptions` import

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: wobsoriano

README.md

@@ -27,6 +27,10 @@ For version 3 of this module (tRPC v9, auto-imports, auto handlers), [go here](h
 
 -   [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar)
 
+## Acknowledgements
+
+Huge thanks to [Alex / KATT](https://github.com/KATT), the author of [tRPC](https://trpc.io/), for being the first sponsor of this project! 🎉 
+
 ## License
 
 MIT

docs/content/1.get-started/2.usage/1.simple.md

@@ -107,12 +107,12 @@ export default defineNuxtPlugin(() => {
 <script setup lang="ts">
 const { $client } = useNuxtApp()
 
-const hello = await $client.hello.useQuery({ text: 'client' })
+const { data: hello } = await $client.hello.useQuery({ text: 'client' })
 </script>
 
 <template>
   <div>
-    <p>{{ hello.data?.greeting }}</p>
+    <p>{{ hello?.greeting }}</p>
   </div>
 </template>
 ```

docs/content/1.get-started/2.usage/2.recommended.md

@@ -96,7 +96,7 @@ import { inferAsyncReturnType } from '@trpc/server'
  * Creates context for an incoming request
  * @link https://trpc.io/docs/context
  */
-export const createContext = () => {}
+export const createContext = () => ({})
 
 export type Context = inferAsyncReturnType<typeof createContext>;
 ```

docs/content/1.get-started/5.tips/1.composables.md

@@ -7,7 +7,7 @@ title: Composables
 It is often useful to wrap functionality of your `@trpc/client` api within other functions. For this purpose, it's necessary to be able to infer input types and output types generated by your `@trpc/server` router.
 
 ::alert{type="info"}
-[createTRPCNuxtClient](/get-started/client/create) adds a `useQuery` method built on top of [useAsyncData](https://nuxt.com/docs/api/composables/use-async-data/).
+[createTRPCNuxtClient](/get-started/client/create) already adds a `useQuery` method built on top of [useAsyncData](https://nuxt.com/docs/api/composables/use-async-data/). You might not need this.
 ::
 
 ## Inference Helpers

docs/package.json

@@ -8,10 +8,10 @@
     "preview": "nuxi preview"
   },
   "dependencies": {
-    "nuxt": "^3.0.0"
+    "nuxt": "3.4.3"
   },
   "devDependencies": {
-    "@nuxt-themes/docus": "^1.1.10",
+    "@nuxt-themes/docus": "^1.11.1",
-    "@nuxtlabs/github-module": "^1.5.4"
+    "@nuxtlabs/github-module": "^1.6.3"
   }
 }

package.json

@@ -2,8 +2,8 @@
   "name": "trpc-nuxt",
   "description": "End-to-end typesafe APIs in Nuxt applications.",
   "type": "module",
-  "packageManager": "pnpm@7.18.2",
+  "packageManager": "pnpm@7.32.4",
-  "version": "0.5.0",
+  "version": "0.10.2",
   "license": "MIT",
   "sideEffects": false,
   "exports": {
@@ -25,7 +25,7 @@
     "client.d.ts"
   ],
   "scripts": {
-    "dev": "concurrently \"pnpm build --watch\" \"pnpm --filter playground dev\"",
+    "dev": "tsup --watch --onSuccess \"pnpm --filter playground dev\"",
     "dev:prepare": "pnpm build && nuxt prepare playground",
     "prepublishOnly": "pnpm build",
     "build": "tsup",
@@ -35,25 +35,24 @@
     "update-deps": "taze -w && pnpm i"
   },
   "peerDependencies": {
-    "@trpc/client": "^10.8.0",
+    "@trpc/client": "^10.26.0",
-    "@trpc/server": "^10.8.0"
+    "@trpc/server": "^10.26.0"
   },
   "dependencies": {
-    "h3": "^1.0.2",
+    "h3": "^1.6.5",
-    "ofetch": "^1.0.0",
+    "ofetch": "^1.0.1",
-    "ohash": "^1.0.0",
+    "ohash": "^1.1.2",
-    "ufo": "^1.0.1"
+    "ufo": "^1.1.2"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.1.1",
-    "@trpc/client": "^10.8.1",
+    "@trpc/client": "^10.26.0",
-    "@trpc/server": "^10.8.1",
+    "@trpc/server": "^10.26.0",
-    "bumpp": "^8.2.1",
+    "bumpp": "^9.1.0",
-    "concurrently": "^7.6.0",
+    "eslint": "^8.40.0",
-    "eslint": "^8.30.0",
+    "taze": "^0.10.1",
-    "taze": "^0.8.5",
+    "tsup": "6.7.0",
-    "tsup": "6.4.0",
+    "typescript": "^5.0.4"
-    "typescript": "^4.9.4"
   },
   "eslintConfig": {
     "extends": [
@@ -76,7 +75,7 @@
   ],
   "pnpm": {
     "overrides": {
-      "nuxt": "3.0.0"
+      "nuxt": "3.4.3"
     }
   },
   "engines": {

playground/package.json

@@ -9,13 +9,14 @@
     "postinstall": "nuxt prepare"
   },
   "dependencies": {
-    "@trpc/client": "^10.8.1",
+    "@trpc/client": "^10.26.0",
-    "@trpc/server": "^10.8.1",
+    "@trpc/server": "^10.26.0",
-    "superjson": "^1.12.1",
+    "superjson": "^1.12.3",
     "trpc-nuxt": "workspace:*",
-    "zod": "^3.20.2"
+    "zod": "^3.21.4"
   },
   "devDependencies": {
-    "nuxt": "^3.0.0"
+    "@types/node": "^18.16.8",
+    "nuxt": "3.4.3"
   }
 }

playground/pages/index.vue

@@ -1,4 +1,13 @@
 <script setup lang="ts">
+import { TRPCClientError, TRPCClientErrorLike } from '@trpc/client'
+import type { inferRouterOutputs } from '@trpc/server'
+import type { AppRouter } from '@/server/trpc/routers'
+
+type RouterOutput = inferRouterOutputs<AppRouter>
+type GetTodosOutput = RouterOutput['todo']['getTodos']
+
+type ErrorOutput = TRPCClientError<AppRouter>
+
 const { $client } = useNuxtApp()
 
 const addTodo = async () => {

playground/pages/todo/[id].vue

@@ -8,8 +8,8 @@ const { data: todo, pending, error } = await useAsyncData(() => $client.todo.get
   <div v-if="pending">
     Loading...
   </div>
-  <div v-else-if="error?.data?.code">
+  <div v-else-if="error">
-    {{ error.data.code }}
+    {{ error.message }} - {{ error.cause }}
   </div>
   <div v-else>
     ID: {{ todo?.id }} <br>

src/client/index.ts

@@ -61,7 +61,7 @@ export function createNuxtProxyDecoration<TRouter extends AnyRouter> (name: stri
       }), asyncDataOptions)
     }
 
-    return (client as any)[path][lastArg](input)
+    return (client as any)[path][lastArg](...args)
   })
 }
 
@@ -69,7 +69,7 @@ export function createTRPCNuxtClient<TRouter extends AnyRouter> (opts: CreateTRP
   const client = createTRPCProxyClient<TRouter>(opts)
 
   const decoratedClient = createFlatProxy((key) => {
-    return createNuxtProxyDecoration(key, client)
+    return createNuxtProxyDecoration(key, client as any)
   }) as DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>
 
   return decoratedClient

src/client/links.ts

@@ -3,9 +3,10 @@ import { type AnyRouter } from '@trpc/server'
 import { FetchError } from 'ofetch'
 // @ts-expect-error: Nuxt auto-imports
 import { useRequestHeaders } from '#imports'
-import { type HTTPLinkOptions as _HTTPLinkOptions } from '@trpc/client/dist/links/internals/httpUtils'
+import { type HTTPLinkOptions as _HTTPLinkOptions } from '@trpc/client/dist/links/httpLink'
+import { type FetchEsque } from '@trpc/client/dist/internals/types'
 
-function customFetch(input: RequestInfo | URL, init?: RequestInit) {
+function customFetch(input: RequestInfo | URL, init?: RequestInit & { method: 'GET' })  {
   return globalThis.$fetch.raw(input.toString(), init)
     .catch((e) => {
       if (e instanceof FetchError && e.response) { return e.response }
@@ -43,7 +44,7 @@ export function httpLink<TRouter extends AnyRouter>(opts?: HTTPLinkOptions) {
     headers () {
       return headers
     },
-    fetch: customFetch,
+    fetch: customFetch as FetchEsque,
     ...opts,
   })
 }
@@ -69,10 +70,11 @@ export function httpBatchLink<TRouter extends AnyRouter>(opts?: HttpBatchLinkOpt
 
   return _httpBatchLink<TRouter>({
     url: '/api/trpc',
+    // @ts-expect-error: Missing property from batchLink. Fix this later.
     headers () {
       return headers
     },
-    fetch: customFetch,
+    fetch: customFetch as FetchEsque,
     ...opts,
   })
 }

src/client/types.ts

@@ -16,9 +16,8 @@ import { inferTransformedProcedureOutput } from '@trpc/server/shared'
 import type {
   AsyncData,
   AsyncDataOptions,
-  KeyOfRes,
+  KeysOf,
   PickFrom,
-  _Transform
 } from 'nuxt/dist/app/composables/asyncData'
 
 interface TRPCRequestOptions extends _TRPCRequestOptions {
@@ -51,13 +50,14 @@ type DecorateProcedure<
 > = TProcedure extends AnyQueryProcedure
   ? {
       useQuery: <
-      TData = inferTransformedProcedureOutput<TProcedure>,
+      ResT = inferTransformedProcedureOutput<TProcedure>,
-      Transform extends _Transform<TData> = _Transform<TData, TData>,
+      DataE = TRPCClientErrorLike<TProcedure>,
-      PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>,
+      DataT = ResT,
+      PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
      >(
         input: inferProcedureInput<TProcedure>,
-        opts?: AsyncDataOptions<TData, Transform, PickKeys> & { trpc?: TRPCRequestOptions },
+        opts?: AsyncDataOptions<ResT, DataT, PickKeys> & { trpc?: TRPCRequestOptions },
-      ) => AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, TRPCClientErrorLike<TProcedure>>,
+      ) => AsyncData<PickFrom<DataT, PickKeys>, DataE>,
       query: Resolver<TProcedure>
     } : TProcedure extends AnyMutationProcedure ? {
       mutate: Resolver<TProcedure>

src/index.ts

@@ -50,9 +50,13 @@ export interface ResolveHTTPRequestOptions<TRouter extends AnyRouter> {
 }
 
 function getPath (event: H3Event): string | null {
-  if (typeof event.context.params.trpc === 'string') { return event.context.params.trpc }
+  const { params } = event.context
 
-  if (Array.isArray(event.context.params.trpc)) { return event.context.params.trpc.join('/') }
+  if (typeof params?.trpc === 'string') { return params.trpc }
+
+  if (params?.trpc && Array.isArray(params.trpc)) {
+    return (params.trpc as string[]).join('/')
+  }
 
   return null
 }