chore(release): v0.10.4

Update `HTTPLinkOptions` import

CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+
+
+## v0.10.4
+
+[compare changes](https://github.com/wobsoriano/trpc-nuxt/compare/v0.10.3...v0.10.4)
+
+
+### 🚀 Enhancements
+
+  - Add reactive inputs ([054fad9](https://github.com/wobsoriano/trpc-nuxt/commit/054fad9))
+
+### 📖 Documentation
+
+  - Update local deps ([7683499](https://github.com/wobsoriano/trpc-nuxt/commit/7683499))
+
+### 🏡 Chore
+
+  - Remove engines property ([e15a62a](https://github.com/wobsoriano/trpc-nuxt/commit/e15a62a))
+
+### ❤️  Contributors
+
+- Wobsoriano ([@wobsoriano](http://github.com/wobsoriano))
+
+## v0.10.3
+
+[compare changes](https://github.com/wobsoriano/trpc-nuxt/compare/v0.10.2...v0.10.3)
+
+
+### 🚀 Enhancements
+
+  - Export createH3ApiHandler for h3 apps ([18cd492](https://github.com/wobsoriano/trpc-nuxt/commit/18cd492))
+
+### ❤️  Contributors
+
+- Wobsoriano ([@wobsoriano](http://github.com/wobsoriano))
+

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/package.json

@@ -7,11 +7,9 @@
     "generate": "nuxi build",
     "preview": "nuxi preview"
   },
-  "dependencies": {
-    "nuxt": "^3.0.0"
-  },
   "devDependencies": {
-    "@nuxt-themes/docus": "^1.1.10",
+    "@nuxt-themes/docus": "^1.12.0",
-    "@nuxtlabs/github-module": "^1.5.4"
+    "@nuxtlabs/github-module": "^1.6.3",
+    "nuxt": "3.4.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@8.5.1",
-  "version": "0.7.0",
+  "version": "0.10.4",
   "license": "MIT",
   "sideEffects": false,
   "exports": {
@@ -31,28 +31,28 @@
     "build": "tsup",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "release": "bumpp && npm publish",
+    "release": "changelogen --release && npm publish && git push --follow-tags",
     "update-deps": "taze -w && pnpm i"
   },
   "peerDependencies": {
-    "@trpc/client": "^10.12.0",
+    "@trpc/client": "^10.26.0",
-    "@trpc/server": "^10.12.0"
+    "@trpc/server": "^10.26.0"
   },
   "dependencies": {
-    "h3": "^1.5.0",
+    "h3": "^1.6.6",
     "ofetch": "^1.0.1",
-    "ohash": "^1.0.0",
+    "ohash": "^1.1.2",
-    "ufo": "^1.1.0"
+    "ufo": "^1.1.2"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.1.1",
-    "@trpc/client": "^10.12.0",
+    "@trpc/client": "^10.28.0",
-    "@trpc/server": "^10.12.0",
+    "@trpc/server": "^10.28.0",
-    "bumpp": "^8.2.1",
+    "changelogen": "^0.5.3",
-    "eslint": "^8.33.0",
+    "eslint": "^8.41.0",
-    "taze": "^0.8.5",
+    "taze": "^0.10.1",
-    "tsup": "6.6.3",
+    "tsup": "6.7.0",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.4"
   },
   "eslintConfig": {
     "extends": [
@@ -75,10 +75,7 @@
   ],
   "pnpm": {
     "overrides": {
-      "nuxt": "3.0.0"
+      "nuxt": "3.4.3"
     }
-  },
-  "engines": {
-    "node": "^16.13.0 || ^18.12.0"
   }
-}
+}

playground/package.json

@@ -9,13 +9,14 @@
     "postinstall": "nuxt prepare"
   },
   "dependencies": {
-    "@trpc/client": "^10.8.1",
+    "@trpc/client": "^10.28.0",
-    "@trpc/server": "^10.8.1",
+    "@trpc/server": "^10.28.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.15",
+    "nuxt": "3.4.3"
   }
 }

playground/pages/reactive.vue

@@ -0,0 +1,29 @@
+<script setup lang="ts">
+const route = useRoute()
+const { $client } = useNuxtApp()
+const id = ref(1)
+// const { data: todo, pending, error } = await useAsyncData(() => $client.todo.getTodo.query(id.value), {
+//   watch: [id]
+// })
+
+const { data: todo, pending, error, refresh } = await $client.todo.getTodo.useQuery(id, {
+  watch: [id],
+})
+</script>
+
+<template>
+  <div v-if="pending">
+    Loading...
+  </div>
+  <div v-else-if="error?.data?.code">
+    Error: {{ error.data.code }}
+  </div>
+  <div v-else>
+    ID: {{ todo?.id }} <br>
+    Title: {{ todo?.title }} <br>
+    Completed: {{ todo?.completed }}
+  </div>
+  <button @click="id++">
+    Next Todo
+  </button>
+</template>

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

@@ -4,7 +4,7 @@ import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared'
 import { hash } from 'ohash'
 import { type DecoratedProcedureRecord } from './types'
 // @ts-expect-error: Nuxt auto-imports
-import { getCurrentInstance, onScopeDispose, useAsyncData } from '#imports'
+import { getCurrentInstance, onScopeDispose, useAsyncData, unref } from '#imports'
 
 /**
  * Calculates the key used for `useAsyncData` call.
@@ -54,14 +54,14 @@ export function createNuxtProxyDecoration<TRouter extends AnyRouter> (name: stri
         controller = typeof AbortController !== 'undefined' ? new AbortController() : {} as AbortController
       }
 
-      const queryKey = getQueryKey(path, input)
+      const queryKey = getQueryKey(path, unref(input))
-      return useAsyncData(queryKey, () => (client as any)[path].query(input, {
+      return useAsyncData(queryKey, () => (client as any)[path].query(unref(input), {
         signal: controller?.signal,
         ...trpc
       }), asyncDataOptions)
     }
 
-    return (client as any)[path][lastArg](input)
+    return (client as any)[path][lastArg](...args)
   })
 }
 

src/client/links.ts

@@ -3,10 +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 }
@@ -70,6 +70,7 @@ 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
     },

src/client/types.ts

@@ -16,10 +16,10 @@ import { inferTransformedProcedureOutput } from '@trpc/server/shared'
 import type {
   AsyncData,
   AsyncDataOptions,
-  KeyOfRes,
+  KeysOf,
   PickFrom,
-  _Transform
 } from 'nuxt/dist/app/composables/asyncData'
+import type { Ref } from 'vue'
 
 interface TRPCRequestOptions extends _TRPCRequestOptions {
   abortOnUnmount?: boolean
@@ -45,19 +45,22 @@ type SubscriptionResolver<
   ]
 ) => Unsubscribable
 
+type MaybeRef<T> = T | Ref<T>
+
 type DecorateProcedure<
   TProcedure extends AnyProcedure,
   TRouter extends AnyRouter,
 > = 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>,
+        input: MaybeRef<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

@@ -128,3 +128,5 @@ export function createNuxtApiHandler<TRouter extends AnyRouter> ({
     return body
   })
 }
+
+export const createH3ApiHandler = createNuxtApiHandler