chore: release v0.4.0-beta.2

fix: don't discard error in client

.github/workflows/release.yml

@@ -0,0 +1,22 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+
+      - run: npx changelogithub
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

README.md

@@ -1,151 +0,0 @@
-# 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.
-
-<p align="center">
-  <figure>
-    <img src="https://i.imgur.com/AjmNUxj.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>
-
-## Install
-
-```bash
-npm i trpc-nuxt
-```
-
-```ts
-// nuxt.config.ts
-import { defineNuxtConfig } from 'nuxt'
-
-export default defineNuxtConfig({
-  modules: ['trpc-nuxt'],
-  trpc: {
-    baseURL: 'http://localhost:3000', // defaults to http://localhost:3000
-    trpcURL: '/api/trpc', // defaults to /api/trpc
-  },
-  typescript: {
-    strict: true // set this to true to make input/output types work
-  }
-})
-```
-
-## Usage
-
-Expose your tRPC [routes](https://trpc.io/docs/router) under `~/server/trpc/index.ts`:
-
-```ts
-// ~/server/trpc/index.ts
-import type { inferAsyncReturnType } from '@trpc/server'
-import * as trpc from '@trpc/server'
-import { z } from 'zod' //  yup/superstruct/zod/myzod/custom
-
-export const router = trpc.router()
-  // queries and mutations...
-  .query('getUsers', {
-    async resolve(req) {
-      // use your ORM of choice
-      return await UserModel.all()
-    },
-  })
-  .mutation('createUser', {
-    // validate input with Zod
-    input: z.object({ name: z.string().min(5) }),
-    async resolve(req) {
-      // use your ORM of choice
-      return await UserModel.create({
-        data: req.input,
-      })
-    },
-  })
-```
-
-Use the client like so:
-
-```ts
-const client = useClient() // auto-imported
-
-const users = await client.query('getUsers')
-
-const newUser = await client.mutation('createUser', {
-  name: 'wagmi'
-})
-```
-
-## useAsyncQuery
-
-A thin wrapper around [`useAsyncData`](https://v3.nuxtjs.org/api/composables/use-async-data/) and `client.query()`.
-
-The first argument is a `[path, input]`-tuple - if the `input` is optional, you can omit the, `input`-part.
-
-You'll notice that you get autocompletion on the `path` and automatic typesafety on the `input`.
-
-```ts
-const {
-  data,
-  pending,
-  error,
-  refresh
-} = await useAsyncQuery(['getUser', { id: 69 }], {
-  // pass useAsyncData options here
-  lazy: false
-})
-```
-
-## Options
-
-trpc-nuxt accepts the following options exposed under `~/server/trpc.index.ts`:
-
-```ts
-import * as trpc from '@trpc/server'
-import type { inferAsyncReturnType } from '@trpc/server'
-import type { CompatibilityEvent } from 'h3'
-import type { OnErrorPayload } from 'trpc-nuxt/api'
-
-export const router = trpc.router<inferAsyncReturnType<typeof createContext>>()
-
-// Optional
-// https://trpc.io/docs/context
-export const createContext = (event: CompatibilityEvent) => {
-  // ...
-  return {
-    /** context data */
-  }
-}
-
-// Optional
-// https://trpc.io/docs/caching#using-responsemeta--to-cache-responses
-export const responseMeta = () => {
-  // ...
-  return {
-    // { headers: ... }
-  }
-}
-
-// Optional
-// https://trpc.io/docs/error-handling#handling-errors
-export const onError = (payload: OnErrorPayload<typeof router>) => {
-  // Do whatever here like send to bug reporting and stuff
-}
-```
-
-## Recipes
-
-- [Validation](/recipes/validation.md)
-- [Authorization](/recipes/authorization.md)
-- [Merging Routers](/recipes/merging-routers.md)
-- [Error Handling](/recipes/error-handling.md)
-- [Error Formatting](/recipes/error-formatting.md)
-
-Learn more about tRPC.io [here](https://trpc.io/docs).
-
-## License
-
-MIT

api.d.ts

@@ -1 +0,0 @@
-export * from './dist/runtime/api'

package.json

@@ -1,61 +1,20 @@
 {
-  "name": "trpc-nuxt",
-  "type": "module",
-  "version": "0.1.2",
-  "packageManager": "pnpm@7.1.1",
-  "license": "MIT",
-  "main": "./dist/module.cjs",
-  "types": "./dist/types.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "import": "./dist/module.mjs",
-      "require": "./dist/module.cjs"
-    },
-    "./api": {
-      "import": "./dist/runtime/api.mjs",
-      "types": "./dist/runtime/api.d.ts"
-    }
-  },
-  "files": [
-    "dist",
-    "*.d.ts"
-  ],
+  "name": "trpc-nuxt-workspace",
+  "packageManager": "pnpm@7.5.0",
   "scripts": {
-    "prepublishOnly": "nr build",
-    "build": "nuxt-module-build",
-    "play": "nr build && nuxi dev playground",
-    "build:playground": "nuxi build playground",
     "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "release": "bumpp --commit --push --tag && pnpm publish",
-    "prepare": "nuxi prepare playground"
-  },
-  "dependencies": {
-    "@nuxt/kit": "^3.0.0-rc.3",
-    "@trpc/client": "^9.23.3",
-    "@trpc/server": "^9.23.2",
-    "defu": "^6.0.0",
-    "fs-extra": "^10.1.0",
-    "h3": "^0.7.8",
-    "pathe": "^0.3.0",
-    "ufo": "^0.8.4"
+    "lint:fix": "eslint . --fix"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.23.1",
-    "@antfu/ni": "^0.16.2",
-    "@nuxt/module-builder": "latest",
-    "@types/fs-extra": "^9.0.13",
-    "bumpp": "^7.1.1",
-    "eslint": "^8.14.0",
-    "nuxt": "^3.0.0-rc.3",
-    "ohash": "^0.1.0",
-    "pnpm": "^7.1.1",
-    "superjson": "^1.9.1",
-    "trpc-nuxt": "workspace:*",
-    "zod": "^3.16.0"
+    "@antfu/eslint-config": "^0.27.0",
+    "@antfu/ni": "^0.18.3",
+    "eslint": "^8.25.0",
+    "pnpm": "^7.5.0"
   },
   "eslintConfig": {
-    "extends": "@antfu"
+    "extends": "@antfu",
+    "rules": {
+      "no-console": "warn"
+    }
   }
 }

packages/playground/nuxt.config.ts

@@ -1,11 +1,7 @@
-import { defineNuxtConfig } from 'nuxt'
-import Module from '../src/module'
-
 // https://v3.nuxtjs.org/api/configuration/nuxt.config
 export default defineNuxtConfig({
-  modules: [Module],
   runtimeConfig: {
-    baseURL: 'http://localhost:3000',
+    baseURL: '',
   },
   typescript: {
     strict: true,

packages/playground/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "playground",
+  "private": true,
+  "scripts": {
+    "build": "nuxt build",
+    "dev": "nuxt dev",
+    "generate": "nuxt generate",
+    "preview": "nuxt preview",
+    "postinstall": "nuxt prepare"
+  },
+  "dependencies": {
+    "superjson": "^1.11.0",
+    "trpc-nuxt": "workspace:*",
+    "zod": "^3.19.1"
+  },
+  "devDependencies": {
+    "nuxt": "3.0.0-rc.12"
+  }
+}

packages/playground/pages/index.vue

@@ -0,0 +1,65 @@
+<script setup lang="ts">
+const { $client } = useNuxtApp()
+// const headers = useClientHeaders()
+
+// const addHeader = () => {
+//   headers.value.authorization = 'Bearer abcdefghijklmnop'
+//   console.log(headers.value)
+// }
+
+const addTodo = async () => {
+  const title = Math.random().toString(36).slice(2, 7)
+
+  try {
+    const result = await $client.todo.addTodo.mutate({
+      id: Date.now(),
+      userId: 69,
+      title,
+      completed: false,
+    })
+    await result.execute()
+    console.log('Todo: ', result.data.value)
+  }
+  catch (e) {
+    console.log(e)
+  }
+}
+
+const { data: todos, pending, error, refresh } = await $client.todo.getTodos.query()
+</script>
+
+<template>
+  <div>
+    <div v-if="pending">
+      Loading...
+    </div>
+    <div v-else-if="error?.data?.code">
+      Error: {{ error.data.code }}
+    </div>
+    <div v-else>
+      <ul>
+        <li v-for="t in todos?.slice(0, 10)" :key="t.id">
+          <NuxtLink :class="{ completed: t.completed }" :to="`/todo/${t.id}`">
+            Title: {{ t.title }}
+          </NuxtLink>
+        </li>
+      </ul>
+      <button @click="addTodo">
+        Add Todo
+      </button>
+      <button @click="() => refresh()">
+        Refresh
+      </button>
+    </div>
+  </div>
+</template>
+
+<style>
+a {
+  text-decoration: none;
+}
+
+.completed {
+  text-decoration: line-through;
+}
+</style>

packages/playground/pages/todo/[id].vue

@@ -0,0 +1,19 @@
+<script setup lang="ts">
+const route = useRoute()
+const { $client } = useNuxtApp()
+const { data: todo, pending, error } = await $client.todo.getTodo.query(Number(route.params.id))
+</script>
+
+<template>
+  <div v-if="pending">
+    Loading...
+  </div>
+  <div v-else-if="error?.data?.code">
+    {{ error.data.code }}
+  </div>
+  <div v-else>
+    ID: {{ todo?.id }} <br>
+    Title: {{ todo?.title }} <br>
+    Completed: {{ todo?.completed }}
+  </div>
+</template>

packages/playground/plugins/trpc-client.ts

@@ -0,0 +1,50 @@
+import { 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) => {
+  const client = createTRPCNuxtProxyClient<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'
+          || (opts.direction === 'down' && opts.result instanceof Error),
+      }),
+      httpBatchLink({
+        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,
+    },
+  }
+})

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

