chore: release v0.4.2

Update 2.server-side-calls.md

.gitignore

@@ -49,3 +49,5 @@ coverage
 Network Trash Folder
 Temporary Items
 .apdisk
+
+.vercel

README.md

@@ -1,10 +1,21 @@
 # tRPC-Nuxt
 
-[![Version](https://img.shields.io/npm/v/trpc-nuxt?style=flat&colorA=000000&colorB=000000)](https://www.npmjs.com/package/trpc-nuxt)
-
 End-to-end typesafe APIs with [tRPC.io](https://trpc.io/) in Nuxt applications.
 
-Learn more about tRPC.io [here](https://trpc.io/docs/v10).
+<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).
 
 ## Recommended IDE Setup
 

client.d.ts

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

docs/.gitignore

@@ -0,0 +1 @@
+.vercel

docs/app.config.ts

@@ -1,5 +1,25 @@
 export default defineAppConfig({
   docus: {
     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@next zod
+pnpm add @trpc/server@next @trpc/client@next trpc-nuxt zod
 ```
 
 ```bash [npm]
-npm install @trpc/server@next @trpc/client@next trpc-nuxt@next zod
+npm install @trpc/server@next @trpc/client@next trpc-nuxt zod
 ```
 
 ```bash [yarn]
-yarn add @trpc/server@next @trpc/client@next trpc-nuxt@next zod
+yarn add @trpc/server@next @trpc/client@next trpc-nuxt zod
 ```
 
 ::
@@ -35,56 +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. Enable strict mode
-
-If you want to use Zod for input validation, make sure you have enabled strict mode:
-
-::code-group
-
-```json [tsconfig.json]
-{
-  "extends": "./.nuxt/tsconfig.json",
-  "compilerOptions": {
-    "strict": true
-  }
-}
-```
-
-```ts [nuxt.config.ts]
-export default defineNuxtConfig({
-  typescript: {
-    strict: true
-  }
-})
-```
-
-::
-
-If strict mode is too much, at least enable `strictNullChecks`:
-
-::code-group
-
-```json [tsconfig.json]
-{
-  "extends": "./.nuxt/tsconfig.json",
-  "compilerOptions": {
-    "strictNullChecks": true
-  }
-}
-```
-
-```ts [nuxt.config.ts]
-export default defineNuxtConfig({
-  typescript: {
-    tsConfig: {
-      strictNullChecks: true
-    }
-  }
-})
-```
-
-::
-
 ## 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

@@ -35,7 +35,7 @@ Initialize your tRPC backend using the `initTRPC` function and create your first
 ::code-group
 
 ```ts [server/trpc/trpc.ts]
-import { TRPCError, initTRPC } from '@trpc/server'
+import { initTRPC } from '@trpc/server'
 
 // Avoid exporting the entire t-object since it's not very
 // descriptive and can be confusing to newcomers used to t
@@ -49,7 +49,7 @@ export const publicProcedure = t.procedure
 
 ```ts [server/trpc/routers/index.ts]
 import { z } from 'zod'
-import { publicProcedure, router } from '..'
+import { publicProcedure, router } from '../trpc'
 
 export const appRouter = router({
   hello: publicProcedure
@@ -71,7 +71,7 @@ export type AppRouter = typeof appRouter
 
 ```ts [server/api/trpc/[trpc].ts]
 import { createNuxtApiHandler } from 'trpc-nuxt'
-import { appRouter } from '../../trpc/routers'
+import { appRouter } from '@/server/trpc/routers'
 
 // export API handler
 export default createNuxtApiHandler({
@@ -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 { httpBatchLink, createTRPCProxyClient } from '@trpc/client'
-import { createTRPCNuxtProxyClient } from 'trpc-nuxt/client'
+import type { AppRouter } from '@/server/trpc/routers'
-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 = await $client.hello.query({ text: 'client' })
-const { data, pending, error } = await $client.hello.query({ text: 'client' })
 </script>
 
 <template>
-  <div v-if="pending">
+  <p>{{data?.greeting }}</p>
-    Loading...
-  </div>
-  <div v-else-if="error?.data?.code">
-    Error: {{ error.data.code }}
-  </div>
-  <div v-else>
-    <p>{{ hello.data?.greeting }}</p>
-  </div>
 </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.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/3.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/3.tips/4.authorization.md

@@ -0,0 +1,104 @@
+---
+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.
+
+## Create context from request headers
+
+```ts [server/trpc/context.ts]
+import type { H3Event } from 'h3'
+import { inferAsyncReturnType } from '@trpc/server'
+import { decodeAndVerifyJwtToken } from './somewhere/in/your/app/utils'
+
+export async function createContext({
+  req,
+  res,
+}: 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
+  async function getUserFromHeader() {
+    if (req.headers.authorization) {
+      const user = await decodeAndVerifyJwtToken(
+        req.headers.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/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@next
+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

@@ -1,16 +1,22 @@
 export default defineNuxtConfig({
   app: {
     pageTransition: false,
-    layoutTransition: false,
+    layoutTransition: false
+  },
+  modules: ['@nuxtlabs/github-module'],
+  extends: process.env.DOCUS_THEME_PATH || '@nuxt-themes/docus',
+  github: {
+    owner: 'wobsoriano',
+    repo: 'trpc-nuxt',
+    branch: 'next'
+  },
+  colorMode: {
+    preference: 'dark'
   },
-  extends: '@nuxt-themes/docus',
   build: {
-    transpile: [/content-edge/],
+    transpile: [/content-edge/, /github-module/]
   },
   nitro: {
-    prerender: {
+    preset: 'vercel'
-      crawlLinks: true,
+  }
-      routes: ['/'],
-    },
-  },
 })

docs/package.json

@@ -7,11 +7,11 @@
     "generate": "nuxi build",
     "preview": "nuxi preview"
   },
+  "dependencies": {
+    "nuxt": "^3.0.0"
+  },
   "devDependencies": {
-    "@docus/github": "npm:@docus/github-edge@latest",
+    "@nuxt-themes/docus": "^0.3.1",
-    "@nuxt-themes/docus": "npm:@nuxt-themes/docus-edge@0.1.0-2a7c428",
+    "@nuxtlabs/github-module": "^1.5.3"
-    "@nuxt-themes/website": "0.1.7",
-    "nuxt": "^3.0.0-rc.12",
-    "vue-plausible": "^1.3.2"
   }
 }

docs/tokens.config.ts

@@ -1,25 +1,18 @@
 import { defineTheme } from 'pinceau'
 
 export default defineTheme({
-  title: 'asddsasda 3s',
+  colors: {
-  cover: {
+    primary: {
-    src: 'https://res.cloudinary.com/nuxt/image/upload/v1650870623/nuxt3-rc-social_z6qh3m.png',
+      50: '#BFEDFC',
-    alt: 'Nuxt 3 cover image',
+      100: '#B0E9FB',
-  },
+      200: '#93DEFA',
-  aside: {
+      300: '#76D4F9',
-    level: 1,
+      400: '#58C8F7',
-  },
+      500: '#3BBBF6',
-  // colors: {
+      600: '#0BA6F3',
-  //   primary: {
+      700: '#0981C2',
-  //     100: '#77b0db',
+      800: '#075E91',
-  //     200: '#589ed3',
+      900: '#043D61'
-  //     300: '#4e98d0',
+    }
-  //     400: '#398ccb',
+  }
-  //     500: '#398ccb',
-  //     600: '#2BAB71',
-  //     700: '#317eb9',
-  //     800: '#2e77af',
-  //     900: '#266290',
-  //   },
-  // },
 })

package.json

@@ -1,60 +1,68 @@
 {
   "name": "trpc-nuxt",
-  "version": "0.4.0-beta.3",
+  "description": "End-to-end typesafe APIs in Nuxt applications.",
-  "packageManager": "pnpm@7.5.0",
+  "type": "module",
+  "version": "0.4.2",
   "license": "MIT",
   "sideEffects": false,
   "exports": {
-    "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "import": "./dist/index.mjs"
-    },
-    "./client": {
-      "require": "./dist/client/index.js",
-      "import": "./dist/client/index.mjs"
     }
   },
-  "main": "./dist/index.js",
+  "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist",
+    "dist"
-    "client.d.ts"
   ],
   "scripts": {
-    "prepublishOnly": "nr build",
+    "dev": "concurrently \"pnpm build --watch\" \"pnpm --filter playground dev\"",
+    "dev:prepare": "pnpm build && nuxt prepare playground",
+    "prepublishOnly": "pnpm build",
     "build": "tsup",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "release": "bumpp --commit --push --tag && npm publish"
+    "release": "bumpp && npm publish"
   },
   "peerDependencies": {
     "@trpc/client": "^10.0.0-proxy-beta.21",
-    "@trpc/server": "^10.0.0-proxy-beta.21",
+    "@trpc/server": "^10.0.0-proxy-beta.21"
-    "nuxt": "^3.0.0-rc.12"
   },
   "dependencies": {
-    "h3": "^0.8.5",
+    "h3": "^1.0.1",
-    "ohash": "^0.1.5",
+    "nanoid": "^4.0.0",
-    "ufo": "^0.8.6"
+    "ohash": "^1.0.0",
+    "ufo": "^1.0.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.27.0",
+    "@nuxtjs/eslint-config-typescript": "^11.0.0",
-    "@antfu/ni": "^0.18.3",
+    "@trpc/client": "10.0.0-rc.8",
-    "@trpc/client": "10.0.0-rc.2",
+    "@trpc/server": "10.0.0-rc.8",
-    "@trpc/server": "10.0.0-rc.2",
     "bumpp": "^8.2.1",
+    "concurrently": "^7.5.0",
     "eslint": "^8.25.0",
-    "nuxt": "3.0.0-rc.12",
+    "tsup": "6.4.0",
-    "pnpm": "^7.5.0",
-    "tsup": "6.0.1",
     "typescript": "^4.7.4"
   },
   "eslintConfig": {
-    "extends": "@antfu",
+    "extends": [
+      "@nuxtjs/eslint-config-typescript"
+    ],
     "rules": {
-      "no-console": "warn"
+      "@typescript-eslint/no-unused-vars": [
+        "off"
+      ],
+      "vue/multi-word-component-names": "off",
+      "vue/no-multiple-template-root": "off"
     }
-  }
+  },
+  "eslintIgnore": [
+    "*.json",
+    "node_modules",
+    "*.md",
+    "dist",
+    ".output"
+  ]
 }

playground/nuxt.config.ts

@@ -1,9 +1,3 @@
 // https://v3.nuxtjs.org/api/configuration/nuxt.config
 export default defineNuxtConfig({
-  runtimeConfig: {
-    baseURL: '',
-  },
-  typescript: {
-    strict: true,
-  },
 })

playground/package.json

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

playground/pages/index.vue

@@ -1,4 +1,8 @@
 <script setup lang="ts">
+import { TRPCClientError } from '@trpc/client';
+import type { inferRouterOutputs } from '@trpc/server';
+import type { AppRouter } from '~~/server/trpc/routers';
+
 const { $client } = useNuxtApp()
 // const headers = useClientHeaders()
 
@@ -15,16 +19,18 @@ const addTodo = async () => {
       id: Date.now(),
       userId: 69,
       title,
-      completed: false,
+      completed: false
     })
-    console.log(x.data.value)
+    console.log(x)
-  }
+  } catch (e) {
-  catch (e) {
     console.log(e)
   }
 }
 
-const { data: todos, pending, error, refresh } = await $client.todo.getTodos.query()
+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,50 +1,26 @@
-import { httpBatchLink, loggerLink } from '@trpc/client'
+import { createTRPCProxyClient, httpBatchLink, loggerLink } from '@trpc/client'
-import { createTRPCNuxtProxyClient } from 'trpc-nuxt/client'
 import superjson from 'superjson'
 import type { AppRouter } from '~~/server/trpc/routers'
 
-export default defineNuxtPlugin((nuxtApp) => {
+export default defineNuxtPlugin(() => {
-  const client = createTRPCNuxtProxyClient<AppRouter>({
+  const client = createTRPCProxyClient<AppRouter>({
     transformer: superjson,
     links: [
       // adds pretty logs to your console in development and logs errors in production
       loggerLink({
         enabled: opts =>
-          process.env.NODE_ENV === 'development'
+          process.env.NODE_ENV === 'development' ||
-          || (opts.direction === 'down' && opts.result instanceof Error),
+          (opts.direction === 'down' && opts.result instanceof Error)
       }),
       httpBatchLink({
-        url: 'http://localhost:3000/api/trpc',
+        url: 'http://localhost:3000/api/trpc'
-        /**
+      })
-           * Set custom request headers on every request from tRPC
+    ]
-           * @link https://trpc.io/docs/ssr
-           */
-        headers() {
-          if (nuxtApp.ssrContext?.event?.req) {
-            // To use SSR properly, you need to forward the client's headers to the server
-            // This is so you can pass through things like cookies when we're server-side rendering
-
-            // If you're using Node 18, omit the "connection" header
-            const {
-              // eslint-disable-next-line @typescript-eslint/no-unused-vars
-              connection: _connection,
-              ...headers
-            } = nuxtApp.ssrContext.event.req.headers
-            return {
-              ...headers,
-              // Optional: inform server that it's an SSR request
-              'x-ssr': '1',
-            }
-          }
-          return {}
-        },
-      }),
-    ],
   })
 
   return {
     provide: {
-      client,
+      client
-    },
+    }
   }
 })

playground/server/api/trpc/[trpc].ts

@@ -1,6 +1,6 @@
 import { createNuxtApiHandler } from 'trpc-nuxt'
-import { appRouter } from '../../trpc/routers'
+import { appRouter } from '@/server/trpc/routers'
-import { createContext } from '~~/server/trpc/context'
+import { createContext } from '@/server/trpc/context'
 
 export default createNuxtApiHandler({
   router: appRouter,
@@ -8,12 +8,12 @@ export default createNuxtApiHandler({
    * @link https://trpc.io/docs/context
    */
   createContext,
-  onError({ error }) {
+  onError ({ error }) {
     if (error.code === 'INTERNAL_SERVER_ERROR') {
       // send to bug reporting
       console.error('Something went wrong', error)
     }
-  },
+  }
   /**
    * @link https://trpc.io/docs/caching#api-response-caching
    */

playground/server/trpc/context.ts

@@ -8,8 +8,8 @@ export type Context = inferAsyncReturnType<typeof createContext>
  * Creates context for an incoming request
  * @link https://trpc.io/docs/context
  */
-export async function createContext(
+export function createContext (
-  opts: H3Event,
+  opts: H3Event
 ) {
   // for API-response caching see https://trpc.io/docs/caching
 

playground/server/trpc/routers/index.ts

@@ -4,7 +4,7 @@ import { userRouter } from './user'
 
 export const appRouter = router({
   todo: todoRouter,
-  user: userRouter,
+  user: userRouter
 })
 
 export type AppRouter = typeof appRouter

playground/server/trpc/routers/todo.ts

@@ -7,7 +7,7 @@ const TodoShape = z.object({
   userId: z.number(),
   id: z.number(),
   title: z.string(),
-  completed: z.boolean(),
+  completed: z.boolean()
 })
 
 export type Todo = z.infer<typeof TodoShape>
@@ -27,7 +27,7 @@ export const todoRouter = router({
     .mutation((req) => {
       return $fetch<Todo>(`${baseURL}/todos`, {
         method: 'POST',
-        body: req.input,
+        body: req.input
       })
-    }),
+    })
 })

playground/server/trpc/routers/user.ts

@@ -7,7 +7,7 @@ const UserShape = z.object({
   id: z.number(),
   name: z.string(),
   username: z.string(),
-  email: z.string(),
+  email: z.string()
 })
 
 export type User = z.infer<typeof UserShape>
@@ -27,7 +27,7 @@ export const userRouter = router({
     .mutation((req) => {
       return $fetch<User>(`${baseURL}/users`, {
         method: 'POST',
-        body: req.input,
+        body: req.input
       })
-    }),
+    })
 })

playground/server/trpc/trpc.ts

@@ -1,9 +1,23 @@
 import { initTRPC } from '@trpc/server'
 import superjson from 'superjson'
+import { ZodError } from 'zod'
 import type { Context } from './context'
 
 const t = initTRPC.context<Context>().create({
   transformer: superjson,
+  errorFormatter ({ shape, error }) {
+    return {
+      ...shape,
+      data: {
+        ...shape.data,
+        zodError:
+          error.code === 'BAD_REQUEST' &&
+          error.cause instanceof ZodError
+            ? error.cause!.flatten()
+            : null
+      }
+    }
+  }
 })
 
 /**

src/client/index.ts

@@ -1,73 +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 type { DecoratedProcedureRecord } from './types'
-
-/**
- * Calculates the key used for `useAsyncData` call
- */
-export function getQueryKey(
-  path: string,
-  input: unknown,
-): string {
-  return input === undefined ? path : `${path}-${hash(input || '')}`
-}
-
-/**
- * @internal
- */
-export 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()`
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const lastArg = pathCopy.pop()!
-
-    const path = pathCopy.join('.')
-
-    const [input, asyncDataOptions] = args
-
-    const queryKey = getQueryKey(path, input)
-
-    return useAsyncDataWithError(queryKey, () => (client as any)[path][lastArg](input), asyncDataOptions)
-  })
-}
-
-/**
- * Custom useAsyncData to add server error to client
- */
-async function useAsyncDataWithError(queryKey: string, cb: any, asyncDataOptions: any) {
-  // @ts-ignore: nuxt internal
-  const serverError = useState(`error-${queryKey}`, () => null)
-  // @ts-ignore: nuxt internal
-  const { error, data, ...rest } = await useAsyncData(queryKey, cb, asyncDataOptions)
-
-  if (error.value && !serverError.value)
-    serverError.value = error.value as any
-
-  if (data.value)
-    serverError.value = null
-
-  return {
-    ...rest,
-    data,
-    error: serverError,
-  }
-}
-
-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']>
-
-  return decoratedClient
-}

src/client/types.ts

@@ -1,64 +0,0 @@
-import type { TRPCClientErrorLike } from '@trpc/client'
-import type {
-  AnyMutationProcedure,
-  AnyProcedure,
-  AnyQueryProcedure,
-  AnyRouter,
-  ProcedureRouterRecord,
-  inferProcedureInput,
-  inferProcedureOutput,
-} from '@trpc/server'
-import type {
-  AsyncData,
-  AsyncDataOptions,
-  KeyOfRes,
-  PickFrom,
-  _Transform,
-} from 'nuxt/dist/app/composables/asyncData'
-
-// Inspired by trpc/react-query client types
-// https://github.com/trpc/trpc/blob/next/packages/react-query/src/createTRPCReact.tsx
-
-/**
- * @internal
- */
-export type DecorateProcedure<
- TProcedure extends AnyProcedure,
- TPath extends string,
-> = 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>,
-      ) => 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>,
-      ) => AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, TRPCClientErrorLike<TProcedure>>
-    } : never
-
-/**
-* @internal
-*/
-export type DecoratedProcedureRecord<
- TProcedures extends ProcedureRouterRecord,
- TPath extends string = '',
-> = {
-  [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
-    ? DecoratedProcedureRecord<
-       TProcedures[TKey]['_def']['record'],
-       `${TPath}${TKey & string}.`
-     >
-    : TProcedures[TKey] extends AnyProcedure
-      ? DecorateProcedure<TProcedures[TKey], `${TPath}${TKey & string}`>
-      : 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,90 +0,0 @@
-import type { ResponseMeta } from '@trpc/server/http'
-import { resolveHTTPResponse } from '@trpc/server/http'
-import type {
-  AnyRouter,
-  ProcedureType,
-  TRPCError,
-  inferRouterContext,
-  inferRouterError,
-} from '@trpc/server'
-import { createURL } from 'ufo'
-import type { H3Event } from 'h3'
-import { 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 function createNuxtApiHandler<TRouter extends AnyRouter>({
-  router,
-  createContext,
-  responseMeta,
-  onError,
-  url = '/api/trpc',
-}: {
-  router: TRouter
-  createContext?: CreateContextFn<TRouter>
-  responseMeta?: ResponseMetaFn<TRouter>
-  onError?: OnErrorFn<TRouter>
-  url?: string
-}) {
-  return defineEventHandler(async (event) => {
-    const {
-      req,
-      res,
-    } = event
-
-    const $url = createURL(req.url!)
-
-    const httpResponse = await resolveHTTPResponse({
-      router,
-      req: {
-        method: req.method!,
-        headers: req.headers,
-        body: isMethod(event, 'GET') ? null : await readBody(event),
-        query: $url.searchParams,
-      },
-      path: $url.pathname.substring(url.length + 1),
-      createContext: async () => 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,10 +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'],
+  external: ['#app', '#imports'],
   dts: true,
+  outExtension ({ format }) {
+    return {
+      js: format === 'esm' ? '.mjs' : `.${format}`
+    }
+  }
 })