Skip to content

Commit 8a8b0ce

Browse files
Goosterhofclaude
andcommitted
style: format router package with oxfmt
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 81a3620 commit 8a8b0ce

6 files changed

Lines changed: 75 additions & 202 deletions

File tree

packages/router/src/components.ts

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
import type { Ref } from "vue";
2-
import type {
3-
LocationQueryRaw,
4-
RouteLocationNormalizedLoaded,
5-
RouteRecordRaw,
6-
} from "vue-router";
2+
import type { LocationQueryRaw, RouteLocationNormalizedLoaded, RouteRecordRaw } from "vue-router";
73

84
import { computed, defineComponent, h } from "vue";
95

10-
import type {
11-
RouteName,
12-
RouterLinkComponent,
13-
RouterService,
14-
RouterViewComponent,
15-
} from "./types";
6+
import type { RouteName, RouterLinkComponent, RouterService, RouterViewComponent } from "./types";
167

17-
const buildRouteKey = (
18-
route: RouteLocationNormalizedLoaded,
19-
depth: number,
20-
): string => {
8+
const buildRouteKey = (route: RouteLocationNormalizedLoaded, depth: number): string => {
219
let key = route.matched[depth].path;
2210
for (const [paramName, paramValue] of Object.entries(route.params)) {
2311
const value = Array.isArray(paramValue) ? paramValue[0] : paramValue;
@@ -67,28 +55,12 @@ export const createRouterLink = <Routes extends RouteRecordRaw[]>(
6755
h(
6856
"a",
6957
{
70-
href: getUrlForRouteName(
71-
props.to.name,
72-
props.to.id,
73-
props.to.query,
74-
props.to.parentId,
75-
),
58+
href: getUrlForRouteName(props.to.name, props.to.id, props.to.query, props.to.parentId),
7659
onClick: (event: MouseEvent) => {
77-
if (
78-
event.metaKey ||
79-
event.ctrlKey ||
80-
event.shiftKey ||
81-
event.altKey
82-
)
83-
return;
60+
if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
8461

8562
event.preventDefault();
86-
goToRoute(
87-
props.to.name,
88-
props.to.id,
89-
props.to.query,
90-
props.to.parentId,
91-
);
63+
goToRoute(props.to.name, props.to.id, props.to.query, props.to.parentId);
9264
},
9365
},
9466
slots.default?.(),

packages/router/src/router.ts

Lines changed: 21 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
1-
import type {
2-
NavigationHookAfter,
3-
RouteLocationRaw,
4-
RouteRecordRaw,
5-
} from "vue-router";
1+
import type { NavigationHookAfter, RouteLocationRaw, RouteRecordRaw } from "vue-router";
62

73
import { computed } from "vue";
84
import { createRouter, createWebHistory } from "vue-router";
95

106
import { createRouterLink, createRouterView } from "./components";
11-
import {
12-
CREATE_PAGE_NAME,
13-
EDIT_PAGE_NAME,
14-
OVERVIEW_PAGE_NAME,
15-
SHOW_PAGE_NAME,
16-
} from "./routes";
17-
import type {
18-
BeforeRouteMiddleware,
19-
RouterService,
20-
RouterServiceOptions,
21-
} from "./types";
7+
import { CREATE_PAGE_NAME, EDIT_PAGE_NAME, OVERVIEW_PAGE_NAME, SHOW_PAGE_NAME } from "./routes";
8+
import type { BeforeRouteMiddleware, RouterService, RouterServiceOptions } from "./types";
229

2310
export const createRouterService = <Routes extends RouteRecordRaw[]>(
2411
routes: Routes,
@@ -36,9 +23,7 @@ export const createRouterService = <Routes extends RouteRecordRaw[]>(
3623
const getRoutePath = (name: string): string =>
3724
router.getRoutes().find((route) => route.name === name)?.path ?? "";
3825

39-
const resolveParentId = (
40-
overrideParentId?: number,
41-
): string | number | undefined => {
26+
const resolveParentId = (overrideParentId?: number): string | number | undefined => {
4227
if (overrideParentId) return overrideParentId;
4328

4429
// CRUD routes use single :parentId — repeatable params (:parentId+) are not supported
@@ -57,21 +42,15 @@ export const createRouterService = <Routes extends RouteRecordRaw[]>(
5742
if (parentId) params.parentId = parentId;
5843
if (id) {
5944
params.id = id;
60-
if (!params.parentId || !targetPath.includes(":id"))
61-
params.parentId = id;
45+
if (!params.parentId || !targetPath.includes(":id")) params.parentId = id;
6246
}
6347

6448
return Object.fromEntries(
6549
Object.entries(params).filter(([key]) => targetPath.includes(`:${key}`)),
6650
);
6751
};
6852

69-
const goToRoute: RouterService<Routes>["goToRoute"] = async (
70-
name,
71-
id,
72-
query,
73-
parentId,
74-
) => {
53+
const goToRoute: RouterService<Routes>["goToRoute"] = async (name, id, query, parentId) => {
7554
const route: RouteLocationRaw = { name };
7655
const params = resolveRouteParams(name as string, id, parentId);
7756

@@ -81,17 +60,17 @@ export const createRouterService = <Routes extends RouteRecordRaw[]>(
8160
await router.push(route);
8261
};
8362

84-
const normalizedRouteToSpecificRoute: RouterService<Routes>["normalizedRouteToSpecificRoute"] =
85-
(route) => {
86-
const specificRoute = flattenedRoutes.find(
87-
({ path, name }) => name === route.name || path === route.path,
88-
);
63+
const normalizedRouteToSpecificRoute: RouterService<Routes>["normalizedRouteToSpecificRoute"] = (
64+
route,
65+
) => {
66+
const specificRoute = flattenedRoutes.find(
67+
({ path, name }) => name === route.name || path === route.path,
68+
);
8969

90-
if (!specificRoute)
91-
throw new Error(`${route.path} is an unknown route`);
70+
if (!specificRoute) throw new Error(`${route.path} is an unknown route`);
9271

93-
return specificRoute;
94-
};
72+
return specificRoute;
73+
};
9574

9675
const getUrlForRouteName: RouterService<Routes>["getUrlForRouteName"] = (
9776
name,
@@ -108,17 +87,13 @@ export const createRouterService = <Routes extends RouteRecordRaw[]>(
10887
const beforeRouteMiddleware: BeforeRouteMiddleware<Routes>[] = [];
10988
router.beforeEach(async (to, from) => {
11089
const toNormalized = normalizedRouteToSpecificRoute(to);
111-
const fromNormalized = from.name
112-
? normalizedRouteToSpecificRoute(from)
113-
: toNormalized;
90+
const fromNormalized = from.name ? normalizedRouteToSpecificRoute(from) : toNormalized;
11491

11592
for (const middleware of beforeRouteMiddleware)
11693
if (await middleware(toNormalized, fromNormalized)) return false;
11794
});
11895

119-
const afterRouteMiddleware: NavigationHookAfter[] = [
120-
...(options?.afterRouteCallbacks ?? []),
121-
];
96+
const afterRouteMiddleware: NavigationHookAfter[] = [...(options?.afterRouteCallbacks ?? [])];
12297
router.afterEach((to, from, failure) => {
12398
for (const middleware of afterRouteMiddleware) middleware(to, from, failure);
12499
});
@@ -133,9 +108,7 @@ export const createRouterService = <Routes extends RouteRecordRaw[]>(
133108
};
134109

135110
const fullPath =
136-
(options?.base
137-
? location.pathname.replace(options.base, "")
138-
: location.pathname) +
111+
(options?.base ? location.pathname.replace(options.base, "") : location.pathname) +
139112
location.search +
140113
location.hash;
141114

@@ -147,8 +120,7 @@ export const createRouterService = <Routes extends RouteRecordRaw[]>(
147120
goToCreatePage: (name) => goToRoute(`${name}${CREATE_PAGE_NAME}`),
148121
goToOverviewPage: (name) => goToRoute(`${name}${OVERVIEW_PAGE_NAME}`),
149122
goToEditPage: (name, id) => goToRoute(`${name}${EDIT_PAGE_NAME}`, id),
150-
goToShowPage: (name, id, query) =>
151-
goToRoute(`${name}${SHOW_PAGE_NAME}`, id, query),
123+
goToShowPage: (name, id, query) => goToRoute(`${name}${SHOW_PAGE_NAME}`, id, query),
152124

153125
getUrlForRouteName,
154126
goBack: () => router.back(),
@@ -194,11 +166,9 @@ export const createRouterService = <Routes extends RouteRecordRaw[]>(
194166
changeRouteQuery: (query) => void router.push({ query }),
195167

196168
onPage,
197-
onCreatePage: (baseRouteName) =>
198-
onPage(baseRouteName + CREATE_PAGE_NAME),
169+
onCreatePage: (baseRouteName) => onPage(baseRouteName + CREATE_PAGE_NAME),
199170
onEditPage: (baseRouteName) => onPage(baseRouteName + EDIT_PAGE_NAME),
200-
onOverviewPage: (baseRouteName) =>
201-
onPage(baseRouteName + OVERVIEW_PAGE_NAME),
171+
onOverviewPage: (baseRouteName) => onPage(baseRouteName + OVERVIEW_PAGE_NAME),
202172
onShowPage: (baseRouteName) => onPage(baseRouteName + SHOW_PAGE_NAME),
203173
routeExists: (to) => {
204174
try {

packages/router/src/routes.ts

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,14 @@ export const createStandardRouteConfig = <
2525
meta: Meta = {} as Meta,
2626
): C extends undefined ? undefined : CrudRoute<P, T, NonNullable<C>, Meta> => {
2727
if (!component)
28-
return undefined as C extends undefined
29-
? undefined
30-
: CrudRoute<P, T, NonNullable<C>, Meta>;
28+
return undefined as C extends undefined ? undefined : CrudRoute<P, T, NonNullable<C>, Meta>;
3129

3230
return {
3331
path,
3432
name,
3533
component,
3634
meta,
37-
} as C extends undefined
38-
? undefined
39-
: CrudRoute<P, T, NonNullable<C>, Meta>;
35+
} as C extends undefined ? undefined : CrudRoute<P, T, NonNullable<C>, Meta>;
4036
};
4137

4238
export const createCrudRoutes = <
@@ -57,14 +53,7 @@ export const createCrudRoutes = <
5753
show: ShowComponent;
5854
},
5955
meta: Meta = {} as Meta,
60-
): ParentCrudRoute<
61-
N,
62-
Meta,
63-
OverviewComponent,
64-
CreateComponent,
65-
EditComponent,
66-
ShowComponent
67-
> => {
56+
): ParentCrudRoute<N, Meta, OverviewComponent, CreateComponent, EditComponent, ShowComponent> => {
6857
// @ts-expect-error FilterUndefined is a compile-time tuple filter, but .filter() produces a generic array
6958
const children: ParentCrudRoute<
7059
N,
@@ -92,12 +81,7 @@ export const createCrudRoutes = <
9281
components.edit,
9382
meta,
9483
),
95-
createStandardRouteConfig(
96-
":id",
97-
`${baseRouteName}${SHOW_PAGE_NAME}`,
98-
components.show,
99-
meta,
100-
),
84+
createStandardRouteConfig(":id", `${baseRouteName}${SHOW_PAGE_NAME}`, components.show, meta),
10185
].filter((route) => route !== undefined);
10286

10387
return {
@@ -160,12 +144,7 @@ export const createNestedCrudRoutes = <
160144
components.edit,
161145
meta,
162146
),
163-
createStandardRouteConfig(
164-
":id",
165-
`${baseRouteName}${SHOW_PAGE_NAME}`,
166-
components.show,
167-
meta,
168-
),
147+
createStandardRouteConfig(":id", `${baseRouteName}${SHOW_PAGE_NAME}`, components.show, meta),
169148
].filter((route) => route !== undefined);
170149

171150
return {

0 commit comments

Comments
 (0)