@@ -0,0 +1,23 @@
+import { createNuxtApiHandler } from 'trpc-nuxt'
+import { appRouter } from '../../trpc/routers'
+import { createContext } from '~~/server/trpc/context'
+
+export default createNuxtApiHandler({
+  router: appRouter,
+  /**
+   * @link https://trpc.io/docs/context
+   */
+  createContext,
+  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
+   */
+  // responseMeta() {
+  //   // ...
+  // },
+})

packages/playground/server/trpc/context.ts

@@ -0,0 +1,17 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import type { inferAsyncReturnType } from '@trpc/server'
+import type { H3Event } from 'h3'
+
+export type Context = inferAsyncReturnType<typeof createContext>
+
+/**
+ * Creates context for an incoming request
+ * @link https://trpc.io/docs/context
+ */
+export async function createContext(
+  opts: H3Event,
+) {
+  // for API-response caching see https://trpc.io/docs/caching
+
+  return {}
+}

packages/playground/server/trpc/index.ts

@@ -0,0 +1,29 @@
+import { initTRPC } from '@trpc/server'
+import superjson from 'superjson'
+import type { Context } from './context'
+
+const t = initTRPC.context<Context>().create({
+  transformer: superjson,
+})
+
+/**
+ * Create a router
+ * @see https://trpc.io/docs/v10/router
+ */
+export const router = t.router
+
+/**
+  * Create an unprotected procedure
+  * @see https://trpc.io/docs/v10/procedures
+  **/
+export const publicProcedure = t.procedure
+
+/**
+  * @see https://trpc.io/docs/v10/middlewares
+  */
+export const middleware = t.middleware
+
+/**
+  * @see https://trpc.io/docs/v10/merging-routers
+  */
+export const mergeRouters = t.mergeRouters

