mirror of
https://github.com/ArthurDanjou/trpc-nuxt.git
synced 2026-01-14 20:19:33 +01:00
Compare commits
49 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bec300b750 | ||
|
|
7bbe767495 | ||
|
|
811a634010 | ||
|
|
12d8c97f71 | ||
|
|
ad85a78350 | ||
|
|
892d167ff1 | ||
|
|
e15ea6b5a3 | ||
|
|
054fad952a | ||
|
|
e15a62a5b2 | ||
|
|
3f399f0c58 | ||
|
|
247a6448cb | ||
|
|
5301221148 | ||
|
|
7683499953 | ||
|
|
2c28424ecd | ||
|
|
18cd492ffd | ||
|
|
c2ae94b4a7 | ||
|
|
94eb3c6257 | ||
|
|
e55670169e | ||
|
|
4f7fbbe108 | ||
|
|
c32fdf7893 | ||
|
|
10bc1d3a4d | ||
|
|
7bd62822d3 | ||
|
|
967271089f | ||
|
|
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 |
54
CHANGELOG.md
Normal file
54
CHANGELOG.md
Normal file
@@ -0,0 +1,54 @@
|
||||
# Changelog
|
||||
|
||||
|
||||
## v0.10.6
|
||||
|
||||
[compare changes](https://github.com/wobsoriano/trpc-nuxt/compare/v0.10.5...v0.10.6)
|
||||
|
||||
## v0.10.5
|
||||
|
||||
[compare changes](https://github.com/wobsoriano/trpc-nuxt/compare/v0.10.4...v0.10.5)
|
||||
|
||||
|
||||
### 🚀 Enhancements
|
||||
|
||||
- Pass input to watched sources if it's a ref ([892d167](https://github.com/wobsoriano/trpc-nuxt/commit/892d167))
|
||||
|
||||
### ❤️ Contributors
|
||||
|
||||
- Wobsoriano ([@wobsoriano](http://github.com/wobsoriano))
|
||||
|
||||
## v0.10.4
|
||||
|
||||
[compare changes](https://github.com/wobsoriano/trpc-nuxt/compare/v0.10.3...v0.10.4)
|
||||
|
||||
|
||||
### 🚀 Enhancements
|
||||
|
||||
- Add reactive inputs ([054fad9](https://github.com/wobsoriano/trpc-nuxt/commit/054fad9))
|
||||
|
||||
### 📖 Documentation
|
||||
|
||||
- Update local deps ([7683499](https://github.com/wobsoriano/trpc-nuxt/commit/7683499))
|
||||
|
||||
### 🏡 Chore
|
||||
|
||||
- Remove engines property ([e15a62a](https://github.com/wobsoriano/trpc-nuxt/commit/e15a62a))
|
||||
|
||||
### ❤️ Contributors
|
||||
|
||||
- Wobsoriano ([@wobsoriano](http://github.com/wobsoriano))
|
||||
|
||||
## v0.10.3
|
||||
|
||||
[compare changes](https://github.com/wobsoriano/trpc-nuxt/compare/v0.10.2...v0.10.3)
|
||||
|
||||
|
||||
### 🚀 Enhancements
|
||||
|
||||
- Export createH3ApiHandler for h3 apps ([18cd492](https://github.com/wobsoriano/trpc-nuxt/commit/18cd492))
|
||||
|
||||
### ❤️ Contributors
|
||||
|
||||
- Wobsoriano ([@wobsoriano](http://github.com/wobsoriano))
|
||||
|
||||
@@ -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,11 +7,9 @@
|
||||
"generate": "nuxi build",
|
||||
"preview": "nuxi preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"nuxt": "^3.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nuxt-themes/docus": "^1.1.10",
|
||||
"@nuxtlabs/github-module": "^1.5.4"
|
||||
"@nuxt-themes/docus": "^1.13.1",
|
||||
"@nuxtlabs/github-module": "^1.6.3",
|
||||
"nuxt": "3.6.2"
|
||||
}
|
||||
}
|
||||
|
||||
39
package.json
39
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.7.0",
|
||||
"packageManager": "pnpm@8.6.7",
|
||||
"version": "0.10.6",
|
||||
"license": "MIT",
|
||||
"sideEffects": false,
|
||||
"exports": {
|
||||
@@ -31,28 +31,28 @@
|
||||
"build": "tsup",
|
||||
"lint": "eslint .",
|
||||
"lint:fix": "eslint . --fix",
|
||||
"release": "bumpp && npm publish",
|
||||
"release": "changelogen --release && npm publish && git push --follow-tags",
|
||||
"update-deps": "taze -w && pnpm i"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@trpc/client": "^10.12.0",
|
||||
"@trpc/server": "^10.12.0"
|
||||
"@trpc/client": "^10.26.0",
|
||||
"@trpc/server": "^10.26.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"h3": "^1.5.0",
|
||||
"ofetch": "^1.0.1",
|
||||
"ohash": "^1.0.0",
|
||||
"ufo": "^1.1.0"
|
||||
"h3": "^1.7.1",
|
||||
"ofetch": "^1.1.1",
|
||||
"ohash": "^1.1.2",
|
||||
"ufo": "^1.1.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nuxt/eslint-config": "^0.1.1",
|
||||
"@trpc/client": "^10.12.0",
|
||||
"@trpc/server": "^10.12.0",
|
||||
"bumpp": "^8.2.1",
|
||||
"eslint": "^8.33.0",
|
||||
"taze": "^0.8.5",
|
||||
"tsup": "6.6.3",
|
||||
"typescript": "^4.9.5"
|
||||
"@trpc/client": "^10.34.0",
|
||||
"@trpc/server": "^10.34.0",
|
||||
"changelogen": "^0.5.4",
|
||||
"eslint": "^8.44.0",
|
||||
"taze": "^0.11.2",
|
||||
"tsup": "7.1.0",
|
||||
"typescript": "^5.1.6"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
@@ -75,10 +75,7 @@
|
||||
],
|
||||
"pnpm": {
|
||||
"overrides": {
|
||||
"nuxt": "3.0.0"
|
||||
"nuxt": "3.6.2"
|
||||
}
|
||||
},
|
||||
"engines": {
|
||||
"node": "^16.13.0 || ^18.12.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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.34.0",
|
||||
"@trpc/server": "^10.34.0",
|
||||
"superjson": "^1.12.4",
|
||||
"trpc-nuxt": "workspace:*",
|
||||
"zod": "^3.20.2"
|
||||
"zod": "^3.21.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"nuxt": "^3.0.0"
|
||||
"@types/node": "^20.4.1",
|
||||
"nuxt": "3.6.2"
|
||||
}
|
||||
}
|
||||
|
||||
27
playground/pages/reactive.vue
Normal file
27
playground/pages/reactive.vue
Normal file
@@ -0,0 +1,27 @@
|
||||
<script setup lang="ts">
|
||||
const route = useRoute()
|
||||
const { $client } = useNuxtApp()
|
||||
const id = ref(1)
|
||||
// const { data: todo, pending, error } = await useAsyncData(() => $client.todo.getTodo.query(id.value), {
|
||||
// watch: [id]
|
||||
// })
|
||||
|
||||
const { data: todo, pending, error, refresh } = await $client.todo.getTodo.useQuery(id)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div v-if="pending">
|
||||
Loading...
|
||||
</div>
|
||||
<div v-else-if="error?.data?.code">
|
||||
Error: {{ error.data.code }}
|
||||
</div>
|
||||
<div v-else>
|
||||
ID: {{ todo?.id }} <br>
|
||||
Title: {{ todo?.title }} <br>
|
||||
Completed: {{ todo?.completed }}
|
||||
</div>
|
||||
<button @click="id++">
|
||||
Next Todo
|
||||
</button>
|
||||
</template>
|
||||
@@ -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>
|
||||
|
||||
7240
pnpm-lock.yaml
generated
7240
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -4,7 +4,7 @@ import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared'
|
||||
import { hash } from 'ohash'
|
||||
import { type DecoratedProcedureRecord } from './types'
|
||||
// @ts-expect-error: Nuxt auto-imports
|
||||
import { getCurrentInstance, onScopeDispose, useAsyncData } from '#imports'
|
||||
import { getCurrentInstance, onScopeDispose, useAsyncData, unref, isRef } from '#imports'
|
||||
|
||||
/**
|
||||
* Calculates the key used for `useAsyncData` call.
|
||||
@@ -54,14 +54,17 @@ export function createNuxtProxyDecoration<TRouter extends AnyRouter> (name: stri
|
||||
controller = typeof AbortController !== 'undefined' ? new AbortController() : {} as AbortController
|
||||
}
|
||||
|
||||
const queryKey = getQueryKey(path, input)
|
||||
return useAsyncData(queryKey, () => (client as any)[path].query(input, {
|
||||
const queryKey = getQueryKey(path, unref(input))
|
||||
return useAsyncData(queryKey, () => (client as any)[path].query(unref(input), {
|
||||
signal: controller?.signal,
|
||||
...trpc
|
||||
}), asyncDataOptions)
|
||||
}), {
|
||||
...asyncDataOptions,
|
||||
watch: isRef(input) ? [...(asyncDataOptions.watch || []), input] : asyncDataOptions.watch
|
||||
})
|
||||
}
|
||||
|
||||
return (client as any)[path][lastArg](input)
|
||||
return (client as any)[path][lastArg](...args)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -3,10 +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 }
|
||||
@@ -70,6 +70,7 @@ 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
|
||||
},
|
||||
|
||||
@@ -16,10 +16,10 @@ import { inferTransformedProcedureOutput } from '@trpc/server/shared'
|
||||
import type {
|
||||
AsyncData,
|
||||
AsyncDataOptions,
|
||||
KeyOfRes,
|
||||
KeysOf,
|
||||
PickFrom,
|
||||
_Transform
|
||||
} from 'nuxt/dist/app/composables/asyncData'
|
||||
import type { Ref } from 'vue'
|
||||
|
||||
interface TRPCRequestOptions extends _TRPCRequestOptions {
|
||||
abortOnUnmount?: boolean
|
||||
@@ -45,19 +45,22 @@ type SubscriptionResolver<
|
||||
]
|
||||
) => Unsubscribable
|
||||
|
||||
type MaybeRef<T> = T | Ref<T>
|
||||
|
||||
type DecorateProcedure<
|
||||
TProcedure extends AnyProcedure,
|
||||
TRouter extends AnyRouter,
|
||||
> = TProcedure extends AnyQueryProcedure
|
||||
? {
|
||||
useQuery: <
|
||||
TData = inferTransformedProcedureOutput<TProcedure>,
|
||||
Transform extends _Transform<TData> = _Transform<TData, TData>,
|
||||
PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>,
|
||||
ResT = inferTransformedProcedureOutput<TProcedure>,
|
||||
DataE = TRPCClientErrorLike<TProcedure>,
|
||||
DataT = ResT,
|
||||
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
|
||||
>(
|
||||
input: inferProcedureInput<TProcedure>,
|
||||
opts?: AsyncDataOptions<TData, Transform, PickKeys> & { trpc?: TRPCRequestOptions },
|
||||
) => AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, TRPCClientErrorLike<TProcedure>>,
|
||||
input: MaybeRef<inferProcedureInput<TProcedure>>,
|
||||
opts?: AsyncDataOptions<ResT, DataT, PickKeys> & { trpc?: TRPCRequestOptions },
|
||||
) => AsyncData<PickFrom<DataT, PickKeys>, DataE>,
|
||||
query: Resolver<TProcedure>
|
||||
} : TProcedure extends AnyMutationProcedure ? {
|
||||
mutate: Resolver<TProcedure>
|
||||
|
||||
@@ -128,3 +128,5 @@ export function createNuxtApiHandler<TRouter extends AnyRouter> ({
|
||||
return body
|
||||
})
|
||||
}
|
||||
|
||||
export const createH3ApiHandler = createNuxtApiHandler
|
||||
|
||||
Reference in New Issue
Block a user