chore: release v0.4.0

This reverts commit 750783e860.

.gitignore

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

README.md

@@ -1,10 +1,10 @@
 # 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).
+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

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

docs/.gitignore

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

docs/README.md

@@ -0,0 +1 @@
+docs

docs/app.config.ts

@@ -0,0 +1,5 @@
+export default defineAppConfig({
+  docus: {
+    title: 'tRPC Nuxt'
+  }
+})

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

@@ -0,0 +1,52 @@
+---
+title: Installation
+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
+```
+
+```bash [npm]
+npm install @trpc/server@next @trpc/client@next trpc-nuxt@beta zod
+```
+
+```bash [yarn]
+yarn add @trpc/server@next @trpc/client@next trpc-nuxt@beta zod
+```
+
+::
+
+#### Why @trpc/server?
+
+For implementing tRPC endpoints and routers.
+
+#### Why @trpc/client?
+
+For making typesafe API calls from your client.
+
+#### Why zod?
+
+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

@@ -0,0 +1,140 @@
+---
+title: Usage
+description: tRPC-Nuxt provides first class integration with tRPC.
+---
+
+# Usage
+
+## Recommended file structure
+
+Recommended but not enforced file structure. This is what you get when starting from [the examples](../main/example-apps.md).
+
+```graphql
+.
+├── server
+│   ├── api
+│   │   └── trpc
+│   │       └── [trpc].ts  # <-- tRPC HTTP handler
+│   │   └── [..]
+│   ├── trpc
+│   │   ├── routers
+│   │   │   ├── index.ts  # <-- main app router
+│   │   │   ├── todo.ts  # <-- sub routers
+│   │   │   └── [..]
+│   │   ├── context.ts   # <-- create app context
+│   │   └── trpc.ts      # <-- procedure helpers
+├── plugins
+│   ├── client.ts  # <-- tRPC Client as a plugin
+└── [..]
+```
+
+## 1. Create a tRPC router
+
+Initialize your tRPC backend using the `initTRPC` function and create your first router.
+
+::code-group
+
+```ts [server/trpc/trpc.ts]
+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
+// meaning translation in i18n libraries.
+const t = initTRPC.create()
+
+// Base router and procedure helpers
+export const router = t.router
+export const publicProcedure = t.procedure
+```
+
+```ts [server/trpc/routers/index.ts]
+import { z } from 'zod'
+import { publicProcedure, router } from '../trpc'
+
+export const appRouter = router({
+  hello: publicProcedure
+    .input(
+      z.object({
+        text: z.string().nullish(),
+      }),
+    )
+    .query(({ input }) => {
+      return {
+        greeting: `hello ${input?.text ?? 'world'}`,
+      }
+    }),
+})
+
+// export type definition of API
+export type AppRouter = typeof appRouter
+```
+
+```ts [server/api/trpc/[trpc].ts]
+import { createNuxtApiHandler } from 'trpc-nuxt'
+import { appRouter } from '@/server/trpc/routers'
+
+// export API handler
+export default createNuxtApiHandler({
+  router: appRouter,
+  createContext: () => ({}),
+})
+```
+
+::
+
+::alert{type=info}
+If you need to split your router into several subrouters, you can implement them in the `server/trpc/routers` directory and import and [merge them](https://trpc.io/docs/v10/merging-routers) to a single root `appRouter`.
+::
+
+## 2. Create tRPC client plugin
+
+Create a set of strongly-typed composables using your API's type signature.
+
+```ts [plugins/client.ts]
+import { httpBatchLink } from '@trpc/client'
+import { createTRPCNuxtProxyClient } from 'trpc-nuxt/client'
+import type { AppRouter } from '@/server/trpc/routers'
+
+export default defineNuxtPlugin(() => {
+  const client = createTRPCNuxtProxyClient<AppRouter>({
+    links: [
+      httpBatchLink({
+        /**
+         * If you want to use SSR, you need to use the server's full URL
+         * @link https://trpc.io/docs/ssr
+         **/
+        url: 'http://localhost:3000/api/trpc',
+      }),
+    ],
+  })
+
+  return {
+    provide: {
+      client,
+    },
+  }
+})
+```
+
+## 3. Make API requests
+
+```vue [pages/index.vue]
+<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' })
+</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>
+</template>
+```

docs/content/2.examples/1.basic.md

@@ -0,0 +1,6 @@
+---
+title: Basic
+description: tRPC-Nuxt provides first class integration with tRPC.
+---
+
+# Basic Example

docs/content/2.examples/2.multiple-routers.md

@@ -0,0 +1,6 @@
+---
+title: Multiple Routers
+description: tRPC-Nuxt provides first class integration with tRPC.
+---
+
+# Multi Routers

docs/content/index.md

@@ -0,0 +1,31 @@
+---
+title: "tRPC Nuxt"
+description: "A supa simple wrapper arousnd supabase-js to enable usage and integration within Nuxt."
+navigation: false
+layout: page
+---
+
+::block-hero
+---
+cta:
+  - Get Started
+  - /get-started/installation
+secondary:
+  - Star on GitHub ->
+  - https://github.com/wobsoriano/trpc-nuxt
+snippet: npm install trpc-nuxt@beta
+---
+
+#title
+tRPC [Nuxt]{.text-primary-500}
+
+#description
+End-to-end typesafe APIs in Nuxt applications. 
+
+#extra
+  ::list
+  - Automatic typesafety
+  - Snappy DX
+  - Autocompletion
+  ::
+::

docs/nuxt.config.ts

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

docs/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "docs",
+  "description": "Docs for TRPC-Nuxt",
+  "scripts": {
+    "dev": "nuxi dev",
+    "build": "nuxi build",
+    "generate": "nuxi build",
+    "preview": "nuxi preview"
+  },
+  "dependencies": {
+    "nuxt": "^3.0.0-rc.13",
+    "@nuxtjs/tailwindcss": "^6.1.3"
+  },
+  "devDependencies": {
+    "@nuxt-themes/docus": "npm:@nuxt-themes/docus-edge@latest",
+    "@nuxtlabs/github-module": "npm:@nuxtlabs/github-module-edge@latest"
+  },
+  "packageManager": "yarn@1.22.19"
+}

docs/tokens.config.ts

@@ -0,0 +1,26 @@
+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',
+      100: '#B0E9FB',
+      200: '#93DEFA',
+      300: '#76D4F9',
+      400: '#58C8F7',
+      500: '#3BBBF6',
+      600: '#0BA6F3',
+      700: '#0981C2',
+      800: '#075E91',
+      900: '#043D61'
+    }
+  }
+})

docs/tsconfig.json

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

module.mjs

@@ -0,0 +1,17 @@
+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,20 +1,82 @@
 {
-  "name": "trpc-nuxt-workspace",
-  "packageManager": "pnpm@7.5.0",
+  "name": "trpc-nuxt",
+  "type": "module",
+  "version": "0.4.0",
+  "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"
+  ],
   "scripts": {
+    "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"
+    "lint:fix": "eslint . --fix",
+    "release": "bumpp && npm publish"
+  },
+  "peerDependencies": {
+    "@trpc/client": "^10.0.0-proxy-beta.21",
+    "@trpc/server": "^10.0.0-proxy-beta.21"
+  },
+  "dependencies": {
+    "h3": "^0.8.6",
+    "nanoid": "^4.0.0",
+    "nuxt": "^3.0.0-rc.13",
+    "ohash": "^0.1.5",
+    "ufo": "^0.8.6"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.27.0",
-    "@antfu/ni": "^0.18.3",
+    "@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",
+    "bumpp": "^8.2.1",
+    "concurrently": "^7.5.0",
     "eslint": "^8.25.0",
-    "pnpm": "^7.5.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": "@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"
+  ]
 }

packages/playground/plugins/trpc-client.ts

@@ -1,50 +0,0 @@
-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/trpc-nuxt/client.d.ts

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

packages/trpc-nuxt/package.json

@@ -1,58 +0,0 @@
-{
-  "name": "trpc-nuxt",
-  "version": "0.4.0-beta.1",
-  "packageManager": "pnpm@7.5.0",
-  "license": "MIT",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "types": "./dist/index.d.ts",
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
-    },
-    "./client": {
-      "types": "./dist/client.d.ts",
-      "require": "./dist/client.js",
-      "import": "./dist/client.mjs"
-    }
-  },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "files": [
-    "dist",
-    "*.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.3.0",
-    "typescript": "4.5.4"
-  },
-  "eslintConfig": {
-    "extends": "@antfu",
-    "rules": {
-      "no-console": "warn"
-    }
-  }
-}

packages/trpc-nuxt/src/client.ts

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

packages/trpc-nuxt/tsup.config.ts

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

patches/nuxt@3.0.0-rc.13.patch

@@ -0,0 +1,22 @@
+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,9 +1,4 @@
 // https://v3.nuxtjs.org/api/configuration/nuxt.config
 export default defineNuxtConfig({
-  runtimeConfig: {
-    baseURL: '',
-  },
-  typescript: {
-    strict: true,
-  },
+  modules: ['trpc-nuxt/module']
 })

playground/package.json

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

playground/pages/index.vue

@@ -11,21 +11,23 @@ const addTodo = async () => {
   const title = Math.random().toString(36).slice(2, 7)
 
   try {
-    const result = await $client.todo.addTodo.mutate({
+    const x = await $client.todo.addTodo.mutate({
       id: Date.now(),
       userId: 69,
       title,
-      completed: false,
+      completed: false
     })
-    await result.execute()
-    console.log('Todo: ', result.data.value)
-  }
-  catch (e) {
+    console.log(x.data.value)
+  } catch (e) {
     console.log(e)
   }
 }
 
-const { data: todos, pending, error, refresh } = await $client.todo.getTodos.query()
+const { data: todos, pending, error, refresh } = await $client.todo.getTodos.query(undefined, {
+  trpc: {
+    abortOnUnmount: true
+  }
+})
 </script>
 
 <template>

playground/plugins/trpc-client.ts

@@ -0,0 +1,27 @@
+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(() => {
+  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'
+      })
+    ]
+  })
+
+  return {
+    provide: {
+      client
+    }
+  }
+})

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

@@ -1,6 +1,6 @@
 import { createNuxtApiHandler } from 'trpc-nuxt'
-import { appRouter } from '../../trpc/routers'
-import { createContext } from '~~/server/trpc/context'
+import { appRouter } from '@/server/trpc/routers'
+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(
-  opts: H3Event,
+export function createContext (
+  opts: H3Event
 ) {
   // for API-response caching see https://trpc.io/docs/caching
 

playground/server/trpc/routers/index.ts

@@ -1,10 +1,10 @@
-import { router } from '..'
+import { router } from '../trpc'
 import { todoRouter } from './todo'
 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

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { publicProcedure, router } from '..'
+import { publicProcedure, router } from '../trpc'
 
 const baseURL = 'https://jsonplaceholder.typicode.com'
 
@@ -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

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { publicProcedure, router } from '..'
+import { publicProcedure, router } from '../trpc'
 
 const baseURL = 'https://jsonplaceholder.typicode.com'
 
@@ -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
+      }
+    }
+  }
 })
 
 /**

pnpm-workspace.yaml

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

src/client/index.ts

@@ -0,0 +1,66 @@
+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

@@ -0,0 +1,85 @@
+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/server.ts

@@ -3,13 +3,15 @@ import { resolveHTTPResponse } from '@trpc/server/http'
 import type {
   AnyRouter,
   ProcedureType,
-  TRPCError,
   inferRouterContext,
-  inferRouterError,
+  inferRouterError
+} from '@trpc/server'
+import {
+  TRPCError
 } from '@trpc/server'
 import { createURL } from 'ufo'
 import type { H3Event } from 'h3'
-import { defineEventHandler, isMethod, readBody } from 'h3'
+import { createError, defineEventHandler, isMethod, readBody } from 'h3'
 import type { TRPCResponse } from '@trpc/server/rpc'
 
 type MaybePromise<T> = T | Promise<T>
@@ -37,44 +39,78 @@ export interface OnErrorPayload<TRouter extends AnyRouter> {
 
 export type OnErrorFn<TRouter extends AnyRouter> = (opts: OnErrorPayload<TRouter>) => void
 
-export function createNuxtApiHandler<TRouter extends AnyRouter>({
-  router,
-  createContext,
-  responseMeta,
-  onError,
-  url = '/api/trpc',
-}: {
+export interface ResolveHTTPRequestOptions<TRouter extends AnyRouter> {
   router: TRouter
   createContext?: CreateContextFn<TRouter>
   responseMeta?: ResponseMetaFn<TRouter>
   onError?: OnErrorFn<TRouter>
-  url?: string
-}) {
+  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,
+      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,
+        query: $url.searchParams
       },
-      path: $url.pathname.substring(url.length + 1),
-      createContext: async () => createContext?.(event),
+      path,
+      createContext: async () => await createContext?.(event),
       responseMeta,
       onError: (o) => {
         onError?.({
           ...o,
-          req,
+          req
         })
-      },
+      }
     })
 
     const { status, headers, body } = httpResponse

tsconfig.json

@@ -10,7 +10,7 @@
     "noImplicitAny": true,
     "allowJs": true,
     "noEmit": true,
-    "outDir": "dist",
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "skipDefaultLibCheck": true
   }
 }

tsup.config.ts

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