packages/playground/server/trpc/routers/index.ts

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

packages/playground/server/trpc/routers/todo.ts

@@ -0,0 +1,33 @@
+import { z } from 'zod'
+import { publicProcedure, router } from '..'
+
+const baseURL = 'https://jsonplaceholder.typicode.com'
+
+const TodoShape = z.object({
+  userId: z.number(),
+  id: z.number(),
+  title: z.string(),
+  completed: z.boolean(),
+})
+
+export type Todo = z.infer<typeof TodoShape>
+
+export const todoRouter = router({
+  getTodos: publicProcedure
+    .query(() => {
+      return $fetch<Todo[]>(`${baseURL}/todos`)
+    }),
+  getTodo: publicProcedure
+    .input(z.number())
+    .query((req) => {
+      return $fetch<Todo>(`${baseURL}/todos/${req.input}`)
+    }),
+  addTodo: publicProcedure
+    .input(TodoShape)
+    .mutation((req) => {
+      return $fetch<Todo>(`${baseURL}/todos`, {
+        method: 'POST',
+        body: req.input,
+      })
+    }),
+})

packages/playground/server/trpc/routers/user.ts

@@ -0,0 +1,33 @@
+import { z } from 'zod'
+import { publicProcedure, router } from '..'
+
+const baseURL = 'https://jsonplaceholder.typicode.com'
+
+const UserShape = z.object({
+  id: z.number(),
+  name: z.string(),
+  username: z.string(),
+  email: z.string(),
+})
+
+export type User = z.infer<typeof UserShape>
+
+export const userRouter = router({
+  getUsers: publicProcedure
+    .query(() => {
+      return $fetch<User[]>(`${baseURL}/users`)
+    }),
+  getUser: publicProcedure
+    .input(z.number())
+    .query((req) => {
+      return $fetch<User>(`${baseURL}/users/${req.input}`)
+    }),
+  addUser: publicProcedure
+    .input(UserShape)
+    .mutation((req) => {
+      return $fetch<User>(`${baseURL}/users`, {
+        method: 'POST',
+        body: req.input,
+      })
+    }),
+})

