Skip to content

Commit c40ca54

Browse files
authored
fix: incorrect route id (#124)
close #123
1 parent 747fc68 commit c40ca54

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

src/template.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ function exportedQuery(ctx: Context) {
2121
}
2222

2323
function routes(ctx: Context) {
24-
const routes = ctx.routes.map(({ route, params, fileName }) =>
24+
const routes = ctx.routes.map(({ id, route, params, fileName }) =>
2525
`"${route}": {
26-
id: '${route}',
26+
id: '${id}',
2727
params: ${params.length > 0 ? `{${params.map(param => `${param}: string | number`).join('; ')}}` : 'never'},
2828
query: ExportedQuery<import('${ctx.relativeAppDirPath}/${fileName}').SearchParams>,
2929
}`

tests/__snapshots__/build.test.ts.snap

+27-27
Original file line numberDiff line numberDiff line change
@@ -10,137 +10,137 @@ exports[`gen route types 1`] = `
1010
1111
export interface Routes {
1212
"/": {
13-
id: '/',
13+
id: 'root',
1414
params: never,
1515
query: ExportedQuery<import('../app/root').SearchParams>,
1616
},
1717
"/:lang?/about": {
18-
id: '/:lang?/about',
18+
id: 'routes/($lang).about',
1919
params: {lang?: string | number},
2020
query: ExportedQuery<import('../app/routes/($lang).about').SearchParams>,
2121
},
2222
"/admin": {
23-
id: '/admin',
23+
id: 'routes/admin._index',
2424
params: never,
2525
query: ExportedQuery<import('../app/routes/admin._index').SearchParams>,
2626
},
2727
"/admin/episodes": {
28-
id: '/admin/episodes',
28+
id: 'routes/admin.episodes._index',
2929
params: never,
3030
query: ExportedQuery<import('../app/routes/admin.episodes._index').SearchParams>,
3131
},
3232
"/admin/episodes/:id": {
33-
id: '/admin/episodes/:id',
33+
id: 'routes/admin.episodes.$id._index',
3434
params: {id: string | number},
3535
query: ExportedQuery<import('../app/routes/admin.episodes.$id._index').SearchParams>,
3636
},
3737
"/admin/episodes/:id/comments": {
38-
id: '/admin/episodes/:id/comments',
38+
id: 'routes/admin.episodes.$id.comments',
3939
params: {id: string | number},
4040
query: ExportedQuery<import('../app/routes/admin.episodes.$id.comments').SearchParams>,
4141
},
4242
"/admin/episodes/new": {
43-
id: '/admin/episodes/new',
43+
id: 'routes/admin.episodes.new',
4444
params: never,
4545
query: ExportedQuery<import('../app/routes/admin.episodes.new').SearchParams>,
4646
},
4747
"/api/:id.json": {
48-
id: '/api/:id.json',
48+
id: 'routes/api.$id[.]json',
4949
params: {id: string | number},
5050
query: ExportedQuery<import('../app/routes/api.$id[.]json').SearchParams>,
5151
},
5252
"/auth": {
53-
id: '/auth',
53+
id: 'routes/auth._auth',
5454
params: never,
5555
query: ExportedQuery<import('../app/routes/auth._auth').SearchParams>,
5656
},
5757
"/auth/login": {
58-
id: '/auth/login',
58+
id: 'routes/auth._auth.login',
5959
params: never,
6060
query: ExportedQuery<import('../app/routes/auth._auth.login').SearchParams>,
6161
},
6262
"/blog/rss.xml": {
63-
id: '/blog/rss.xml',
63+
id: 'routes/blog.rss[.]xml',
6464
params: never,
6565
query: ExportedQuery<import('../app/routes/blog.rss[.]xml').SearchParams>,
6666
},
6767
"/chats/:season/:episode": {
68-
id: '/chats/:season/:episode',
68+
id: 'routes/chats_.$season.$episode',
6969
params: {season: string | number; episode: string | number},
7070
query: ExportedQuery<import('../app/routes/chats_.$season.$episode').SearchParams>,
7171
},
7272
"/chats/:season/:episode/:slug": {
73-
id: '/chats/:season/:episode/:slug',
73+
id: 'routes/chats_.$season.$episode.$slug',
7474
params: {season: string | number; episode: string | number; slug: string | number},
7575
query: ExportedQuery<import('../app/routes/chats_.$season.$episode.$slug').SearchParams>,
7676
},
7777
"/credits": {
78-
id: '/credits',
78+
id: 'routes/credits',
7979
params: never,
8080
query: ExportedQuery<import('../app/routes/credits').SearchParams>,
8181
},
8282
"/home": {
83-
id: '/home',
83+
id: 'routes/(static).home',
8484
params: never,
8585
query: ExportedQuery<import('../app/routes/(static).home').SearchParams>,
8686
},
8787
"/jokes": {
88-
id: '/jokes',
88+
id: 'routes/jokes._index',
8989
params: never,
9090
query: ExportedQuery<import('../app/routes/jokes._index').SearchParams>,
9191
},
9292
"/jokes/:jokeId": {
93-
id: '/jokes/:jokeId',
93+
id: 'routes/jokes.$jokeId',
9494
params: {jokeId: string | number},
9595
query: ExportedQuery<import('../app/routes/jokes.$jokeId').SearchParams>,
9696
},
9797
"/people/:personId": {
98-
id: '/people/:personId',
98+
id: 'routes/people.$personId',
9999
params: {personId: string | number},
100100
query: ExportedQuery<import('../app/routes/people.$personId').SearchParams>,
101101
},
102102
"/people/:personId/:planId/remove-plan": {
103-
id: '/people/:personId/:planId/remove-plan',
103+
id: 'routes/people.$personId.$planId.remove-plan',
104104
params: {personId: string | number; planId: string | number},
105105
query: ExportedQuery<import('../app/routes/people.$personId.$planId.remove-plan').SearchParams>,
106106
},
107107
"/posts": {
108-
id: '/posts',
108+
id: 'routes/posts._index',
109109
params: never,
110110
query: ExportedQuery<import('../app/routes/posts._index').SearchParams>,
111111
},
112112
"/posts/:id": {
113-
id: '/posts/:id',
113+
id: 'routes/posts.$id',
114114
params: {id: string | number},
115115
query: ExportedQuery<import('../app/routes/posts.$id').SearchParams>,
116116
},
117117
"/posts/*": {
118-
id: '/posts/*',
118+
id: 'routes/posts.$',
119119
params: {"*": string | number},
120120
query: ExportedQuery<import('../app/routes/posts.$').SearchParams>,
121121
},
122122
"/posts/delete": {
123-
id: '/posts/delete',
123+
id: 'routes/posts.delete',
124124
params: never,
125125
query: ExportedQuery<import('../app/routes/posts.delete').SearchParams>,
126126
},
127127
"/s/:query": {
128-
id: '/s/:query',
128+
id: 'routes/s.$query',
129129
params: {query: string | number},
130130
query: ExportedQuery<import('../app/routes/s.$query').SearchParams>,
131131
},
132132
"/sign-in/*": {
133-
id: '/sign-in/*',
133+
id: 'routes/sign-in.$',
134134
params: {"*": string | number},
135135
query: ExportedQuery<import('../app/routes/sign-in.$').SearchParams>,
136136
},
137137
"/somewhere/cool/*": {
138-
id: '/somewhere/cool/*',
138+
id: 'catchall',
139139
params: {"*": string | number},
140140
query: ExportedQuery<import('../app/catchall').SearchParams>,
141141
},
142142
"/static/home": {
143-
id: '/static/home',
143+
id: 'routes/(static).home',
144144
params: never,
145145
query: ExportedQuery<import('../app/routes/(static).home').SearchParams>,
146146
}

0 commit comments

Comments
 (0)