mirror of
https://github.com/ArthurDanjou/trpc-nuxt.git
synced 2026-01-14 12:14:40 +01:00
Compare commits
44 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
169c6aa534 | ||
|
|
2d025788ce | ||
|
|
4af2b2ef3f | ||
|
|
ae0b7824f4 | ||
|
|
4339bf5059 | ||
|
|
252e2261e9 | ||
|
|
40eaf44f39 | ||
|
|
ad827bb716 | ||
|
|
08125cbf0c | ||
|
|
fb5723b071 | ||
|
|
8c35279cc2 | ||
|
|
61a5bcd2ee | ||
|
|
eaeab1565d | ||
|
|
e7453bfc70 | ||
|
|
54ef27d524 | ||
|
|
38d83dac34 | ||
|
|
0f7e52248f | ||
|
|
be55641338 | ||
|
|
6ba6e70b92 | ||
|
|
b710f809c7 | ||
|
|
4f647afa36 | ||
|
|
1defbe5954 | ||
|
|
fa6ba65d35 | ||
|
|
d4af221e89 | ||
|
|
6595a1d306 | ||
|
|
b506cd5f14 | ||
|
|
7a69573fb9 | ||
|
|
8e26e781d4 | ||
|
|
8efb63e70c | ||
|
|
4f6c07b0a1 | ||
|
|
aa3fe5527d | ||
|
|
6f17913eab | ||
|
|
d6c60cb2b3 | ||
|
|
76fbd59525 | ||
|
|
57faf8749a | ||
|
|
9456342d58 | ||
|
|
f89c8e44ef | ||
|
|
7f156806d8 | ||
|
|
bd33589d2f | ||
|
|
16b6ed315a | ||
|
|
6e74e44233 | ||
|
|
6485aa42a7 | ||
|
|
051d5bb325 | ||
|
|
b7d4dc7642 |
1
.github/FUNDING.yml
vendored
Normal file
1
.github/FUNDING.yml
vendored
Normal file
@@ -0,0 +1 @@
|
||||
github: wobsoriano
|
||||
@@ -27,6 +27,10 @@ For version 3 of this module (tRPC v9, auto-imports, auto handlers), [go here](h
|
||||
|
||||
- [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar)
|
||||
|
||||
## Acknowledgements
|
||||
|
||||
Huge thanks to [Alex / KATT](https://github.com/KATT), the author of [tRPC](https://trpc.io/), for being the first sponsor of this project! 🎉
|
||||
|
||||
## License
|
||||
|
||||
MIT
|
||||
|
||||
@@ -107,12 +107,12 @@ export default defineNuxtPlugin(() => {
|
||||
<script setup lang="ts">
|
||||
const { $client } = useNuxtApp()
|
||||
|
||||
const hello = await $client.hello.useQuery({ text: 'client' })
|
||||
const { data: hello } = await $client.hello.useQuery({ text: 'client' })
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div>
|
||||
<p>{{ hello.data?.greeting }}</p>
|
||||
<p>{{ hello?.greeting }}</p>
|
||||
</div>
|
||||
</template>
|
||||
```
|
||||
|
||||
@@ -96,7 +96,7 @@ import { inferAsyncReturnType } from '@trpc/server'
|
||||
* Creates context for an incoming request
|
||||
* @link https://trpc.io/docs/context
|
||||
*/
|
||||
export const createContext = () => {}
|
||||
export const createContext = () => ({})
|
||||
|
||||
export type Context = inferAsyncReturnType<typeof createContext>;
|
||||
```
|
||||
|
||||
@@ -7,7 +7,7 @@ title: 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.
|
||||
|
||||
::alert{type="info"}
|
||||
[createTRPCNuxtClient](/get-started/client/create) adds a `useQuery` method built on top of [useAsyncData](https://nuxt.com/docs/api/composables/use-async-data/).
|
||||
[createTRPCNuxtClient](/get-started/client/create) already adds a `useQuery` method built on top of [useAsyncData](https://nuxt.com/docs/api/composables/use-async-data/). You might not need this.
|
||||
::
|
||||
|
||||
## Inference Helpers
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
"preview": "nuxi preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"nuxt": "^3.0.0"
|
||||
"nuxt": "3.4.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nuxt-themes/docus": "^1.1.10",
|
||||
"@nuxtlabs/github-module": "^1.5.4"
|
||||
"@nuxt-themes/docus": "^1.11.1",
|
||||
"@nuxtlabs/github-module": "^1.6.3"
|
||||
}
|
||||
}
|
||||
|
||||
36
package.json
36
package.json
@@ -2,8 +2,8 @@
|
||||
"name": "trpc-nuxt",
|
||||
"description": "End-to-end typesafe APIs in Nuxt applications.",
|
||||
"type": "module",
|
||||
"packageManager": "pnpm@7.18.2",
|
||||
"version": "0.5.0",
|
||||
"packageManager": "pnpm@7.32.4",
|
||||
"version": "0.10.0",
|
||||
"license": "MIT",
|
||||
"sideEffects": false,
|
||||
"exports": {
|
||||
@@ -25,7 +25,7 @@
|
||||
"client.d.ts"
|
||||
],
|
||||
"scripts": {
|
||||
"dev": "concurrently \"pnpm build --watch\" \"pnpm --filter playground dev\"",
|
||||
"dev": "tsup --watch --onSuccess \"pnpm --filter playground dev\"",
|
||||
"dev:prepare": "pnpm build && nuxt prepare playground",
|
||||
"prepublishOnly": "pnpm build",
|
||||
"build": "tsup",
|
||||
@@ -35,25 +35,25 @@
|
||||
"update-deps": "taze -w && pnpm i"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@trpc/client": "^10.8.0",
|
||||
"@trpc/server": "^10.8.0"
|
||||
"@trpc/client": "^10.26.0",
|
||||
"@trpc/server": "^10.26.0",
|
||||
"nuxt": "^3.4.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"h3": "^1.0.2",
|
||||
"ofetch": "^1.0.0",
|
||||
"ohash": "^1.0.0",
|
||||
"ufo": "^1.0.1"
|
||||
"h3": "^1.6.5",
|
||||
"ofetch": "^1.0.1",
|
||||
"ohash": "^1.1.2",
|
||||
"ufo": "^1.1.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nuxt/eslint-config": "^0.1.1",
|
||||
"@trpc/client": "^10.8.1",
|
||||
"@trpc/server": "^10.8.1",
|
||||
"bumpp": "^8.2.1",
|
||||
"concurrently": "^7.6.0",
|
||||
"eslint": "^8.30.0",
|
||||
"taze": "^0.8.5",
|
||||
"tsup": "6.4.0",
|
||||
"typescript": "^4.9.4"
|
||||
"@trpc/client": "^10.26.0",
|
||||
"@trpc/server": "^10.26.0",
|
||||
"bumpp": "^9.1.0",
|
||||
"eslint": "^8.40.0",
|
||||
"taze": "^0.10.1",
|
||||
"tsup": "6.7.0",
|
||||
"typescript": "^5.0.4"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
@@ -76,7 +76,7 @@
|
||||
],
|
||||
"pnpm": {
|
||||
"overrides": {
|
||||
"nuxt": "3.0.0"
|
||||
"nuxt": "3.4.3"
|
||||
}
|
||||
},
|
||||
"engines": {
|
||||
|
||||
@@ -9,13 +9,14 @@
|
||||
"postinstall": "nuxt prepare"
|
||||
},
|
||||
"dependencies": {
|
||||
"@trpc/client": "^10.8.1",
|
||||
"@trpc/server": "^10.8.1",
|
||||
"superjson": "^1.12.1",
|
||||
"@trpc/client": "^10.26.0",
|
||||
"@trpc/server": "^10.26.0",
|
||||
"superjson": "^1.12.3",
|
||||
"trpc-nuxt": "workspace:*",
|
||||
"zod": "^3.20.2"
|
||||
"zod": "^3.21.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"nuxt": "^3.0.0"
|
||||
"@types/node": "^18.16.8",
|
||||
"nuxt": "3.4.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@ const { data: todo, pending, error } = await useAsyncData(() => $client.todo.get
|
||||
<div v-if="pending">
|
||||
Loading...
|
||||
</div>
|
||||
<div v-else-if="error?.data?.code">
|
||||
{{ error.data.code }}
|
||||
<div v-else-if="error">
|
||||
{{ error.message }} - {{ error.cause }}
|
||||
</div>
|
||||
<div v-else>
|
||||
ID: {{ todo?.id }} <br>
|
||||
|
||||
6433
pnpm-lock.yaml
generated
6433
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -61,7 +61,7 @@ export function createNuxtProxyDecoration<TRouter extends AnyRouter> (name: stri
|
||||
}), asyncDataOptions)
|
||||
}
|
||||
|
||||
return (client as any)[path][lastArg](input)
|
||||
return (client as any)[path][lastArg](...args)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ export function createTRPCNuxtClient<TRouter extends AnyRouter> (opts: CreateTRP
|
||||
const client = createTRPCProxyClient<TRouter>(opts)
|
||||
|
||||
const decoratedClient = createFlatProxy((key) => {
|
||||
return createNuxtProxyDecoration(key, client)
|
||||
return createNuxtProxyDecoration(key, client as any)
|
||||
}) as DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>
|
||||
|
||||
return decoratedClient
|
||||
|
||||
@@ -3,9 +3,10 @@ import { type AnyRouter } from '@trpc/server'
|
||||
import { FetchError } from 'ofetch'
|
||||
// @ts-expect-error: Nuxt auto-imports
|
||||
import { useRequestHeaders } from '#imports'
|
||||
import { type HTTPLinkOptions as _HTTPLinkOptions } from '@trpc/client/dist/links/internals/httpUtils'
|
||||
import { type HTTPLinkOptions as _HTTPLinkOptions } from '@trpc/client/dist/links/httpLink'
|
||||
import { type FetchEsque } from '@trpc/client/dist/internals/types'
|
||||
|
||||
function customFetch(input: RequestInfo | URL, init?: RequestInit) {
|
||||
function customFetch(input: RequestInfo | URL, init?: RequestInit & { method: 'GET' }) {
|
||||
return globalThis.$fetch.raw(input.toString(), init)
|
||||
.catch((e) => {
|
||||
if (e instanceof FetchError && e.response) { return e.response }
|
||||
@@ -43,7 +44,7 @@ export function httpLink<TRouter extends AnyRouter>(opts?: HTTPLinkOptions) {
|
||||
headers () {
|
||||
return headers
|
||||
},
|
||||
fetch: customFetch,
|
||||
fetch: customFetch as FetchEsque,
|
||||
...opts,
|
||||
})
|
||||
}
|
||||
@@ -69,10 +70,11 @@ export function httpBatchLink<TRouter extends AnyRouter>(opts?: HttpBatchLinkOpt
|
||||
|
||||
return _httpBatchLink<TRouter>({
|
||||
url: '/api/trpc',
|
||||
// @ts-expect-error: Missing property from batchLink. Fix this later.
|
||||
headers () {
|
||||
return headers
|
||||
},
|
||||
fetch: customFetch,
|
||||
fetch: customFetch as FetchEsque,
|
||||
...opts,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -16,9 +16,8 @@ import { inferTransformedProcedureOutput } from '@trpc/server/shared'
|
||||
import type {
|
||||
AsyncData,
|
||||
AsyncDataOptions,
|
||||
KeyOfRes,
|
||||
KeysOf,
|
||||
PickFrom,
|
||||
_Transform
|
||||
} from 'nuxt/dist/app/composables/asyncData'
|
||||
|
||||
interface TRPCRequestOptions extends _TRPCRequestOptions {
|
||||
@@ -52,12 +51,11 @@ type DecorateProcedure<
|
||||
? {
|
||||
useQuery: <
|
||||
TData = inferTransformedProcedureOutput<TProcedure>,
|
||||
Transform extends _Transform<TData> = _Transform<TData, TData>,
|
||||
PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>,
|
||||
PickKeys extends KeysOf<TData> = KeysOf<TData>,
|
||||
>(
|
||||
input: inferProcedureInput<TProcedure>,
|
||||
opts?: AsyncDataOptions<TData, Transform, PickKeys> & { trpc?: TRPCRequestOptions },
|
||||
) => AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, TRPCClientErrorLike<TProcedure>>,
|
||||
opts?: AsyncDataOptions<TData, TData, PickKeys> & { trpc?: TRPCRequestOptions },
|
||||
) => AsyncData<PickFrom<TData, PickKeys>, TRPCClientErrorLike<TProcedure>>,
|
||||
query: Resolver<TProcedure>
|
||||
} : TProcedure extends AnyMutationProcedure ? {
|
||||
mutate: Resolver<TProcedure>
|
||||
|
||||
@@ -50,9 +50,13 @@ export interface ResolveHTTPRequestOptions<TRouter extends AnyRouter> {
|
||||
}
|
||||
|
||||
function getPath (event: H3Event): string | null {
|
||||
if (typeof event.context.params.trpc === 'string') { return event.context.params.trpc }
|
||||
const { params } = event.context
|
||||
|
||||
if (Array.isArray(event.context.params.trpc)) { return event.context.params.trpc.join('/') }
|
||||
if (typeof params?.trpc === 'string') { return params.trpc }
|
||||
|
||||
if (params?.trpc && Array.isArray(params.trpc)) {
|
||||
return (params.trpc as string[]).join('/')
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user