packages/playground/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  // https://v3.nuxtjs.org/concepts/typescript
+  "extends": "./.nuxt/tsconfig.json"
+}

packages/trpc-nuxt/README.md

@@ -0,0 +1,15 @@
+# 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).
+
+## Recommended IDE Setup
+
+- [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar)
+
+## License
+
+MIT

packages/trpc-nuxt/client.d.ts

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

packages/trpc-nuxt/package.json

@@ -0,0 +1,57 @@
+{
+  "name": "trpc-nuxt",
+  "version": "0.4.0-beta.2",
+  "packageManager": "pnpm@7.5.0",
+  "license": "MIT",
+  "sideEffects": false,
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs"
+    },
+    "./client": {
+      "require": "./dist/client.js",
+      "import": "./dist/client.mjs"
+    }
+  },
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist",
+    "client.d.ts"
+  ],
+  "scripts": {
+    "prepublishOnly": "nr build",
+    "build": "tsup",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "release": "bumpp --commit --push --tag && npm publish"
+  },
+  "peerDependencies": {
+    "@trpc/client": "^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",
+    "ohash": "^0.1.5",
+    "ohmyfetch": "^0.4.20",
+    "ufo": "^0.8.6"
+  },
+  "devDependencies": {
+    "@trpc/client": "10.0.0-rc.1",
+    "@trpc/server": "10.0.0-rc.1",
+    "bumpp": "^8.2.1",
+    "nuxt": "3.0.0-rc.12",
+    "tsup": "6.0.1",
+    "typescript": "^4.7.4"
+  },
+  "eslintConfig": {
+    "extends": "@antfu",
+    "rules": {
+      "no-console": "warn"
+    }
+  }
+}

packages/trpc-nuxt/src/client/index.ts

@@ -0,0 +1,95 @@
+import type { CreateTRPCClientOptions, inferRouterProxyClient } from '@trpc/client'
+import { createTRPCProxyClient } from '@trpc/client'
+import { FetchError } from 'ohmyfetch'
+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)
+
+    if (lastArg === 'mutate') {
+      return useAsyncDataWithError(queryKey, () => (client as any)[path][lastArg](input), {
+        ...asyncDataOptions as Record<string, any>,
+        immediate: false,
+      })
+    }
+
+    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
+}
+
+export function customFetch(input: RequestInfo | URL, options?: RequestInit) {
+  return globalThis.$fetch.raw(input.toString(), options)
+    .catch((e) => {
+      if (e instanceof FetchError && e.response)
+        return e.response
+
+      throw e
+    })
+    .then(response => ({
+      ...response,
+      json: () => Promise.resolve(response._data),
+    }))
+}

packages/trpc-nuxt/src/client/types.ts

@@ -0,0 +1,64 @@
+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;
+}

packages/trpc-nuxt/src/index.ts

@@ -0,0 +1 @@
+export * from './server'

packages/trpc-nuxt/src/server.ts

@@ -1,20 +1,20 @@
-import { resolveHTTPResponse } from '@trpc/server'
+import type { ResponseMeta } from '@trpc/server/http'
+import { resolveHTTPResponse } from '@trpc/server/http'
 import type {
   AnyRouter,
   ProcedureType,
-  ResponseMeta,
   TRPCError,
   inferRouterContext,
   inferRouterError,
 } from '@trpc/server'
 import { createURL } from 'ufo'
