chore: release v0.4.3

Update package.json

README.md

@@ -2,6 +2,17 @@
 
 End-to-end typesafe APIs with [tRPC.io](https://trpc.io/) in Nuxt applications.
 
+<p align="center">
+  <figure>
+    <img src="https://i.imgur.com/3AZlBZH.gif" alt="Demo" />
+    <figcaption>
+      <p align="center">
+        The client above is <strong>not</strong> importing any code from the server, only its type declarations.
+      </p>
+    </figcaption>
+  </figure>
+</p>
+
 Docs: https://trpc-nuxt.vercel.app
 
 For version 3 of this module (tRPC v9, auto-imports, auto handlers), [go here](https://github.com/wobsoriano/trpc-nuxt/tree/v3).

client.d.ts

@@ -1 +0,0 @@
-export * from './dist/client/index'

docs/app.config.ts

@@ -1,5 +1,25 @@
 export default defineAppConfig({
   docus: {
-    title: 'tRPC Nuxt'
+    title: 'tRPC Nuxt',
+    image: 'https://og-image.vercel.app/tRPC-Nuxt',
+    alt: 'tRPC-Nuxt cover',
+    url: 'https://trpc-nuxt.vercel.app',
+    debug: false,
+    socials: {
+      github: 'wobsoriano/trpc-nuxt'
+    },
+    aside: {
+      level: 1
+    },
+    footer: {
+      credits: true,
+      icons: [
+        {
+          label: 'NuxtJS',
+          href: 'https://nuxtjs.org',
+          component: 'IconNuxt'
+        }
+      ]
+    }
   }
 })

docs/content/1.get-started/1.installation.md

@@ -5,20 +5,18 @@ description: tRPC-Nuxt provides first class integration with tRPC.
 
 # Installation
 
-## 1. Add to existing Nuxt project
-
 ::code-group
 
 ```bash [pnpm]
-pnpm add @trpc/server@next @trpc/client@next trpc-nuxt@beta zod
+pnpm add @trpc/server@next @trpc/client@next trpc-nuxt zod
 ```
 
 ```bash [npm]
-npm install @trpc/server@next @trpc/client@next trpc-nuxt@beta zod
+npm install @trpc/server@next @trpc/client@next trpc-nuxt zod
 ```
 
 ```bash [yarn]
-yarn add @trpc/server@next @trpc/client@next trpc-nuxt@beta zod
+yarn add @trpc/server@next @trpc/client@next trpc-nuxt zod
 ```
 
 ::
@@ -35,18 +33,6 @@ For making typesafe API calls from your client.
 
 Most examples use [Zod](https://github.com/colinhacks/zod) for input validation and tRPC.io highly recommends it, though it isn't required.
 
-## 2. Install module
-
-This will transpile `trpc-nuxt` and exclude `trpc-nuxt/client` from optimized dependencies by Vite.
-
-```ts [nuxt.config.ts]
-export default defineNuxtConfig({
-  modules: ['trpc-nuxt/module']
-})
-```
-
-::
-
 ## Next Steps
 
 Now that you've installed the required dependencies, you are ready to start building your application.

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

@@ -88,15 +88,14 @@ If you need to split your router into several subrouters, you can implement them
 
 ## 2. Create tRPC client plugin
 
-Create a set of strongly-typed composables using your API's type signature.
+Create a strongly-typed plugin using your API's type signature.
 
 ```ts [plugins/client.ts]
-import { httpBatchLink } from '@trpc/client'
-import { createTRPCNuxtProxyClient } from 'trpc-nuxt/client'
+import { httpBatchLink, createTRPCProxyClient } from '@trpc/client'
 import type { AppRouter } from '@/server/trpc/routers'
 
 export default defineNuxtPlugin(() => {
-  const client = createTRPCNuxtProxyClient<AppRouter>({
+  const client = createTRPCProxyClient<AppRouter>({
     links: [
       httpBatchLink({
         /**
@@ -122,19 +121,10 @@ export default defineNuxtPlugin(() => {
 <script setup lang="ts">
 const { $client } = useNuxtApp()
 
-// query and mutate uses useAsyncData under the hood
-const { data, pending, error } = await $client.hello.query({ text: 'client' })
+const data = await $client.hello.query({ text: 'client' })
 </script>
 
 <template>
-  <div v-if="pending">
-    Loading...
-  </div>
-  <div v-else-if="error?.data?.code">
-    Error: {{ error.data.code }}
-  </div>
-  <div v-else>
-    <p>{{ hello.data?.greeting }}</p>
-  </div>
+  <p>{{data?.greeting }}</p>
 </template>
 ```

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

@@ -0,0 +1,40 @@
+---
+title: Composables
+---
+
+# 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.
+
+## Inference Helpers
+
+`@trpc/server` exports the following helper types to assist with inferring these types from the `AppRouter` exported by your `@trpc/server` router:
+
+- `inferRouterInputs<TRouter>`
+- `inferRouterOutputs<TRouter>`
+
+Let's assume we have this example query wrapped within Nuxt's [useAsyncData](https://v3.nuxtjs.org/api/composables/use-async-data/):
+
+```ts
+const { data, error } = await useAsyncData(() => $client.todo.getTodos.query())
+```
+
+We can wrap this in a composable and also set the client error types:
+
+```ts [composables/useGetTodos.ts]
+import { TRPCClientError } 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>
+
+export default function useGetTodos() {
+  const { $client } = useNuxtApp()
+  return useAsyncData<GetTodosOutput, ErrorOutput>(() => $client.todo.getTodos.query())
+}
+```
+
+Now, we have a fully-typed composable.

docs/content/1.get-started/3.tips/2.headers.md

@@ -0,0 +1,40 @@
+---
+title: Headers
+---
+
+# Headers
+
+We can use the built-in [useRequestHeaders](https://v3.nuxtjs.org/api/composables/use-request-headers/) to set outgoing request headers:
+
+```ts [plugins/client.ts]
+export default defineNuxtPlugin(() => {
+  const headers = useRequestHeaders()
+
+  const client = createTRPCProxyClient<AppRouter>({
+    links: [
+      httpBatchLink({
+        // headers need to be a function so it gets called dynamically
+        // every HTTP request
+        headers() {
+          // You can add more custom headers here
+          return headers
+        }
+      }),
+    ],
+  })
+
+  return {
+    provide: {
+      client,
+    },
+  }
+})
+```
+
+```ts [server/trpc/context.ts]
+export function createContext (event: H3Event) {
+  console.log('cookies', parseCookies(event))
+
+  return {}
+}
+```

docs/content/1.get-started/3.tips/3.authorization.md

@@ -0,0 +1,103 @@
+---
+title: Authorization
+---
+
+# Authorization
+
+The `createContext` function is called for each incoming request so here you can add contextual information about the calling user from the request object.
+
+::alert{type="warning"}
+Before you can access request headers in any context or middleware, you need to set the outgoing request headers. See [here](/get-started/tips/headers).
+::
+
+## Create context from request headers
+
+```ts [server/trpc/context.ts]
+import { inferAsyncReturnType } from '@trpc/server'
+import { decodeAndVerifyJwtToken } from './somewhere/in/your/app/utils'
+
+export async function createContext(event: H3Event) {
+  // Create your context based on the request object
+  // Will be available as `ctx` in all your resolvers
+
+  // This is just an example of something you might want to do in your ctx fn
+  const authorization = getRequestHeader(event, 'authorization')
+  async function getUserFromHeader() {
+    if (authorization) {
+      const user = await decodeAndVerifyJwtToken(authorization.split(' ')[1])
+      return user
+    }
+    return null
+  }
+  const user = await getUserFromHeader()
+
+  return {
+    user,
+  }
+}
+type Context = inferAsyncReturnType<typeof createContext>
+```
+
+## Option 1: Authorize using resolver
+
+```ts
+import { TRPCError, initTRPC } from '@trpc/server'
+import type { Context } from '../context'
+
+export const t = initTRPC.context<Context>().create()
+
+const appRouter = t.router({
+  // open for anyone
+  hello: t.procedure
+    .input(z.string().nullish())
+    .query(({ input, ctx }) => `hello ${input ?? ctx.user?.name ?? 'world'}`),
+  // checked in resolver
+  secret: t.procedure.query(({ ctx }) => {
+    if (!ctx.user) {
+      throw new TRPCError({ code: 'UNAUTHORIZED' })
+    }
+    return {
+      secret: 'sauce',
+    }
+  }),
+})
+```
+
+## Option 2: Authorize using middleware
+
+```ts
+import { TRPCError, initTRPC } from '@trpc/server'
+
+export const t = initTRPC.context<Context>().create()
+
+const isAuthed = t.middleware(({ next, ctx }) => {
+  if (!ctx.user?.isAdmin) {
+    throw new TRPCError({ code: 'UNAUTHORIZED' })
+  }
+  return next({
+    ctx: {
+      user: ctx.user,
+    },
+  })
+})
+
+// you can reuse this for any procedure
+export const protectedProcedure = t.procedure.use(isAuthed)
+
+t.router({
+  // this is accessible for everyone
+  hello: t.procedure
+    .input(z.string().nullish())
+    .query(({ input, ctx }) => `hello ${input ?? ctx.user?.name ?? 'world'}`),
+  admin: t.router({
+    // this is accessible only to admins
+    secret: protectedProcedure.query(({ ctx }) => {
+      return {
+        secret: 'sauce',
+      }
+    }),
+  }),
+})
+```
+
+This page is entirely based on [authorization docs](https://trpc.io/docs/v10/authorization) of tRPC with a minimal change made to work with Nuxt.

docs/content/1.get-started/3.tips/4.server-side-calls.md

@@ -0,0 +1,84 @@
+---
+title: Server Side Calls
+---
+
+# Server Side Calls
+
+You may need to call your procedure(s) directly from the server, `createCaller()` function returns you an instance of `RouterCaller` able to execute queries and mutations.
+
+## Input query example
+
+We create the router with a input query and then we call the asynchronous `greeting` procedure to get the result.
+
+::code-group
+
+```ts [server/trpc/trpc.ts]
+import { initTRPC } from '@trpc/server'
+import { z } from 'zod'
+ 
+const t = initTRPC.create()
+ 
+export const router = t.router({
+  // Create procedure at path 'greeting'
+  greeting: t.procedure
+    .input(z.object({ name: z.string() }))
+    .query(({ input }) => `Hello ${input.name}`),
+})
+```
+
+```ts [server/api/greeting.ts]
+import { router } from '@/server/trpc/trpc'
+
+export default eventHandler(async (event) => {
+  const { name } = getQuery(event)
+  const caller = router.createCaller({})
+
+  const greeting = await caller.greeting({ name })
+
+  return {
+    greeting
+  }
+})
+```
+
+::
+
+## Mutation example
+
+We create the router with a mutation and then we call the asynchronous `post` procedure to get the result.
+
+::code-group
+
+```ts [server/trpc/trpc.ts]
+import { initTRPC } from '@trpc/server'
+import { z } from 'zod'
+ 
+const posts = ['One', 'Two', 'Three']
+ 
+const t = initTRPC.create()
+export const router = t.router({
+  post: t.router({
+    add: t.procedure.input(z.string()).mutation(({ input }) => {
+      posts.push(input)
+      return posts
+    }),
+  }),
+})
+```
+
+```ts [server/api/post.ts]
+import { router } from '@/server/trpc/trpc'
+
+export default eventHandler(async (event) => {
+  const body = await getBody(event)
+  const caller = router.createCaller({})
+
+  const post = await caller.post.add(body.post)
+
+  return {
+    post
+  }
+})
+```
+
+::

docs/content/1.get-started/3.tips/5.aborting-procedures.md

@@ -0,0 +1,24 @@
+---
+title: Aborting Procedures
+---
+
+# Aborting Procedures
+
+tRPC adheres to the industry standard when it comes to aborting procedures. All you have to do is pass an `AbortSignal` to the query-options and then call its parent `AbortController`'s `abort` method.
+
+```ts [composables/useGetTodo.ts]
+export default function useGetTodo(id: number) {
+  const { $client } = useNuxtApp()
+  const ac = new AbortController()
+
+  onScopeDispose(() => {
+    ac.abort()
+  })
+  
+  return useAsyncData(() => {
+    return $client.todo.getTodo.query(id, {
+      signal: ac.signal
+    })
+  })
+}
+```

docs/content/1.get-started/index.md

@@ -0,0 +1,4 @@
+---
+navigation: false
+redirect: /get-started/installation
+---

docs/content/index.md

@@ -1,6 +1,6 @@
 ---
 title: "tRPC Nuxt"
-description: "A supa simple wrapper arousnd supabase-js to enable usage and integration within Nuxt."
+description: "End-to-end typesafe APIs in Nuxt applications."
 navigation: false
 layout: page
 ---
@@ -13,7 +13,7 @@ cta:
 secondary:
   - Star on GitHub ->
   - https://github.com/wobsoriano/trpc-nuxt
-snippet: npm install trpc-nuxt@beta
+snippet: npm install trpc-nuxt
 ---
 
 #title
@@ -24,8 +24,8 @@ End-to-end typesafe APIs in Nuxt applications.
 
 #extra
   ::list
-  - Automatic typesafety
+  - Automatic typesafety 
   - Snappy DX
-  - Autocompletion
+  - Autocompletion on the client, for inputs, outputs and errors
   ::
 ::

docs/nuxt.config.ts

@@ -6,9 +6,9 @@ export default defineNuxtConfig({
   modules: ['@nuxtlabs/github-module'],
   extends: process.env.DOCUS_THEME_PATH || '@nuxt-themes/docus',
   github: {
-    owner: 'nuxt',
-    repo: 'content',
-    branch: 'main'
+    owner: 'wobsoriano',
+    repo: 'trpc-nuxt',
+    branch: 'next'
   },
   colorMode: {
     preference: 'dark'
@@ -17,10 +17,6 @@ export default defineNuxtConfig({
     transpile: [/content-edge/, /github-module/]
   },
   nitro: {
-    prerender: {
-      crawlLinks: true,
-      routes: ['/']
-    },
     preset: 'vercel'
   }
 })

docs/package.json

@@ -8,12 +8,10 @@
     "preview": "nuxi preview"
   },
   "dependencies": {
-    "nuxt": "^3.0.0-rc.13",
-    "@nuxtjs/tailwindcss": "^6.1.3"
+    "nuxt": "^3.0.0"
   },
   "devDependencies": {
-    "@nuxt-themes/docus": "npm:@nuxt-themes/docus-edge@latest",
-    "@nuxtlabs/github-module": "npm:@nuxtlabs/github-module-edge@latest"
-  },
-  "packageManager": "yarn@1.22.19"
+    "@nuxt-themes/docus": "^0.3.1",
+    "@nuxtlabs/github-module": "^1.5.3"
+  }
 }

docs/tokens.config.ts

@@ -1,14 +1,6 @@
 import { defineTheme } from 'pinceau'
 
 export default defineTheme({
-  title: 'tRPC-Nuxt',
-  cover: {
-    src: 'https://og-image.vercel.app/tRPC-Nuxt',
-    alt: 'tRPC-Nuxt conver'
-  },
-  aside: {
-    level: 1
-  },
   colors: {
     primary: {
       50: '#BFEDFC',

module.mjs

@@ -1,17 +0,0 @@
-import { defineNuxtModule } from '@nuxt/kit'
-
-export default defineNuxtModule({
-  meta: {
-    name: 'trpc-nuxt',
-    configKey: 'trpc',
-    compatibility: {
-      nuxt: '^3.0.0-rc.13'
-    }
-  },
-  setup (_moduleOptions, nuxt) {
-    nuxt.options.build.transpile.push('trpc-nuxt')
-    nuxt.options.vite.optimizeDeps = nuxt.options.vite.optimizeDeps || {}
-    nuxt.options.vite.optimizeDeps.exclude = nuxt.options.vite.optimizeDeps.exclude || []
-    nuxt.options.vite.optimizeDeps.exclude.push('trpc-nuxt/client')
-  }
-})

package.json

@@ -1,33 +1,24 @@
 {
   "name": "trpc-nuxt",
+  "description": "End-to-end typesafe APIs in Nuxt applications.",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.4.3",
   "license": "MIT",
   "sideEffects": false,
   "exports": {
-    "./package.json": "./package.json",
     ".": {
       "require": "./dist/index.cjs",
       "import": "./dist/index.mjs"
-    },
-    "./client": {
-      "require": "./dist/client/index.cjs",
-      "import": "./dist/client/index.mjs"
-    },
-    "./module": {
-      "import": "./module.mjs"
     }
   },
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist",
-    "client.d.ts",
-    "module.mjs"
+    "dist"
   ],
   "scripts": {
-    "dev": "concurrently \"pnpm build --watch\" \"pnpm --filter playground dev\"",
+    "dev": "concurrently \"pnpm build -- --watch\" \"pnpm --filter playground dev\"",
     "dev:prepare": "pnpm build && nuxt prepare playground",
     "prepublishOnly": "pnpm build",
     "build": "tsup",
@@ -36,32 +27,25 @@
     "release": "bumpp && npm publish"
   },
   "peerDependencies": {
-    "@trpc/client": "^10.0.0-proxy-beta.21",
-    "@trpc/server": "^10.0.0-proxy-beta.21"
+    "@trpc/client": "^10.0.0",
+    "@trpc/server": "^10.0.0"
   },
   "dependencies": {
-    "h3": "^0.8.6",
+    "h3": "^1.0.1",
     "nanoid": "^4.0.0",
-    "nuxt": "^3.0.0-rc.13",
-    "ohash": "^0.1.5",
-    "ufo": "^0.8.6"
+    "ohash": "^1.0.0",
+    "ufo": "^1.0.0"
   },
   "devDependencies": {
-    "@nuxt/kit": "3.0.0-rc.13",
     "@nuxtjs/eslint-config-typescript": "^11.0.0",
-    "@trpc/client": "10.0.0-rc.7",
-    "@trpc/server": "10.0.0-rc.7",
+    "@trpc/client": "^10.1.0",
+    "@trpc/server": "^10.1.0",
     "bumpp": "^8.2.1",
     "concurrently": "^7.5.0",
     "eslint": "^8.25.0",
     "tsup": "6.4.0",
     "typescript": "^4.7.4"
   },
-  "pnpm": {
-    "patchedDependencies": {
-      "nuxt@3.0.0-rc.13": "patches/nuxt@3.0.0-rc.13.patch"
-    }
-  },
   "eslintConfig": {
     "extends": [
       "@nuxtjs/eslint-config-typescript"
@@ -77,6 +61,8 @@
   "eslintIgnore": [
     "*.json",
     "node_modules",
-    "*.md"
+    "*.md",
+    "dist",
+    ".output"
   ]
 }

patches/nuxt@3.0.0-rc.13.patch

@@ -1,22 +0,0 @@
-diff --git a/dist/head/runtime/lib/vueuse-head.plugin.mjs b/dist/head/runtime/lib/vueuse-head.plugin.mjs
-index a3278e56986d8e8efb099c502c82d9661a36d846..148a8879ba433072cecd15995cfd5b1b69941124 100644
---- a/dist/head/runtime/lib/vueuse-head.plugin.mjs
-+++ b/dist/head/runtime/lib/vueuse-head.plugin.mjs
-@@ -4,7 +4,7 @@ import { defineNuxtPlugin, useRouter } from "#app";
- import { appHead } from "#build/nuxt.config.mjs";
- export default defineNuxtPlugin((nuxtApp) => {
-   const head = createHead();
--  head.addEntry(appHead, { resolved: true });
-+  head.addHeadObjs(appHead, { resolved: true });
-   nuxtApp.vueApp.use(head);
-   if (process.client) {
-     let pauseDOMUpdates = true;
-@@ -25,7 +25,7 @@ export default defineNuxtPlugin((nuxtApp) => {
-   }
-   nuxtApp._useHead = (_meta, options) => {
-     if (process.server) {
--      head.addEntry(_meta, options);
-+      head.addHeadObjs(_meta, options);
-       return;
-     }
-     const cleanUp = head.addReactiveEntry(_meta, options);

playground/nuxt.config.ts

@@ -1,4 +1,3 @@
 // https://v3.nuxtjs.org/api/configuration/nuxt.config
 export default defineNuxtConfig({
-  modules: ['trpc-nuxt/module']
 })

playground/package.json

@@ -9,13 +9,13 @@
     "postinstall": "nuxt prepare"
   },
   "dependencies": {
-    "@trpc/client": "10.0.0-rc.7",
-    "@trpc/server": "10.0.0-rc.7",
+    "@trpc/client": "^10.1.0",
+    "@trpc/server": "^10.1.0",
     "superjson": "^1.11.0",
     "trpc-nuxt": "workspace:*",
     "zod": "^3.19.1"
   },
   "devDependencies": {
-    "nuxt": "^3.0.0-rc.13"
+    "nuxt": "^3.0.0"
   }
 }

playground/pages/index.vue

@@ -1,11 +1,9 @@
 <script setup lang="ts">
-const { $client } = useNuxtApp()
-// const headers = useClientHeaders()
+import { TRPCClientError } from '@trpc/client';
+import type { inferRouterOutputs } from '@trpc/server';
+import type { AppRouter } from '~~/server/trpc/routers';
 
-// const addHeader = () => {
-//   headers.value.authorization = 'Bearer abcdefghijklmnop'
-//   console.log(headers.value)
-// }
+const { $client } = useNuxtApp()
 
 const addTodo = async () => {
   const title = Math.random().toString(36).slice(2, 7)
@@ -17,17 +15,16 @@ const addTodo = async () => {
       title,
       completed: false
     })
-    console.log(x.data.value)
+    console.log(x)
   } catch (e) {
     console.log(e)
   }
 }
 
-const { data: todos, pending, error, refresh } = await $client.todo.getTodos.query(undefined, {
-  trpc: {
-    abortOnUnmount: true
-  }
-})
+type RouterOutput = inferRouterOutputs<AppRouter>;
+type ErrorOutput = TRPCClientError<AppRouter>
+
+const { data: todos, pending, error, refresh } = await useAsyncData<RouterOutput['todo']['getTodos'], ErrorOutput>(() => $client.todo.getTodos.query())
 </script>
 
 <template>

playground/pages/todo/[id].vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 const route = useRoute()
 const { $client } = useNuxtApp()
-const { data: todo, pending, error } = await $client.todo.getTodo.query(Number(route.params.id))
+const { data: todo, pending, error } = await useAsyncData(() => $client.todo.getTodo.query(Number(route.params.id)))
 </script>
 
 <template>

playground/plugins/trpc-client.ts

@@ -1,10 +1,10 @@
-import { httpBatchLink, loggerLink } from '@trpc/client'
-import { createTRPCNuxtProxyClient } from 'trpc-nuxt/client'
+import { createTRPCProxyClient, httpBatchLink, loggerLink } from '@trpc/client'
 import superjson from 'superjson'
 import type { AppRouter } from '~~/server/trpc/routers'
 
 export default defineNuxtPlugin(() => {
-  const client = createTRPCNuxtProxyClient<AppRouter>({
+  const headers = useRequestHeaders()
+  const client = createTRPCProxyClient<AppRouter>({
     transformer: superjson,
     links: [
       // adds pretty logs to your console in development and logs errors in production
@@ -14,7 +14,10 @@ export default defineNuxtPlugin(() => {
           (opts.direction === 'down' && opts.result instanceof Error)
       }),
       httpBatchLink({
-        url: 'http://localhost:3000/api/trpc'
+        url: 'http://localhost:3000/api/trpc',
+        headers () {
+          return headers
+        }
       })
     ]
   })

playground/server/trpc/context.ts

@@ -9,9 +9,10 @@ export type Context = inferAsyncReturnType<typeof createContext>
  * @link https://trpc.io/docs/context
  */
 export function createContext (
-  opts: H3Event
+  event: H3Event
 ) {
   // for API-response caching see https://trpc.io/docs/caching
-
+  console.log('cookies', parseCookies(event))
+  
   return {}
 }

src/client/index.ts

@@ -1,66 +0,0 @@
-import type { CreateTRPCClientOptions, inferRouterProxyClient } from '@trpc/client'
-import { createTRPCProxyClient } from '@trpc/client'
-import type {
-  AnyRouter
-} from '@trpc/server'
-import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared'
-import { hash } from 'ohash'
-import { nanoid } from 'nanoid'
-import type { DecoratedProcedureRecord } from './types'
-// @ts-expect-error: Nuxt auto-imports
-import { getCurrentInstance, onScopeDispose, useAsyncData } from '#imports'
-
-/**
- * Calculates the key used for `useAsyncData` call
- */
-export function getQueryKey (
-  path: string,
-  input: unknown
-): string {
-  return input === undefined ? path : `${path}-${hash(input || '')}`
-}
-
-function createNuxtProxyDecoration<TRouter extends AnyRouter> (name: string, client: inferRouterProxyClient<TRouter>) {
-  return createRecursiveProxy((opts) => {
-    const args = opts.args
-
-    const pathCopy = [name, ...opts.path]
-
-    // The last arg is for instance `.mutate` or `.query()`
-    const lastArg = pathCopy.pop()!
-
-    const path = pathCopy.join('.')
-
-    const [input, otherOptions] = args
-
-    const queryKey = lastArg === 'mutate' ? nanoid() : getQueryKey(path, input)
-
-    const { trpc, ...asyncDataOptions } = otherOptions || {} as any
-
-    let controller: AbortController
-
-    if (trpc?.abortOnUnmount) {
-      if (getCurrentInstance()) {
-        onScopeDispose(() => {
-          controller?.abort?.()
-        })
-      }
-      controller = typeof AbortController !== 'undefined' ? new AbortController() : {} as AbortController
-    }
-
-    return useAsyncData(queryKey, () => (client as any)[path][lastArg](input, {
-      signal: controller?.signal,
-      ...trpc
-    }), asyncDataOptions)
-  })
-}
-
-export function createTRPCNuxtProxyClient<TRouter extends AnyRouter> (opts: CreateTRPCClientOptions<TRouter>) {
-  const client = createTRPCProxyClient(opts)
-
-  const decoratedClient = createFlatProxy((key) => {
-    return createNuxtProxyDecoration(key, client)
-  }) as DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>
-
-  return decoratedClient
-}

src/client/types.ts

@@ -1,85 +0,0 @@
-import type { TRPCClientErrorLike, TRPCRequestOptions } from '@trpc/client'
-import type { TRPCSubscriptionObserver } from '@trpc/client/dist/internals/TRPCClient'
-import type {
-  AnyMutationProcedure,
-  AnyProcedure,
-  AnyQueryProcedure,
-  AnyRouter,
-  AnySubscriptionProcedure,
-  ProcedureArgs,
-  ProcedureRouterRecord,
-  inferProcedureInput,
-  inferProcedureOutput
-} from '@trpc/server'
-import type { Unsubscribable, inferObservableValue } from '@trpc/server/observable'
-import type {
-  AsyncData,
-  AsyncDataOptions,
-  KeyOfRes,
-  PickFrom,
-  _Transform
-} from 'nuxt/dist/app/composables/asyncData'
-
-// Modified @trpc/client and @trpc/react-query types
-// https://github.com/trpc/trpc/blob/next/packages/client/src/createTRPCClientProxy.ts
-// https://github.com/trpc/trpc/blob/next/packages/react-query/src/createTRPCReact.tsx
-
-interface TRPCOptions extends TRPCRequestOptions {
-  abortOnUnmount?: boolean
-}
-
-type SubscriptionResolver<
-  TProcedure extends AnyProcedure,
-  TRouter extends AnyRouter,
-> = (
-  ...args: [
-    input: ProcedureArgs<TProcedure['_def']>[0],
-    opts: ProcedureArgs<TProcedure['_def']>[1] &
-    Partial<
-        TRPCSubscriptionObserver<
-          inferObservableValue<inferProcedureOutput<TProcedure>>,
-          TRPCClientErrorLike<TRouter>
-        >
-      >,
-  ]
-) => Unsubscribable
-
-type DecorateProcedure<
-  TProcedure extends AnyProcedure,
-  TRouter extends AnyRouter,
-> = TProcedure extends AnyQueryProcedure
-  ? {
-      query: <
-      TData = inferProcedureOutput<TProcedure>,
-      Transform extends _Transform<TData> = _Transform<TData, TData>,
-      PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>,
-     >(
-        input: inferProcedureInput<TProcedure>,
-        opts?: AsyncDataOptions<TData, Transform, PickKeys> & { trpc: TRPCOptions },
-      ) => AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, TRPCClientErrorLike<TProcedure>>
-    } : TProcedure extends AnyMutationProcedure ? {
-      mutate: <
-      TData = inferProcedureOutput<TProcedure>,
-      Transform extends _Transform<TData> = _Transform<TData, TData>,
-      PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>,
-     >(
-        input: inferProcedureInput<TProcedure>,
-        opts?: AsyncDataOptions<TData, Transform, PickKeys> & { trpc: TRPCOptions },
-      ) => AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, TRPCClientErrorLike<TProcedure>>
-    } : TProcedure extends AnySubscriptionProcedure ? {
-      subscribe: SubscriptionResolver<TProcedure, TRouter>
-    } : never
-
-/**
-* @internal
-*/
-export type DecoratedProcedureRecord<
-  TProcedures extends ProcedureRouterRecord,
-  TRouter extends AnyRouter,
-> = {
-  [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
-    ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record'], TRouter>
-    : TProcedures[TKey] extends AnyProcedure
-      ? DecorateProcedure<TProcedures[TKey], TRouter>
-      : never;
-}

src/index.ts

@@ -1 +1,126 @@
-export * from './server'
+import type { ResponseMeta } from '@trpc/server/http'
+import { resolveHTTPResponse } from '@trpc/server/http'
+import type {
+  AnyRouter,
+  ProcedureType,
+  inferRouterContext,
+  inferRouterError
+} from '@trpc/server'
+import {
+  TRPCError
+} from '@trpc/server'
+import { createURL } from 'ufo'
+import type { H3Event } from 'h3'
+import { createError, defineEventHandler, isMethod, readBody } from 'h3'
+import type { TRPCResponse } from '@trpc/server/rpc'
+
+type MaybePromise<T> = T | Promise<T>
+
+export type CreateContextFn<TRouter extends AnyRouter> = (event: H3Event) => MaybePromise<inferRouterContext<TRouter>>
+
+export interface ResponseMetaFnPayload<TRouter extends AnyRouter> {
+  data: TRPCResponse<unknown, inferRouterError<TRouter>>[]
+  ctx?: inferRouterContext<TRouter>
+  paths?: string[]
+  type: ProcedureType | 'unknown'
+  errors: TRPCError[]
+}
+
+export type ResponseMetaFn<TRouter extends AnyRouter> = (opts: ResponseMetaFnPayload<TRouter>) => ResponseMeta
+
+export interface OnErrorPayload<TRouter extends AnyRouter> {
+  error: TRPCError
+  type: ProcedureType | 'unknown'
+  path: string | undefined
+  req: H3Event['node']['req']
+  input: unknown
+  ctx: undefined | inferRouterContext<TRouter>
+}
+
+export type OnErrorFn<TRouter extends AnyRouter> = (opts: OnErrorPayload<TRouter>) => void
+
+export interface ResolveHTTPRequestOptions<TRouter extends AnyRouter> {
+  router: TRouter
+  createContext?: CreateContextFn<TRouter>
+  responseMeta?: ResponseMetaFn<TRouter>
+  onError?: OnErrorFn<TRouter>
+  batching?: {
+    enabled: boolean
+  }
+}
+
+function getPath (event: H3Event): string | null {
+  if (typeof event.context.params.trpc === 'string') { return event.context.params.trpc }
+
+  if (Array.isArray(event.context.params.trpc)) { return event.context.params.trpc.join('/') }
+
+  return null
+}
+
+export function createNuxtApiHandler<TRouter extends AnyRouter> ({
+  router,
+  createContext,
+  responseMeta,
+  onError,
+  batching
+}: ResolveHTTPRequestOptions<TRouter>) {
+  return defineEventHandler(async (event) => {
+    const {
+      req,
+      res
+    } = event.node
+
+    const $url = createURL(req.url!)
+
+    const path = getPath(event)
+
+    if (path === null) {
+      const error = router.getErrorShape({
+        error: new TRPCError({
+          message:
+            'Param "trpc" not found - is the file named `[trpc]`.ts or `[...trpc].ts`?',
+          code: 'INTERNAL_SERVER_ERROR'
+        }),
+        type: 'unknown',
+        ctx: undefined,
+        path: undefined,
+        input: undefined
+      })
+
+      throw createError({
+        statusCode: 500,
+        statusMessage: JSON.stringify(error)
+      })
+    }
+
+    const httpResponse = await resolveHTTPResponse({
+      batching,
+      router,
+      req: {
+        method: req.method!,
+        headers: req.headers,
+        body: isMethod(event, 'GET') ? null : await readBody(event),
+        query: $url.searchParams
+      },
+      path,
+      createContext: async () => await createContext?.(event),
+      responseMeta,
+      onError: (o) => {
+        onError?.({
+          ...o,
+          req
+        })
+      }
+    })
+
+    const { status, headers, body } = httpResponse
+
+    res.statusCode = status
+
+    headers && Object.keys(headers).forEach((key) => {
+      res.setHeader(key, headers[key]!)
+    })
+
+    return body
+  })
+}

src/server.ts

@@ -1,126 +0,0 @@
-import type { ResponseMeta } from '@trpc/server/http'
-import { resolveHTTPResponse } from '@trpc/server/http'
-import type {
-  AnyRouter,
-  ProcedureType,
-  inferRouterContext,
-  inferRouterError
-} from '@trpc/server'
-import {
-  TRPCError
-} from '@trpc/server'
-import { createURL } from 'ufo'
-import type { H3Event } from 'h3'
-import { createError, defineEventHandler, isMethod, readBody } from 'h3'
-import type { TRPCResponse } from '@trpc/server/rpc'
-
-type MaybePromise<T> = T | Promise<T>
-
-export type CreateContextFn<TRouter extends AnyRouter> = (event: H3Event) => MaybePromise<inferRouterContext<TRouter>>
-
-export interface ResponseMetaFnPayload<TRouter extends AnyRouter> {
-  data: TRPCResponse<unknown, inferRouterError<TRouter>>[]
-  ctx?: inferRouterContext<TRouter>
-  paths?: string[]
-  type: ProcedureType | 'unknown'
-  errors: TRPCError[]
-}
-
-export type ResponseMetaFn<TRouter extends AnyRouter> = (opts: ResponseMetaFnPayload<TRouter>) => ResponseMeta
-
-export interface OnErrorPayload<TRouter extends AnyRouter> {
-  error: TRPCError
-  type: ProcedureType | 'unknown'
-  path: string | undefined
-  req: H3Event['req']
-  input: unknown
-  ctx: undefined | inferRouterContext<TRouter>
-}
-
-export type OnErrorFn<TRouter extends AnyRouter> = (opts: OnErrorPayload<TRouter>) => void
-
-export interface ResolveHTTPRequestOptions<TRouter extends AnyRouter> {
-  router: TRouter
-  createContext?: CreateContextFn<TRouter>
-  responseMeta?: ResponseMetaFn<TRouter>
-  onError?: OnErrorFn<TRouter>
-  batching?: {
-    enabled: boolean
-  }
-}
-
-function getPath (event: H3Event): string | null {
-  if (typeof event.context.params.trpc === 'string') { return event.context.params.trpc }
-
-  if (Array.isArray(event.context.params.trpc)) { return event.context.params.trpc.join('/') }
-
-  return null
-}
-
-export function createNuxtApiHandler<TRouter extends AnyRouter> ({
-  router,
-  createContext,
-  responseMeta,
-  onError,
-  batching
-}: ResolveHTTPRequestOptions<TRouter>) {
-  return defineEventHandler(async (event) => {
-    const {
-      req,
-      res
-    } = event
-
-    const $url = createURL(req.url!)
-
-    const path = getPath(event)
-
-    if (path === null) {
-      const error = router.getErrorShape({
-        error: new TRPCError({
-          message:
-            'Param "trpc" not found - is the file named `[trpc]`.ts or `[...trpc].ts`?',
-          code: 'INTERNAL_SERVER_ERROR'
-        }),
-        type: 'unknown',
-        ctx: undefined,
-        path: undefined,
-        input: undefined
-      })
-
-      throw createError({
-        statusCode: 500,
-        statusMessage: JSON.stringify(error)
-      })
-    }
-
-    const httpResponse = await resolveHTTPResponse({
-      batching,
-      router,
-      req: {
-        method: req.method!,
-        headers: req.headers,
-        body: isMethod(event, 'GET') ? null : await readBody(event),
-        query: $url.searchParams
-      },
-      path,
-      createContext: async () => await createContext?.(event),
-      responseMeta,
-      onError: (o) => {
-        onError?.({
-          ...o,
-          req
-        })
-      }
-    })
-
-    const { status, headers, body } = httpResponse
-
-    res.statusCode = status
-
-    headers && Object.keys(headers).forEach((key) => {
-      res.setHeader(key, headers[key]!)
-    })
-
-    return body
-  })
-}

tsup.config.ts

@@ -1,15 +1,15 @@
 import { defineConfig } from 'tsup'
 
 export default defineConfig({
-  entry: ['src/index.ts', 'src/client/index.ts'],
+  entry: ['src/index.ts'],
   format: ['cjs', 'esm'],
   splitting: false,
   clean: true,
   external: ['#app', '#imports'],
   dts: true,
-  outExtension({ format }) {
+  outExtension ({ format }) {
     return {
-      js: format === 'esm' ? '.mjs' : `.${format}`,
+      js: format === 'esm' ? '.mjs' : `.${format}`
     }
-  },
+  }
 })