diff --git a/examples/vue/2.6-basic/src/Post.vue b/examples/vue/2.6-basic/src/Post.vue
index 408542716f..a0c658ce75 100644
--- a/examples/vue/2.6-basic/src/Post.vue
+++ b/examples/vue/2.6-basic/src/Post.vue
@@ -1,7 +1,7 @@
diff --git a/examples/vue/basic/src/Posts.vue b/examples/vue/basic/src/Posts.vue
index 4a9b07c0c6..998a6995d7 100644
--- a/examples/vue/basic/src/Posts.vue
+++ b/examples/vue/basic/src/Posts.vue
@@ -1,13 +1,14 @@
@@ -22,7 +23,7 @@ const { isPending, isError, isFetching, data, error } =
href="#"
:class="{
visited: queryClient.getQueryData(
- postQueryOptions(item.id).queryKey,
+ postsQueries.detail(item.id).queryKey,
),
}"
>{{ item.title }}> => {
- const response = await fetch('https://jsonplaceholder.typicode.com/posts')
- if (!response.ok) throw new Error('Failed to fetch posts')
- return await response.json()
-}
-
-const fetchPost = async (id: number): Promise => {
- const response = await fetch(
- `https://jsonplaceholder.typicode.com/posts/${id}`,
- )
- if (!response.ok) throw new Error('Failed to fetch post')
- return await response.json()
-}
-
-export const postsQueryOptions = () =>
- queryOptions({
- queryKey: ['posts'],
- queryFn: fetchPosts,
- })
-
-export const postQueryOptions = (id: number) =>
- queryOptions({
- queryKey: ['post', id],
- queryFn: () => fetchPost(id),
- })
diff --git a/examples/vue/basic/src/services/posts/api.ts b/examples/vue/basic/src/services/posts/api.ts
new file mode 100644
index 0000000000..afa74602c3
--- /dev/null
+++ b/examples/vue/basic/src/services/posts/api.ts
@@ -0,0 +1,16 @@
+import type { Post } from './types'
+
+export const postsAPI = {
+ getPosts: async (): Promise> => {
+ const response = await fetch('https://jsonplaceholder.typicode.com/posts')
+ if (!response.ok) throw new Error('Failed to fetch posts')
+ return await response.json()
+ },
+ getPost: async (id: number): Promise => {
+ const response = await fetch(
+ `https://jsonplaceholder.typicode.com/posts/${id}`,
+ )
+ if (!response.ok) throw new Error('Failed to fetch post')
+ return await response.json()
+ },
+}
diff --git a/examples/vue/basic/src/services/posts/queries.ts b/examples/vue/basic/src/services/posts/queries.ts
new file mode 100644
index 0000000000..a1d3e30731
--- /dev/null
+++ b/examples/vue/basic/src/services/posts/queries.ts
@@ -0,0 +1,16 @@
+import { queryOptions } from '@tanstack/vue-query'
+import { postsAPI } from './api'
+
+export const postsQueries = {
+ all: () => ['posts'] as const,
+ list: () =>
+ queryOptions({
+ queryKey: [...postsQueries.all(), 'list'] as const,
+ queryFn: () => postsAPI.getPosts(),
+ }),
+ detail: (id: number) =>
+ queryOptions({
+ queryKey: [...postsQueries.all(), 'detail', id] as const,
+ queryFn: () => postsAPI.getPost(id),
+ }),
+}
diff --git a/examples/vue/basic/src/types.ts b/examples/vue/basic/src/services/posts/types.ts
similarity index 100%
rename from examples/vue/basic/src/types.ts
rename to examples/vue/basic/src/services/posts/types.ts
diff --git a/examples/vue/dependent-queries/src/Post.vue b/examples/vue/dependent-queries/src/Post.vue
index d965f41ee7..4e6bbca1bd 100644
--- a/examples/vue/dependent-queries/src/Post.vue
+++ b/examples/vue/dependent-queries/src/Post.vue
@@ -1,7 +1,8 @@
diff --git a/examples/vue/dependent-queries/src/Posts.vue b/examples/vue/dependent-queries/src/Posts.vue
index 4a9b07c0c6..998a6995d7 100644
--- a/examples/vue/dependent-queries/src/Posts.vue
+++ b/examples/vue/dependent-queries/src/Posts.vue
@@ -1,13 +1,14 @@
@@ -22,7 +23,7 @@ const { isPending, isError, isFetching, data, error } =
href="#"
:class="{
visited: queryClient.getQueryData(
- postQueryOptions(item.id).queryKey,
+ postsQueries.detail(item.id).queryKey,
),
}"
>{{ item.title }}> => {
- const response = await fetch('https://jsonplaceholder.typicode.com/posts')
- if (!response.ok) throw new Error('Failed to fetch posts')
- return await response.json()
-}
-
-const fetchPost = async (id: number): Promise => {
- const response = await fetch(
- `https://jsonplaceholder.typicode.com/posts/${id}`,
- )
- if (!response.ok) throw new Error('Failed to fetch post')
- return await response.json()
-}
-
-const fetchAuthor = async (id: number): Promise => {
- const response = await fetch(
- `https://jsonplaceholder.typicode.com/users/${id}`,
- )
- if (!response.ok) throw new Error('Failed to fetch author')
- return await response.json()
-}
-
-export const postsQueryOptions = () =>
- queryOptions({
- queryKey: ['posts'],
- queryFn: fetchPosts,
- })
-
-export const postQueryOptions = (id: number) =>
- queryOptions({
- queryKey: ['post', id],
- queryFn: () => fetchPost(id),
- })
-
-export const authorQueryOptions = (id: number | undefined) =>
- queryOptions({
- queryKey: ['author', id],
- queryFn: id === undefined ? skipToken : () => fetchAuthor(id),
- })
diff --git a/examples/vue/dependent-queries/src/services/authors/api.ts b/examples/vue/dependent-queries/src/services/authors/api.ts
new file mode 100644
index 0000000000..02c3fac908
--- /dev/null
+++ b/examples/vue/dependent-queries/src/services/authors/api.ts
@@ -0,0 +1,11 @@
+import type { Author } from './types'
+
+export const authorsAPI = {
+ getAuthor: async (id: number): Promise => {
+ const response = await fetch(
+ `https://jsonplaceholder.typicode.com/users/${id}`,
+ )
+ if (!response.ok) throw new Error('Failed to fetch author')
+ return await response.json()
+ },
+}
diff --git a/examples/vue/dependent-queries/src/services/authors/queries.ts b/examples/vue/dependent-queries/src/services/authors/queries.ts
new file mode 100644
index 0000000000..7d7824bcfd
--- /dev/null
+++ b/examples/vue/dependent-queries/src/services/authors/queries.ts
@@ -0,0 +1,11 @@
+import { queryOptions, skipToken } from '@tanstack/vue-query'
+import { authorsAPI } from './api'
+
+export const authorsQueries = {
+ all: () => ['authors'] as const,
+ detail: (id: number | undefined) =>
+ queryOptions({
+ queryKey: [...authorsQueries.all(), 'detail', id] as const,
+ queryFn: id === undefined ? skipToken : () => authorsAPI.getAuthor(id),
+ }),
+}
diff --git a/examples/vue/dependent-queries/src/types.ts b/examples/vue/dependent-queries/src/services/authors/types.ts
similarity index 79%
rename from examples/vue/dependent-queries/src/types.ts
rename to examples/vue/dependent-queries/src/services/authors/types.ts
index 82a1dd6c4f..e30509c0ab 100644
--- a/examples/vue/dependent-queries/src/types.ts
+++ b/examples/vue/dependent-queries/src/services/authors/types.ts
@@ -1,10 +1,3 @@
-export type Post = {
- userId: number
- id: number
- title: string
- body: string
-}
-
export type Author = {
id: number
name: string
diff --git a/examples/vue/dependent-queries/src/services/posts/api.ts b/examples/vue/dependent-queries/src/services/posts/api.ts
new file mode 100644
index 0000000000..afa74602c3
--- /dev/null
+++ b/examples/vue/dependent-queries/src/services/posts/api.ts
@@ -0,0 +1,16 @@
+import type { Post } from './types'
+
+export const postsAPI = {
+ getPosts: async (): Promise> => {
+ const response = await fetch('https://jsonplaceholder.typicode.com/posts')
+ if (!response.ok) throw new Error('Failed to fetch posts')
+ return await response.json()
+ },
+ getPost: async (id: number): Promise => {
+ const response = await fetch(
+ `https://jsonplaceholder.typicode.com/posts/${id}`,
+ )
+ if (!response.ok) throw new Error('Failed to fetch post')
+ return await response.json()
+ },
+}
diff --git a/examples/vue/dependent-queries/src/services/posts/queries.ts b/examples/vue/dependent-queries/src/services/posts/queries.ts
new file mode 100644
index 0000000000..a1d3e30731
--- /dev/null
+++ b/examples/vue/dependent-queries/src/services/posts/queries.ts
@@ -0,0 +1,16 @@
+import { queryOptions } from '@tanstack/vue-query'
+import { postsAPI } from './api'
+
+export const postsQueries = {
+ all: () => ['posts'] as const,
+ list: () =>
+ queryOptions({
+ queryKey: [...postsQueries.all(), 'list'] as const,
+ queryFn: () => postsAPI.getPosts(),
+ }),
+ detail: (id: number) =>
+ queryOptions({
+ queryKey: [...postsQueries.all(), 'detail', id] as const,
+ queryFn: () => postsAPI.getPost(id),
+ }),
+}
diff --git a/examples/vue/dependent-queries/src/services/posts/types.ts b/examples/vue/dependent-queries/src/services/posts/types.ts
new file mode 100644
index 0000000000..70f33fdb8f
--- /dev/null
+++ b/examples/vue/dependent-queries/src/services/posts/types.ts
@@ -0,0 +1,6 @@
+export type Post = {
+ userId: number
+ id: number
+ title: string
+ body: string
+}
diff --git a/examples/vue/simple/src/App.vue b/examples/vue/simple/src/App.vue
index 8d5ef4df14..d2528d8207 100644
--- a/examples/vue/simple/src/App.vue
+++ b/examples/vue/simple/src/App.vue
@@ -1,17 +1,9 @@
diff --git a/examples/vue/simple/src/services/repos/api.ts b/examples/vue/simple/src/services/repos/api.ts
new file mode 100644
index 0000000000..90a79bc262
--- /dev/null
+++ b/examples/vue/simple/src/services/repos/api.ts
@@ -0,0 +1,9 @@
+import type { Repo } from './types'
+
+export const reposAPI = {
+ getRepo: async (): Promise => {
+ const response = await fetch('https://api.github.com/repos/TanStack/query')
+ if (!response.ok) throw new Error('Failed to fetch repo data')
+ return await response.json()
+ },
+}
diff --git a/examples/vue/simple/src/services/repos/queries.ts b/examples/vue/simple/src/services/repos/queries.ts
new file mode 100644
index 0000000000..5369f77f58
--- /dev/null
+++ b/examples/vue/simple/src/services/repos/queries.ts
@@ -0,0 +1,11 @@
+import { queryOptions } from '@tanstack/vue-query'
+import { reposAPI } from './api'
+
+export const reposQueries = {
+ all: () => ['repos'] as const,
+ detail: () =>
+ queryOptions({
+ queryKey: [...reposQueries.all(), 'detail'] as const,
+ queryFn: () => reposAPI.getRepo(),
+ }),
+}
diff --git a/examples/vue/simple/src/types.ts b/examples/vue/simple/src/services/repos/types.ts
similarity index 100%
rename from examples/vue/simple/src/types.ts
rename to examples/vue/simple/src/services/repos/types.ts