-import type { CompatibilityEvent } from 'h3'
-import { defineEventHandler, isMethod, useBody } from 'h3'
-import type { TRPCResponse } from '@trpc/server/dist/declarations/src/rpc'
+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: CompatibilityEvent) => MaybePromise<inferRouterContext<TRouter>>
+export type CreateContextFn<TRouter extends AnyRouter> = (event: H3Event) => MaybePromise<inferRouterContext<TRouter>>
 
 export interface ResponseMetaFnPayload<TRouter extends AnyRouter> {
   data: TRPCResponse<unknown, inferRouterError<TRouter>>[]
@@ -30,25 +30,25 @@ export interface OnErrorPayload<TRouter extends AnyRouter> {
   error: TRPCError
   type: ProcedureType | 'unknown'
   path: string | undefined
-  req: CompatibilityEvent['req']
+  req: H3Event['req']
   input: unknown
   ctx: undefined | inferRouterContext<TRouter>
 }
 
 export type OnErrorFn<TRouter extends AnyRouter> = (opts: OnErrorPayload<TRouter>) => void
 
-export function createTRPCHandler<Router extends AnyRouter>({
+export function createNuxtApiHandler<TRouter extends AnyRouter>({
   router,
   createContext,
   responseMeta,
   onError,
-  trpcURL,
+  url = '/api/trpc',
 }: {
-  router: Router
-  createContext?: CreateContextFn<Router>
-  responseMeta?: ResponseMetaFn<Router>
-  onError?: OnErrorFn<Router>
-  trpcURL: string
+  router: TRouter
+  createContext?: CreateContextFn<TRouter>
+  responseMeta?: ResponseMetaFn<TRouter>
+  onError?: OnErrorFn<TRouter>
+  url?: string
 }) {
   return defineEventHandler(async (event) => {
     const {
@@ -56,17 +56,17 @@ export function createTRPCHandler<Router extends AnyRouter>({
       res,
     } = event
 
-    const $url = createURL(req.url)
+    const $url = createURL(req.url!)
 
     const httpResponse = await resolveHTTPResponse({
       router,
       req: {
-        method: req.method,
+        method: req.method!,
         headers: req.headers,
-        body: isMethod(event, 'GET') ? null : await useBody(event),
+        body: isMethod(event, 'GET') ? null : await readBody(event),
         query: $url.searchParams,
       },
-      path: $url.pathname.substring(trpcURL.length + 1),
+      path: $url.pathname.substring(url.length + 1),
       createContext: async () => createContext?.(event),
       responseMeta,
       onError: (o) => {
@@ -81,8 +81,8 @@ export function createTRPCHandler<Router extends AnyRouter>({
 
     res.statusCode = status
 
-    Object.keys(headers).forEach((key) => {
-      res.setHeader(key, headers[key])
+    headers && Object.keys(headers).forEach((key) => {
+      res.setHeader(key, headers[key]!)
     })
 
     return body

packages/trpc-nuxt/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}

packages/trpc-nuxt/tsup.config.ts

@@ -0,0 +1,10 @@
+import { defineConfig } from 'tsup'
+
+export default defineConfig({
+  entry: ['src/index.ts', 'src/client/index.ts'],
+  format: ['cjs', 'esm'],
+  splitting: false,
+  clean: true,
+  external: ['#app'],
+  dts: true,
+})

playground/package.json

@@ -1,4 +0,0 @@
-{
-  "name": "playground",
-  "private": true
-}

playground/pages/index.vue

@@ -1,55 +0,0 @@
-<script setup lang="ts">
-const client = useClient()
-const { data: todos, pending, error, refresh } = await useAsyncQuery(['getTodos'])
-
-const addTodo = async () => {
-  const title = Math.random().toString(36).slice(2, 7)
-
-  try {
-    const result = await client.mutation('addTodo', {
-      id: Date.now(),
-      userId: 69,
-      title,
-      completed: false,
-    })
-    console.log('Todo: ', result)
-  }
-  catch (e) {
-    console.log(e)
-  }
-}
-</script>
-
-<template>
-  <div v-if="pending">
-    Loading...
-  </div>
-  <div v-else-if="error?.data?.code">
-    Error: {{ error.data.code }}
-  </div>
-  <div v-else>
-    <ul>
-      <li v-for="t in todos.slice(0, 10)" :key="t.id">
-        <NuxtLink :class="{ completed: t.completed }" :to="`/todo/${t.id}`">
-          Title: {{ t.title }}
-        </NuxtLink>
-      </li>
-    </ul>
-    <button @click="addTodo">
-      Add Todo
-    </button>
-    <button @click="() => refresh()">
-      Refresh
-    </button>
-  </div>
-</template>
-
-<style>
-a {
-  text-decoration: none;
-}
-
-.completed {
-  text-decoration: line-through;
-}
-</style>

playground/pages/todo/[id].vue

@@ -1,18 +0,0 @@
-<script setup lang="ts">
-const route = useRoute()
-const { data: todo, pending, error } = await useAsyncQuery(['getTodo', Number(route.params.id)])
-</script>
-
-<template>
-  <div v-if="pending">
-    Loading...
-  </div>
-  <div v-else-if="error?.data?.code">
-    {{ error.data.code }}
-  </div>
-  <div v-else>
-    ID: {{ todo.id }} <br>
-    Title: {{ todo.title }} <br>
-    Completed: {{ todo.completed }}
-  </div>
-</template>

playground/server/trpc/index.ts

@@ -1,35 +0,0 @@
-import * as trpc from '@trpc/server'
-import { z } from 'zod'
-
-const baseURL = 'https://jsonplaceholder.typicode.com'
-
-const TodoShape = z.object({
-  userId: z.number(),
-  id: z.number(),
-  title: z.string(),
-  completed: z.boolean(),
-})
-
-export type Todo = z.infer<typeof TodoShape>
-
-export const router = trpc.router()
-  .query('getTodos', {
-    async resolve() {
-      return await $fetch<Todo[]>(`${baseURL}/todos`)
-    },
-  })
-  .query('getTodo', {
-    input: z.number(),
-    async resolve(req) {
-      return await $fetch<Todo>(`${baseURL}/todos/${req.input}`)
-    },
-  })
-  .mutation('addTodo', {
-    input: TodoShape,
-    async resolve(req) {
-      return await $fetch<Todo>(`${baseURL}/todos`, {
-        method: 'POST',
-        body: req.input,
-      })
-    },
-  })

pnpm-workspace.yaml

@@ -1,2 +1,2 @@
 packages:
-  - playground/*
+  - packages/*

recipes/authorization.md

@@ -1,102 +0,0 @@
-## 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/index.ts
-import type { inferAsyncReturnType } from '@trpc/server'
-import type { CompatibilityEvent } from 'h3'
-import { decodeAndVerifyJwtToken } from '~/somewhere/in/your/app/utils'
-
-// The app's context - is generated for each incoming request
-export async function createContext({ req }: CompatibilityEvent) {
-  // 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'd 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>
-
-// [..] Define API handler and app router
-```
-
-### Option 1: Authorize using resolver
-
-```ts
-import { TRPCError } from '@trpc/server'
-
-export const router = trpc
-  .router<Context>()
-  // open for anyone
-  .query('hello', {
-    input: z.string().nullish(),
-    resolve: ({ input, ctx }) => {
-      return `hello ${input ?? ctx.user?.name ?? 'world'}`
-    },
-  })
-  // checked in resolver
-  .query('secret', {
-    resolve: ({ ctx }) => {
-      if (!ctx.user)
-        throw new TRPCError({ code: 'UNAUTHORIZED' })
-
-      return {
-        secret: 'sauce',
-      }
-    },
-  })
-```
-
-### Option 2: Authorize using middleware
-
-```ts
-import * as trpc from '@trpc/server'
-import { TRPCError } from '@trpc/server'
-
-// Merging routers: https://trpc.io/docs/merging-routers
-
-export const router = trpc
-  .router<Context>()
-  // this is accessible for everyone
-  .query('hello', {
-    input: z.string().nullish(),
-    resolve: ({ input, ctx }) => {
-      return `hello ${input ?? ctx.user?.name ?? 'world'}`
-    },
-  })
-  .merge(
-    'admin.',
-    trpc.router<Context>()
-      // this protects all procedures defined next in this router
-      .middleware(async ({ ctx, next }) => {
-        if (!ctx.user?.isAdmin)
-          throw new TRPCError({ code: 'UNAUTHORIZED' })
-
-        return next()
-      })
-      .query('secret', {
-        resolve: ({ ctx }) => {
-          return {
-            secret: 'sauce',
-          }
-        },
-      }),
-  )
-```
-
-Learn more about authorization [here](https://trpc.io/docs/authorization).

recipes/error-formatting.md

@@ -1,41 +0,0 @@
-## Error Formatting
-
-The error formatting in your router will be inferred all the way to your client (& Vue components).
-
-### Adding custom formatting
-
-```ts
-// ~/server/trpc/index.ts
-import * as trpc from '@trpc/server'
-
-export const router = trpc.router<Context>()
-  .formatError(({ shape, error }) => {
-    return {
-      ...shape,
-      data: {
-        ...shape.data,
-        zodError:
-          error.code === 'BAD_REQUEST'
-          && error.cause instanceof ZodError
-            ? error.cause.flatten()
-            : null,
-      }
-    }
-  })
-```
-
-### Usage in Vue
-
-```html
-<script setup lang="ts">
-const { error } = await useAsyncQuery(['getUser', { id: 69 }])
-</script>
-
-<template>
-  <pre v-if="error?.data?.zodError">
-    {{ JSON.stringify(error.data.zodError, null, 2) }}
-  </pre>
-</template>
-```
-
-Learn more about error formatting [here](https://trpc.io/docs/error-formatting).

recipes/error-handling.md

@@ -1,15 +0,0 @@
-## Handling errors
-
-All errors that occur in a procedure go through the `onError` method before being sent to the client. Here you can handle or change errors.
-
-```ts
-// ~/server/trpc/index.ts
-import * as trpc from '@trpc/server'
-
-export function onError({ error, type, path, input, ctx, req }) {
-  console.error('Error:', error)
-  if (error.code === 'INTERNAL_SERVER_ERROR') {
-    // send to bug reporting
-  }
-}
-```

recipes/merging-routers.md

@@ -1,46 +0,0 @@
-# Merging Routers
-
-Writing all API-code in your code in the same file is not a great idea. It's easy to merge routers with other routers.
-
-Define your routes:
-
-```ts
-// ~/server/trpc/routes/posts.ts
-export const posts = trpc.router()
-  .query('list', {
-    resolve() {
-      // ..
-      return []
-    }
-  })
-```
-
-```ts
-// ~/server/trpc/routes/users.ts
-export const users = trpc.router()
-  .query('list', {
-    resolve() {
-      // ..
-      return []
-    }
-  })
-```
-
-```ts
-// ~/server/trpc/index.ts
-import { users } from './routes/users'
-import { posts } from './routes/posts'
-
-export const router = trpc.router()
-  .merge('user.', users) // prefix user procedures with "user."
-  .merge('post.', posts) // prefix post procedures with "post."
-```
-
-and use it like this:
-
-```html
-<script setup lang="ts">
-const { data: users } = await useAsyncQuery(['user.list'])
-const { data: posts } = await useAsyncQuery(['post.list'])
-</script>
-```

recipes/validation.md

@@ -1,49 +0,0 @@
-## Validation
-
-tRPC works out-of-the-box with yup/superstruct/zod/myzod/custom validators.
-
-### Input Validation
-
-```ts
-// ~/server/trpc/index.ts
-import { z } from 'zod'
-
-export const router = trpc
-  .router()
-  .mutation('createUser', {
-    // validate input with Zod
-    input: z.object({
-      name: z.string().min(5)
-    }),
-    async resolve(req) {
-      // use your ORM of choice
-      return await UserModel.create({
-        data: req.input,
-      })
-    },
-  })
-```
-
-### Output Validation
-
-```ts
-// ~/server/trpc/index.ts
-import { z } from 'zod'
-
-export const router = trpc
-  .router()
-  .query('hello', {
-    // validate output with Zod
-    output: z.object({
-      greeting: z.string()
-    }),
-    // expects return type of { greeting: string }
-    resolve() {
-      return {
-        greeting: 'hello!',
-      }
-    },
-  })
-```
-
-Learn more about input validation [here](https://trpc.io/docs/router#input-validation).

src/module.ts

@@ -1,83 +0,0 @@
-import { fileURLToPath } from 'url'
-import { join } from 'pathe'
-import { defu } from 'defu'
-
-import { addServerHandler, addTemplate, defineNuxtModule } from '@nuxt/kit'
-
-export interface ModuleOptions {
-  baseURL: string
-  trpcURL: string
-}
-
-export default defineNuxtModule<ModuleOptions>({
-  meta: {
-    name: 'trpc-nuxt',
-    configKey: 'trpc',
-  },
-  defaults: {
-    baseURL: 'http://localhost:3000',
-    trpcURL: '/api/trpc',
-  },
-  async setup(options, nuxt) {
-    const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url))
-    nuxt.options.build.transpile.push(runtimeDir, '#build/trpc-client', '#build/trpc-handler')
-
-    const handlerPath = join(nuxt.options.buildDir, 'trpc-handler.ts')
-    nuxt.options.build.transpile.push(handlerPath)
-
-    // Final resolved configuration
-    const finalConfig = nuxt.options.runtimeConfig.public.trpc = defu(nuxt.options.runtimeConfig.public.trpc, {
-      baseURL: options.baseURL,
-      trpcURL: options.trpcURL,
-    })
-
-    nuxt.hook('autoImports:extend', (imports) => {
-      imports.push(
-        { name: 'useClient', from: '#build/trpc-client' },
-        { name: 'useAsyncQuery', from: join(runtimeDir, 'client') },
-      )
-    })
-
-    addServerHandler({
-      route: `${finalConfig.trpcURL}/*`,
-      handler: handlerPath,
-    })
-
-    addTemplate({
-      filename: 'trpc-client.ts',
-      write: true,
-      getContents() {
-        return `
-          import * as trpc from '@trpc/client'
-          import type { router } from '~/server/trpc'
-    
-          const client = trpc.createTRPCClient<typeof router>({
-            url: '${finalConfig.baseURL}${finalConfig.trpcURL}',
-          })
-        
-          export const useClient = () => client
-        `
-      },
-    })
-
-    addTemplate({
-      filename: 'trpc-handler.ts',
-      write: true,
-      getContents() {
-        return `
-          import { createTRPCHandler } from 'trpc-nuxt/api'
-          import { useRuntimeConfig } from '#imports'
-          import * as functions from '~/server/trpc'
-    
-          const { trpc: { trpcURL } } = useRuntimeConfig().public
-    
-          export default createTRPCHandler({
-            ...functions,
-            trpcURL 
-          })
-        `
-      },
-    })
-  },
-})
-

src/runtime/client.ts

@@ -1,60 +0,0 @@
-import type {
-  AsyncData,
-  AsyncDataOptions,
-  KeyOfRes,
-  PickFrom,
-  _Transform,
-} from 'nuxt/dist/app/composables/asyncData'
-import type { ProcedureRecord, inferHandlerInput, inferProcedureInput, inferProcedureOutput } from '@trpc/server'
-import type { TRPCClientErrorLike } from '@trpc/client'
-import { objectHash } from 'ohash'
-import { useAsyncData, useState } from '#app'
-import { useClient } from '#build/trpc-client'
-import type { router } from '~/server/trpc'
-
-type AppRouter = typeof router
-
-type inferProcedures<
-  TObj extends ProcedureRecord<any, any, any, any, any, any>,
-> = {
-  [TPath in keyof TObj]: {
-    input: inferProcedureInput<TObj[TPath]>
-    output: inferProcedureOutput<TObj[TPath]>
-  };
-}
-
-type TQueries = AppRouter['_def']['queries']
-type TError = TRPCClientErrorLike<AppRouter>
-
-type TQueryValues = inferProcedures<AppRouter['_def']['queries']>
-
-export async function useAsyncQuery<
-  TPath extends keyof TQueryValues & string,
-  TOutput extends TQueryValues[TPath]['output'] = TQueryValues[TPath]['output'],
-  Transform extends _Transform<TOutput> = _Transform<TOutput, TOutput>,
-  PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>,
->(
-  pathAndInput: [path: TPath, ...args: inferHandlerInput<TQueries[TPath]>],
-  options: AsyncDataOptions<TOutput, Transform, PickKeys> = {},
-): Promise<AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, TError>> {
-  const client = useClient()
-  const key = `${pathAndInput[0]}-${objectHash(pathAndInput[1] ? JSON.stringify(pathAndInput[1]) : '')}`
-  const serverError = useState<TError | null>(`error-${key}`, () => null)
-  const { error, data, ...rest } = await useAsyncData(
-    key,
-    () => client.query(...pathAndInput),
-    options,
-  )
-
-  if (process.server && error.value && !serverError.value)
-    serverError.value = error.value as any
-
-  if (data.value)
-    serverError.value = null
-
-  return {
-    ...rest,
-    data,
-    error: serverError,
-  } as any
-}

tsconfig.json

@@ -1,3 +1,16 @@
 {
-  "extends": "./playground/.nuxt/tsconfig.json"
+  "compilerOptions": {
+    "target": "es2020",
+    "module": "esnext",
+    "strict": true,
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "skipLibCheck": true,
+    "noUnusedLocals": true,
+    "noImplicitAny": true,
+    "allowJs": true,
+    "noEmit": true,
+    "outDir": "dist",
+    "resolveJsonModule": true
+  }
 }