Skip to content

Commit 88aa1ea

Browse files
committed
fix: remove unused Meta type param from RouteRecordInfo
1 parent 86864b4 commit 88aa1ea

File tree

4 files changed

+9
-24
lines changed

4 files changed

+9
-24
lines changed

packages/router/__tests__/routeLocation.test-d.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import type {
44
ParamValue,
55
ParamValueZeroOrMore,
66
RouteRecordInfo,
7-
RouteMeta,
87
RouteLocationNormalizedTypedList,
98
} from '../src'
109

@@ -17,47 +16,41 @@ type RouteNamedMap = {
1716
'/:other',
1817
{ other: ParamValue<true> },
1918
{ other: ParamValue<false> },
20-
RouteMeta,
2119
never
2220
>
2321
'/groups/[gid]': RouteRecordInfo<
2422
'/groups/[gid]',
2523
'/:gid',
2624
{ gid: ParamValue<true> },
2725
{ gid: ParamValue<false> },
28-
RouteMeta,
2926
'/groups/[gid]/users' | '/groups/[gid]/users/[uid]'
3027
>
3128
'/groups/[gid]/users': RouteRecordInfo<
3229
'/groups/[gid]/users',
3330
'/:gid/users',
3431
{ gid: ParamValue<true> },
3532
{ gid: ParamValue<false> },
36-
RouteMeta,
3733
'/groups/[gid]/users/[uid]'
3834
>
3935
'/groups/[gid]/users/[uid]': RouteRecordInfo<
4036
'/groups/[gid]/users/[uid]',
4137
'/:gid/users/:uid',
4238
{ gid: ParamValue<true>; uid: ParamValue<true> },
4339
{ gid: ParamValue<false>; uid: ParamValue<false> },
44-
RouteMeta,
4540
never
4641
>
4742
'/[...path]': RouteRecordInfo<
4843
'/[...path]',
4944
'/:path(.*)',
5045
{ path: ParamValue<true> },
5146
{ path: ParamValue<false> },
52-
RouteMeta,
5347
never
5448
>
5549
'/deep/nesting/works/[[files]]+': RouteRecordInfo<
5650
'/deep/nesting/works/[[files]]+',
5751
'/deep/nesting/works/:files*',
5852
{ files?: ParamValueZeroOrMore<true> },
5953
{ files?: ParamValueZeroOrMore<false> },
60-
RouteMeta,
6154
never
6255
>
6356
}

packages/router/src/typed-routes/route-map.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import type { TypesConfig } from '../config'
2-
import type {
3-
RouteMeta,
4-
RouteParamsGeneric,
5-
RouteParamsRawGeneric,
6-
} from '../types'
2+
import type { RouteParamsGeneric, RouteParamsRawGeneric } from '../types'
73
import type { RouteRecord } from '../matcher/types'
84

95
/**
@@ -17,24 +13,27 @@ export interface RouteRecordInfo<
1713
// TODO: could probably be inferred from the Params
1814
ParamsRaw extends RouteParamsRawGeneric = RouteParamsRawGeneric,
1915
Params extends RouteParamsGeneric = RouteParamsGeneric,
20-
Meta extends RouteMeta = RouteMeta,
16+
// NOTE: this is the only type param that feels wrong because its default
17+
// value is the default value to avoid breaking changes but it should be the
18+
// generic version by default instead (string | symbol)
2119
ChildrenNames extends string | symbol = never,
20+
// TODO: implement meta with a defineRoute macro
21+
// Meta extends RouteMeta = RouteMeta,
2222
> {
2323
name: Name
2424
path: Path
2525
paramsRaw: ParamsRaw
2626
params: Params
27-
// TODO: implement meta with a defineRoute macro
28-
meta: Meta
2927
childrenNames: ChildrenNames
28+
// TODO: implement meta with a defineRoute macro
29+
// meta: Meta
3030
}
3131

3232
export type RouteRecordInfoGeneric = RouteRecordInfo<
3333
string | symbol,
3434
string,
3535
RouteParamsRawGeneric,
3636
RouteParamsGeneric,
37-
RouteMeta,
3837
string | symbol
3938
>
4039

packages/router/src/types/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ export interface _RouteRecordBase extends PathParserOptions {
257257
* }
258258
* ```
259259
*/
260-
export interface RouteMeta extends Record<string | number | symbol, unknown> {}
260+
export interface RouteMeta extends Record<PropertyKey, unknown> {}
261261

262262
/**
263263
* Route Record defining one single component with the `component` option.

packages/router/test-dts/typed-routes.test-d.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {
44
type ParamValue,
55
type ParamValueOneOrMore,
66
type RouteLocationTyped,
7-
type RouteMeta,
87
createRouter,
98
createWebHistory,
109
useRoute,
@@ -19,47 +18,41 @@ export type RouteMap = {
1918
'/:path(.*)',
2019
{ path: ParamValue<true> },
2120
{ path: ParamValue<false> },
22-
RouteMeta,
2321
never
2422
>
2523
'/[a]': RouteRecordInfo<
2624
'/[a]',
2725
'/:a',
2826
{ a: ParamValue<true> },
2927
{ a: ParamValue<false> },
30-
RouteMeta,
3128
never
3229
>
3330
'/a': RouteRecordInfo<
3431
'/a',
3532
'/a',
3633
Record<never, never>,
3734
Record<never, never>,
38-
RouteMeta,
3935
'/a/b' | '/a/b/c'
4036
>
4137
'/a/b': RouteRecordInfo<
4238
'/a/b',
4339
'/a/b',
4440
Record<never, never>,
4541
Record<never, never>,
46-
RouteMeta,
4742
'/a/b/c'
4843
>
4944
'/a/b/c': RouteRecordInfo<
5045
'/a/b/c',
5146
'/a/b/c',
5247
Record<never, never>,
5348
Record<never, never>,
54-
RouteMeta,
5549
never
5650
>
5751
'/[id]+': RouteRecordInfo<
5852
'/[id]+',
5953
'/:id+',
6054
{ id: ParamValueOneOrMore<true> },
6155
{ id: ParamValueOneOrMore<false> },
62-
RouteMeta,
6356
never
6457
>
6558
}

0 commit comments

Comments
 (0)