@ivlev-dev/silent-router 0.10.1 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +173 -114
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/link.d.ts +2 -2
- package/dist/link.d.ts.map +1 -1
- package/dist/link.js +9 -2
- package/dist/link.js.map +1 -1
- package/dist/match.d.ts.map +1 -1
- package/dist/match.js +5 -1
- package/dist/match.js.map +1 -1
- package/dist/route.d.ts +57 -0
- package/dist/route.d.ts.map +1 -0
- package/dist/route.js +57 -0
- package/dist/route.js.map +1 -0
- package/dist/router-view.d.ts +5 -10
- package/dist/router-view.d.ts.map +1 -1
- package/dist/router-view.js +28 -8
- package/dist/router-view.js.map +1 -1
- package/dist/router.d.ts +26 -3
- package/dist/router.d.ts.map +1 -1
- package/dist/router.js +24 -2
- package/dist/router.js.map +1 -1
- package/package.json +5 -3
package/README.md
CHANGED
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
# @ivlev-dev/silent-router
|
|
2
2
|
|
|
3
|
-
Роутер Silent Framework:
|
|
3
|
+
Роутер Silent Framework: интерфейс `IRouter`, route-классы с типизированными параметрами, вложенные маршруты, guards, ленивые компоненты, DI-доставка, восстановление скролла и SSR через `MemoryHistory`.
|
|
4
4
|
|
|
5
5
|
[](https://www.npmjs.com/package/@ivlev-dev/silent-router) [](https://github.com/ivlev-dev/silent-framework/blob/main/LICENSE) [](https://www.npmjs.com/package/@ivlev-dev/silent-router)
|
|
6
6
|
|
|
7
7
|
## Возможности
|
|
8
8
|
|
|
9
|
-
- `
|
|
10
|
-
-
|
|
11
|
-
- `
|
|
12
|
-
-
|
|
13
|
-
- `Link`
|
|
14
|
-
- `RouterView`
|
|
9
|
+
- `IRouter` и `Router implements IRouter`; ViewModel получает роутер через `constructor(private readonly router: IRouter)`.
|
|
10
|
+
- Route-классы с типизированными `PathParams<"/edit/{id}">` и generic-query.
|
|
11
|
+
- Синтаксис `/edit/{id}` и совместимый `:id`, вложенные маршруты, `*`, index-маршруты.
|
|
12
|
+
- `redirect`, синхронные и асинхронные `beforeEnter`, ленивый `load(context)` с кешированием.
|
|
13
|
+
- `Link` и `RouterView` получают роутер из DI-контекста синхронно, с fallback на prop и `Router.current()`.
|
|
14
|
+
- `RouterView` монтирует route-компоненты через core `component(...)`, поэтому ViewModel/DI работают.
|
|
15
15
|
- `BrowserHistory` (`pushState`, `popstate`, `hashchange`) и `MemoryHistory` для тестов и SSR.
|
|
16
16
|
- Восстановление скролла: `scrollBehavior(to, from, savedPosition)`.
|
|
17
|
-
- Несколько приложений на странице: `Router.current()` и явный проп `router` у компонентов.
|
|
18
17
|
|
|
19
18
|
## Установка
|
|
20
19
|
|
|
@@ -30,33 +29,50 @@ npm install @ivlev-dev/silent-router
|
|
|
30
29
|
yarn add @ivlev-dev/silent-router
|
|
31
30
|
```
|
|
32
31
|
|
|
33
|
-
`@ivlev-dev/silent-core` и `@ivlev-dev/silent-reactivity` устанавливаются как зависимости пакета. Пакет поставляется только как ESM. Требуется Node.js 22 или новее.
|
|
32
|
+
`@ivlev-dev/silent-core`, `@ivlev-dev/silent-di` и `@ivlev-dev/silent-reactivity` устанавливаются как зависимости пакета. Пакет поставляется только как ESM. Требуется Node.js 22 или новее.
|
|
34
33
|
|
|
35
34
|
## Быстрый старт
|
|
36
35
|
|
|
37
36
|
```tsx
|
|
38
|
-
import {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
37
|
+
import {
|
|
38
|
+
Route,
|
|
39
|
+
Router,
|
|
40
|
+
RouterView,
|
|
41
|
+
Link,
|
|
42
|
+
type RouteViewProps,
|
|
43
|
+
} from "@ivlev-dev/silent-router";
|
|
44
|
+
|
|
45
|
+
class HomeRoute extends Route {
|
|
46
|
+
readonly path = "/";
|
|
47
|
+
readonly name = "home";
|
|
48
|
+
readonly component = Home;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
class UsersRoute extends Route {
|
|
52
|
+
readonly path = "/users";
|
|
53
|
+
readonly name = "users";
|
|
54
|
+
readonly component = UsersLayout;
|
|
55
|
+
readonly children = [UsersIndexRoute, UserRoute];
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
class UserRoute extends Route<"{id}", { tab?: "info" | "profile" }> {
|
|
59
|
+
readonly path = "{id}";
|
|
60
|
+
readonly name = "user";
|
|
61
|
+
readonly component = UserView;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
function UserView(props: RouteViewProps<"{id}", { tab?: "info" | "profile" }>) {
|
|
65
|
+
return (
|
|
66
|
+
<section>
|
|
67
|
+
<h1>{props.params.id}</h1>
|
|
68
|
+
<p>{props.query.tab ?? "info"}</p>
|
|
69
|
+
</section>
|
|
70
|
+
);
|
|
71
|
+
}
|
|
42
72
|
|
|
43
73
|
export const router = new Router({
|
|
44
74
|
base: "/app",
|
|
45
|
-
routes: [
|
|
46
|
-
{ path: "/", name: "home", component: Home },
|
|
47
|
-
{
|
|
48
|
-
path: "/users",
|
|
49
|
-
name: "users",
|
|
50
|
-
component: Users,
|
|
51
|
-
children: [
|
|
52
|
-
{ path: "", name: "users-index", component: UsersIndex },
|
|
53
|
-
{ path: ":id", name: "user", component: User },
|
|
54
|
-
{ path: ":id/posts/:postId", name: "post", component: Post },
|
|
55
|
-
],
|
|
56
|
-
},
|
|
57
|
-
{ path: "/files/*", name: "files", component: Files },
|
|
58
|
-
{ path: "/old", redirect: "/" },
|
|
59
|
-
],
|
|
75
|
+
routes: [HomeRoute, UsersRoute],
|
|
60
76
|
});
|
|
61
77
|
|
|
62
78
|
await router.start();
|
|
@@ -66,7 +82,6 @@ export function App() {
|
|
|
66
82
|
<nav>
|
|
67
83
|
<Link to="/" activeClass="active" exactActiveClass="exact">Главная</Link>
|
|
68
84
|
<Link to={{ name: "users" }} activeClass="active">Пользователи</Link>
|
|
69
|
-
<Link to="/files/docs/readme.md">Файлы</Link>
|
|
70
85
|
</nav>
|
|
71
86
|
<main>
|
|
72
87
|
<RouterView fallback={<p>Загрузка…</p>} />
|
|
@@ -75,52 +90,96 @@ export function App() {
|
|
|
75
90
|
}
|
|
76
91
|
```
|
|
77
92
|
|
|
78
|
-
`
|
|
93
|
+
## `IRouter` и DI
|
|
79
94
|
|
|
80
|
-
```
|
|
81
|
-
|
|
82
|
-
|
|
95
|
+
```ts
|
|
96
|
+
import type { IRouter } from "@ivlev-dev/silent-router";
|
|
97
|
+
|
|
98
|
+
export class PageVM {
|
|
99
|
+
constructor(private readonly router: IRouter) {}
|
|
100
|
+
|
|
101
|
+
open(): Promise<void> {
|
|
102
|
+
return this.router.push({ name: "user", params: { id: 42 } });
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
```
|
|
106
|
+
|
|
107
|
+
`IRouter` содержит `base`, `state()`, `route`, `params`, `query`, `hash`, `matched`, `resolve`, `href`, `push`, `replace`, `back`, `forward`, `start`, `stop`, `dispose`. В рантайме `IRouter` — value-токен, совпадающий с `Router`, поэтому компилятор DI подставляет его как единственную реализацию.
|
|
108
|
+
|
|
109
|
+
Зарегистрируйте роутер в контейнере:
|
|
110
|
+
|
|
111
|
+
```ts
|
|
112
|
+
import { container } from "@ivlev-dev/silent-di";
|
|
113
|
+
|
|
114
|
+
const router = new Router({ routes, container });
|
|
83
115
|
```
|
|
84
116
|
|
|
85
|
-
|
|
117
|
+
Или явно:
|
|
118
|
+
|
|
119
|
+
```ts
|
|
120
|
+
const router = new Router({ routes });
|
|
121
|
+
router.provide(container);
|
|
122
|
+
```
|
|
123
|
+
|
|
124
|
+
`provide` вызывает `container.bindValue(Router, router)`, поэтому `container.peek(Router)` работает синхронно сразу после регистрации. `container.bind(Router, router)` также поддерживается, но синхронный `peek` увидит значение только после `await container.resolve(Router)`.
|
|
125
|
+
|
|
126
|
+
Порядок поиска роутера в `Link` и `RouterView`:
|
|
127
|
+
|
|
128
|
+
1. явный `router` prop;
|
|
129
|
+
2. `getRuntimeOptions().container.peek(Router)`;
|
|
130
|
+
3. `Router.current()`.
|
|
131
|
+
|
|
132
|
+
`Link` не использует асинхронный `resolve`.
|
|
86
133
|
|
|
87
|
-
##
|
|
134
|
+
## Route-классы
|
|
135
|
+
|
|
136
|
+
```ts
|
|
137
|
+
import { Route, type RouteLoadContext } from "@ivlev-dev/silent-router";
|
|
138
|
+
|
|
139
|
+
class AdminRoute extends Route {
|
|
140
|
+
readonly path = "/admin";
|
|
141
|
+
readonly name = "admin";
|
|
142
|
+
readonly component = AdminLayout;
|
|
143
|
+
readonly children = [AdminIndexRoute, AdminUserRoute];
|
|
144
|
+
readonly meta = { requiresAuth: true };
|
|
145
|
+
readonly beforeEnter = async (to: RouteLocation, from: RouteLocation | null, signal: AbortSignal) => {
|
|
146
|
+
if (signal.aborted) return false;
|
|
147
|
+
return (await checkSession()) ? true : "/login";
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
class AdminUserRoute extends Route<"users/{id}"> {
|
|
152
|
+
readonly path = "users/{id}";
|
|
153
|
+
readonly name = "admin-user";
|
|
154
|
+
async load(context: RouteLoadContext<"users/{id}">) {
|
|
155
|
+
const module = await import("./admin-user");
|
|
156
|
+
return module.AdminUser;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
```
|
|
160
|
+
|
|
161
|
+
`RouterOptions.routes` принимает route-классы, их экземпляры и старые object-routes. Классы инстанцируются роутером.
|
|
162
|
+
|
|
163
|
+
`Route` поддерживает `path`, `name`, `component`, `children`, `redirect`, `meta`, `beforeEnter`, `load`.
|
|
164
|
+
|
|
165
|
+
- `{id}` и `:id` — параметрические сегменты. `PathParams<"/users/{id}">` даёт `{ readonly id: string }`.
|
|
166
|
+
- `Query` — generic-форма query для `RouteViewProps` и `RouteLoadContext`.
|
|
167
|
+
- `load(context)` получает `route`, `params`, `query`, `hash`, `router`, `signal`; можно вернуть компонент или модуль с `default`. Компонент кешируется.
|
|
168
|
+
- `beforeEnter` возвращает `true`, `false`, путь/объект маршрута или `Promise` с этим значением.
|
|
169
|
+
- `redirect` — строка, объект маршрута или функция `(to) => target`.
|
|
170
|
+
- `meta` не интерпретируется роутером и доступен через `matched[i].record.meta`.
|
|
171
|
+
|
|
172
|
+
Object-routes остаются для совместимости:
|
|
88
173
|
|
|
89
174
|
```ts
|
|
90
175
|
import type { RouteRecord } from "@ivlev-dev/silent-router";
|
|
91
176
|
|
|
92
177
|
const routes: RouteRecord[] = [
|
|
93
|
-
{
|
|
94
|
-
|
|
95
|
-
name: "admin",
|
|
96
|
-
component: AdminLayout,
|
|
97
|
-
meta: { requiresAuth: true },
|
|
98
|
-
beforeEnter: async (to, from, signal) => {
|
|
99
|
-
const allowed = await checkSession(signal);
|
|
100
|
-
return allowed ? true : "/login";
|
|
101
|
-
},
|
|
102
|
-
children: [
|
|
103
|
-
{ path: "", name: "admin-index", component: AdminIndex },
|
|
104
|
-
{
|
|
105
|
-
path: "users/:id",
|
|
106
|
-
name: "admin-user",
|
|
107
|
-
load: async () => {
|
|
108
|
-
const module = await import("./admin-user");
|
|
109
|
-
return module.AdminUser;
|
|
110
|
-
},
|
|
111
|
-
},
|
|
112
|
-
],
|
|
113
|
-
},
|
|
178
|
+
{ path: "/", name: "home", component: Home },
|
|
179
|
+
{ path: "/users/:id", name: "user", component: User },
|
|
114
180
|
];
|
|
115
181
|
```
|
|
116
182
|
|
|
117
|
-
- `path` поддерживает `:param`, `*` (хвост попадает в `params["*"]`) и `""` для index-маршрута.
|
|
118
|
-
- При совпадении нескольких записей побеждает более специфичная: статический сегмент важнее `:param`, `:param` важнее `*`, вложенная цепочка важнее одиночного маршрута.
|
|
119
|
-
- `load` возвращает компонент или модуль с `default`; загруженный компонент кешируется.
|
|
120
|
-
- `beforeEnter` может вернуть `true`, `false`, путь/объект маршрута или `Promise` с этим значением.
|
|
121
|
-
- `redirect` может быть строкой, объектом маршрута или функцией `(to) => target`.
|
|
122
|
-
- `meta` не интерпретируется роутером и доступен через `matched[i].record.meta`.
|
|
123
|
-
|
|
124
183
|
## Навигация и состояние
|
|
125
184
|
|
|
126
185
|
```ts
|
|
@@ -129,59 +188,54 @@ await router.replace({ name: "users" });
|
|
|
129
188
|
router.back();
|
|
130
189
|
router.forward();
|
|
131
190
|
|
|
132
|
-
router.route;
|
|
133
|
-
router.params;
|
|
134
|
-
router.query;
|
|
135
|
-
router.hash;
|
|
136
|
-
router.matched;
|
|
137
|
-
|
|
138
|
-
router.state(); // Accessor<RouterState> — читайте в JSX/эффекте для реактивности
|
|
191
|
+
router.route;
|
|
192
|
+
router.params;
|
|
193
|
+
router.query;
|
|
194
|
+
router.hash;
|
|
195
|
+
router.matched;
|
|
196
|
+
router.state();
|
|
139
197
|
```
|
|
140
198
|
|
|
141
199
|
`RouterState` содержит `route`, `params`, `query`, `hash`, `matched`, `pending` и `error`. Во время навигации `pending` равен `true`; ошибка сохраняется в `error`, а промис `push`/`replace` отклоняется.
|
|
142
200
|
|
|
143
|
-
`resolve(to)` возвращает `RouteLocation` без навигации:
|
|
144
|
-
|
|
145
201
|
```ts
|
|
146
|
-
const location = router.resolve({
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
202
|
+
const location = router.resolve({
|
|
203
|
+
name: "user",
|
|
204
|
+
params: { id: 42 },
|
|
205
|
+
query: { tab: "info" },
|
|
206
|
+
});
|
|
150
207
|
|
|
151
|
-
|
|
208
|
+
location.fullPath;
|
|
209
|
+
location.matched;
|
|
152
210
|
|
|
153
|
-
|
|
154
|
-
router.href("/users/42"); // "/app/users/42"
|
|
211
|
+
router.href("/users/42");
|
|
155
212
|
```
|
|
156
213
|
|
|
157
214
|
## Guards, загрузчики и отмена
|
|
158
215
|
|
|
159
216
|
```ts
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
},
|
|
178
|
-
],
|
|
179
|
-
});
|
|
217
|
+
class PrivateRoute extends Route {
|
|
218
|
+
readonly path = "/private";
|
|
219
|
+
readonly component = Private;
|
|
220
|
+
readonly beforeEnter = async (to: RouteLocation, from: RouteLocation | null, signal: AbortSignal) => {
|
|
221
|
+
if (signal.aborted) return false;
|
|
222
|
+
return (await isAuthorized()) ? true : { name: "login" };
|
|
223
|
+
};
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
class ReportRoute extends Route {
|
|
227
|
+
readonly path = "/report";
|
|
228
|
+
async load(context: RouteLoadContext<"/report">) {
|
|
229
|
+
if (context.signal.aborted) throw new Error("aborted");
|
|
230
|
+
const module = await import("./report");
|
|
231
|
+
return module.Report;
|
|
232
|
+
}
|
|
233
|
+
}
|
|
180
234
|
```
|
|
181
235
|
|
|
182
236
|
Новая навигация вызывает `AbortController.abort()` у предыдущей. Устаревшая навигация завершается без обновления состояния и без отклонения промиса. Если guard вернул `false`, навигация отменяется, а текущий маршрут остаётся прежним.
|
|
183
237
|
|
|
184
|
-
Ошибки guard и загрузчика оборачиваются в `RouterNavigationError` с `code: "guard" | "load"`. Отсутствие
|
|
238
|
+
Ошибки guard и загрузчика оборачиваются в `RouterNavigationError` с `code: "guard" | "load"`. Отсутствие роутера у компонента даёт `RouterMissingError`. Прерванная навигация использует `RouterAbortError`.
|
|
185
239
|
|
|
186
240
|
```ts
|
|
187
241
|
import { RouterNavigationError } from "@ivlev-dev/silent-router";
|
|
@@ -200,8 +254,7 @@ try {
|
|
|
200
254
|
`RouterView` рендерит компонент из `matched[depth]`:
|
|
201
255
|
|
|
202
256
|
```tsx
|
|
203
|
-
|
|
204
|
-
export function AdminLayout(props: RouterViewComponentProps) {
|
|
257
|
+
export function AdminLayout(props: RouteViewProps) {
|
|
205
258
|
return (
|
|
206
259
|
<section>
|
|
207
260
|
<h1>Админка</h1>
|
|
@@ -211,7 +264,7 @@ export function AdminLayout(props: RouterViewComponentProps) {
|
|
|
211
264
|
}
|
|
212
265
|
```
|
|
213
266
|
|
|
214
|
-
|
|
267
|
+
Route-компонент получает `RouteViewProps`: `route`, `params`, `query`, `hash`, `router`. `RouterView` монтирует его через core `component(...)`, поэтому ViewModel с DI работает и на клиенте, и на сервере.
|
|
215
268
|
|
|
216
269
|
## История и SSR
|
|
217
270
|
|
|
@@ -222,22 +275,28 @@ import { Router, createMemoryHistory } from "@ivlev-dev/silent-router";
|
|
|
222
275
|
|
|
223
276
|
export function createServerRouter() {
|
|
224
277
|
return new Router({
|
|
225
|
-
routes,
|
|
278
|
+
routes: [HomeRoute, UsersRoute, UserRoute],
|
|
226
279
|
history: createMemoryHistory("/users/42?tab=info"),
|
|
280
|
+
container: appScope,
|
|
227
281
|
});
|
|
228
282
|
}
|
|
229
283
|
|
|
230
284
|
const router = createServerRouter();
|
|
231
|
-
await router.start();
|
|
232
|
-
const html = await renderToString(
|
|
285
|
+
await router.start();
|
|
286
|
+
const { html } = await renderToString(App, { container: appScope });
|
|
233
287
|
```
|
|
234
288
|
|
|
235
|
-
На клиенте используйте `BrowserHistory` и тот же набор
|
|
289
|
+
На клиенте используйте `BrowserHistory` и тот же набор route-классов:
|
|
236
290
|
|
|
237
291
|
```ts
|
|
238
292
|
import { Router, createBrowserHistory } from "@ivlev-dev/silent-router";
|
|
239
293
|
|
|
240
|
-
const router = new Router({
|
|
294
|
+
const router = new Router({
|
|
295
|
+
routes: [HomeRoute, UsersRoute, UserRoute],
|
|
296
|
+
history: createBrowserHistory(window),
|
|
297
|
+
container,
|
|
298
|
+
});
|
|
299
|
+
|
|
241
300
|
await router.start();
|
|
242
301
|
```
|
|
243
302
|
|
|
@@ -262,18 +321,18 @@ const router = new Router({
|
|
|
262
321
|
|
|
263
322
|
```ts
|
|
264
323
|
const router = new Router({ routes });
|
|
265
|
-
router.start();
|
|
266
|
-
router.stop();
|
|
267
|
-
router.dispose();
|
|
324
|
+
router.start();
|
|
325
|
+
router.stop();
|
|
326
|
+
router.dispose();
|
|
268
327
|
```
|
|
269
328
|
|
|
270
329
|
`stop()` можно вызывать и вызывать `start()` повторно. `dispose()` не освобождает историю, переданную пользователем: её нужно закрыть самостоятельно.
|
|
271
330
|
|
|
272
331
|
## Публичный API
|
|
273
332
|
|
|
274
|
-
- Классы: `Router`, `BrowserHistory`, `MemoryHistory`, `RouterMissingError`, `RouterNavigationError`, `RouterAbortError`.
|
|
333
|
+
- Классы: `Router`, `Route`, `BrowserHistory`, `MemoryHistory`, `RouterMissingError`, `RouterNavigationError`, `RouterAbortError`.
|
|
334
|
+
- Интерфейсы и типы: `IRouter`, `RouterOptions`, `RouterState`, `RouteClass`, `RouteDefinition`, `RouteInput`, `RouteViewProps`, `RouteLoadContext`, `RouteClassGuard`, `RouteClassLoad`, `RouteComponent`, `PathParams`, `TypedRouteLocation`, `RouteQueryShape`, `RouteRecord`, `RouteLocation`, `MatchedRoute`, `RouteParams`, `RouteQuery`, `RouteTarget`, `RouteGuard`, `RouteLoader`, `RouteRedirect`, `ScrollBehavior`, `ScrollPosition`, `RouterHistory`, `HistoryLocation`, `LinkProps`, `RouterViewProps`, `RouterViewComponentProps`.
|
|
275
335
|
- Компоненты: `Link`, `RouterView`.
|
|
276
336
|
- Функции создания истории: `createBrowserHistory`, `createMemoryHistory`.
|
|
277
|
-
- Типы: `RouterOptions`, `RouterState`, `RouteRecord`, `RouteLocation`, `MatchedRoute`, `RouteParams`, `RouteQuery`, `RouteTarget`, `RouteGuard`, `RouteLoader`, `RouteRedirect`, `ScrollBehavior`, `ScrollPosition`, `RouterHistory`, `HistoryLocation`, `LinkProps`, `RouterViewProps`, `RouterViewComponentProps` и связанные результаты guard/loader.
|
|
278
337
|
|
|
279
|
-
Публичных hooks (`useRouter`, `useRoute`, `useParams`) нет: состояние доступно через
|
|
338
|
+
Публичных hooks (`useRouter`, `useRoute`, `useParams`) нет: состояние доступно через `IRouter` и `RouteViewProps`.
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
export { Router, type RouterOptions, type RouterState } from "./router.js";
|
|
1
|
+
export { Router, IRouter, type RouterOptions, type RouterState } from "./router.js";
|
|
2
|
+
export { Route, type AnyRouteGuard, type AnyRouteLoader, type PathParams, type RouteClass, type RouteClassGuard, type RouteClassLoad, type RouteComponent, type RouteDefinition, type RouteInput, type RouteLoadContext, type RouteQueryShape, type RouteViewProps, type TypedRouteLocation, } from "./route.js";
|
|
2
3
|
export { BrowserHistory, MemoryHistory, createBrowserHistory, createMemoryHistory, type HistoryListener, type HistoryLocation, type RouterHistory, } from "./history.js";
|
|
3
4
|
export { RouterAbortError, RouterMissingError, RouterNavigationError, type MatchedRoute, type QueryInput, type RouteGuard, type RouteGuardResult, type RouteLoader, type RouteLoaderResult, type RouteLocation, type RouteLocationTargetObject, type RouteMeta, type RouteParams, type RouteQuery, type RouteQueryValue, type RouteRecord, type RouteRedirect, type RouteTarget, type RouterErrorCode, type ScrollBehavior, type ScrollBehaviorResult, type ScrollPosition, } from "./match.js";
|
|
4
5
|
export { Link, type LinkProps } from "./link.js";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,EACL,KAAK,EACL,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,kBAAkB,GACxB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,cAAc,EACd,aAAa,EACb,oBAAoB,EACpB,mBAAmB,EACnB,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,aAAa,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,yBAAyB,EAC9B,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,cAAc,GACpB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,IAAI,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EACL,UAAU,EACV,KAAK,wBAAwB,EAC7B,KAAK,eAAe,GACrB,MAAM,kBAAkB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
export { Router } from "./router.js";
|
|
1
|
+
export { Router, IRouter } from "./router.js";
|
|
2
|
+
export { Route, } from "./route.js";
|
|
2
3
|
export { BrowserHistory, MemoryHistory, createBrowserHistory, createMemoryHistory, } from "./history.js";
|
|
3
4
|
export { RouterAbortError, RouterMissingError, RouterNavigationError, } from "./match.js";
|
|
4
5
|
export { Link } from "./link.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAwC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAwC,MAAM,aAAa,CAAC;AACpF,OAAO,EACL,KAAK,GAcN,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,cAAc,EACd,aAAa,EACb,oBAAoB,EACpB,mBAAmB,GAIpB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,GAoBtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,IAAI,EAAkB,MAAM,WAAW,CAAC;AACjD,OAAO,EACL,UAAU,GAGX,MAAM,kBAAkB,CAAC"}
|
package/dist/link.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Children, type ClassNameValue } from "@ivlev-dev/silent-core";
|
|
2
2
|
import { type RouteTarget } from "./match.js";
|
|
3
|
-
import {
|
|
3
|
+
import { type IRouter } from "./router.js";
|
|
4
4
|
export interface LinkProps {
|
|
5
5
|
readonly to: RouteTarget | (() => RouteTarget);
|
|
6
6
|
readonly replace?: boolean;
|
|
@@ -8,7 +8,7 @@ export interface LinkProps {
|
|
|
8
8
|
readonly exactActiveClass?: string;
|
|
9
9
|
readonly class?: ClassNameValue;
|
|
10
10
|
readonly children?: Children;
|
|
11
|
-
readonly router?:
|
|
11
|
+
readonly router?: IRouter;
|
|
12
12
|
}
|
|
13
13
|
export declare function Link(props: LinkProps): Node;
|
|
14
14
|
//# sourceMappingURL=link.d.ts.map
|
package/dist/link.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../src/link.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../src/link.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,QAAQ,EACb,KAAK,cAAc,EACpB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAoC,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAU,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,EAAE,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC;IAC/C,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC3B;AAiCD,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAiE3C"}
|
package/dist/link.js
CHANGED
|
@@ -1,9 +1,16 @@
|
|
|
1
|
-
import { attr, createElement, createMountPoint, normalizeClass, on, } from "@ivlev-dev/silent-core";
|
|
1
|
+
import { attr, createElement, createMountPoint, getRuntimeOptions, normalizeClass, on, } from "@ivlev-dev/silent-core";
|
|
2
2
|
import { createRenderEffect, onCleanup } from "@ivlev-dev/silent-reactivity";
|
|
3
3
|
import { RouterMissingError, isPathActive } from "./match.js";
|
|
4
4
|
import { Router } from "./router.js";
|
|
5
5
|
function resolveRouter(router) {
|
|
6
|
-
|
|
6
|
+
if (router !== undefined) {
|
|
7
|
+
return router;
|
|
8
|
+
}
|
|
9
|
+
const injected = getRuntimeOptions().container?.peek(Router);
|
|
10
|
+
if (injected !== undefined) {
|
|
11
|
+
return injected;
|
|
12
|
+
}
|
|
13
|
+
const resolved = Router.current();
|
|
7
14
|
if (resolved === null) {
|
|
8
15
|
throw new RouterMissingError("Link требует Router: передайте router или создайте экземпляр");
|
|
9
16
|
}
|
package/dist/link.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.js","sourceRoot":"","sources":["../src/link.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,EAAE,GAGH,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAoB,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"link.js","sourceRoot":"","sources":["../src/link.ts"],"names":[],"mappings":"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"}
|
package/dist/match.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../src/match.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../src/match.ts"],"names":[],"mappings":"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"}
|
package/dist/match.js
CHANGED
|
@@ -65,6 +65,10 @@ function compilePattern(pattern) {
|
|
|
65
65
|
result.push({ kind: "param", name: segment.slice(1) });
|
|
66
66
|
continue;
|
|
67
67
|
}
|
|
68
|
+
if (segment.startsWith("{") && segment.endsWith("}") && segment.length > 2) {
|
|
69
|
+
result.push({ kind: "param", name: segment.slice(1, -1) });
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
68
72
|
result.push({ kind: "static", value: segment });
|
|
69
73
|
}
|
|
70
74
|
return result;
|
|
@@ -368,7 +372,7 @@ export function resolveLocation(compiled, target, current = null, components) {
|
|
|
368
372
|
targetPath = interpolatePath(route.path, params);
|
|
369
373
|
}
|
|
370
374
|
else if (target.path !== undefined && target.path !== "") {
|
|
371
|
-
targetPath = target.path.includes(":")
|
|
375
|
+
targetPath = target.path.includes(":") || target.path.includes("{")
|
|
372
376
|
? interpolatePath(target.path, params)
|
|
373
377
|
: normalizePath(target.path);
|
|
374
378
|
}
|
package/dist/match.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.js","sourceRoot":"","sources":["../src/match.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"match.js","sourceRoot":"","sources":["../src/match.ts"],"names":[],"mappings":"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"}
|
package/dist/route.d.ts
ADDED
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import type { AnyComponent } from "@ivlev-dev/silent-core";
|
|
2
|
+
import type { QueryInput, RouteGuardResult, RouteLoaderResult, RouteLocation, RouteMeta, RouteQuery, RouteRecord, RouteRedirect } from "./match.js";
|
|
3
|
+
import type { IRouter } from "./router.js";
|
|
4
|
+
export type RouteQueryShape = Readonly<Record<string, QueryInput>>;
|
|
5
|
+
type BracedParams<Path extends string> = Path extends `${string}{${infer Name}}${infer Rest}` ? Name | BracedParams<Rest> : never;
|
|
6
|
+
type ColonParams<Path extends string> = Path extends `${string}/:${infer Name}/${infer Rest}` ? Name | ColonParams<`/${Rest}`> : Path extends `${string}/:${infer Name}` ? Name : Path extends `:${infer Name}/${infer Rest}` ? Name | ColonParams<`/${Rest}`> : Path extends `:${infer Name}` ? Name : never;
|
|
7
|
+
type ParamName<Path extends string> = BracedParams<Path> | ColonParams<Path>;
|
|
8
|
+
export type PathParams<Path extends string> = string extends Path ? Readonly<Record<string, string>> : {
|
|
9
|
+
readonly [Key in ParamName<Path>]: string;
|
|
10
|
+
};
|
|
11
|
+
export type TypedRouteLocation<Path extends string = string, Query = RouteQuery> = Omit<RouteLocation, "params" | "query"> & {
|
|
12
|
+
readonly params: PathParams<Path>;
|
|
13
|
+
readonly query: Query;
|
|
14
|
+
};
|
|
15
|
+
export interface RouteViewProps<Path extends string = string, Query = RouteQuery> {
|
|
16
|
+
readonly route: TypedRouteLocation<Path, Query>;
|
|
17
|
+
readonly params: PathParams<Path>;
|
|
18
|
+
readonly query: Query;
|
|
19
|
+
readonly hash: string;
|
|
20
|
+
readonly router: IRouter;
|
|
21
|
+
}
|
|
22
|
+
export type RouteComponent<Path extends string = string, Query = RouteQuery> = (props: RouteViewProps<Path, Query>) => unknown;
|
|
23
|
+
export interface RouteLoadContext<Path extends string = string, Query = RouteQuery> extends RouteViewProps<Path, Query> {
|
|
24
|
+
readonly signal: AbortSignal;
|
|
25
|
+
}
|
|
26
|
+
export type RouteClassGuard<Path extends string = string, Query = RouteQuery> = (to: TypedRouteLocation<Path, Query>, from: TypedRouteLocation<Path, Query> | null, signal: AbortSignal) => RouteGuardResult | Promise<RouteGuardResult>;
|
|
27
|
+
export type RouteClassLoad<Path extends string = string, Query = RouteQuery> = (context: RouteLoadContext<Path, Query>) => RouteLoaderResult | Promise<RouteLoaderResult>;
|
|
28
|
+
export type AnyRouteGuard = (...args: never[]) => RouteGuardResult | Promise<RouteGuardResult>;
|
|
29
|
+
export type AnyRouteLoader = (...args: never[]) => RouteLoaderResult | Promise<RouteLoaderResult>;
|
|
30
|
+
export interface RouteDefinition {
|
|
31
|
+
readonly path: string;
|
|
32
|
+
readonly name?: string;
|
|
33
|
+
readonly component?: AnyComponent;
|
|
34
|
+
readonly children?: readonly RouteInput[];
|
|
35
|
+
readonly redirect?: RouteRedirect;
|
|
36
|
+
readonly meta?: RouteMeta;
|
|
37
|
+
readonly beforeEnter?: AnyRouteGuard;
|
|
38
|
+
readonly load?: AnyRouteLoader;
|
|
39
|
+
}
|
|
40
|
+
export declare abstract class Route<Path extends string = string, Query extends RouteQueryShape = RouteQuery> implements RouteDefinition {
|
|
41
|
+
abstract readonly path: Path;
|
|
42
|
+
readonly name?: string;
|
|
43
|
+
readonly component?: AnyComponent;
|
|
44
|
+
readonly children?: readonly RouteInput[];
|
|
45
|
+
readonly redirect?: RouteRedirect;
|
|
46
|
+
readonly meta?: RouteMeta;
|
|
47
|
+
}
|
|
48
|
+
export interface Route<Path extends string = string, Query extends RouteQueryShape = RouteQuery> {
|
|
49
|
+
beforeEnter?(to: TypedRouteLocation<Path, Query>, from: TypedRouteLocation<Path, Query> | null, signal: AbortSignal): RouteGuardResult | Promise<RouteGuardResult>;
|
|
50
|
+
load?(context: RouteLoadContext<Path, Query>): RouteLoaderResult | Promise<RouteLoaderResult>;
|
|
51
|
+
}
|
|
52
|
+
export type RouteClass = new () => RouteDefinition;
|
|
53
|
+
export type RouteInput = RouteRecord | RouteDefinition | RouteClass;
|
|
54
|
+
export declare function hasContextLoader(record: RouteRecord): boolean;
|
|
55
|
+
export declare function normalizeRoutes(routes: readonly RouteInput[]): readonly RouteRecord[];
|
|
56
|
+
export {};
|
|
57
|
+
//# sourceMappingURL=route.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../src/route.ts"],"names":[],"mappings":"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"}
|
package/dist/route.js
ADDED
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
export class Route {
|
|
2
|
+
}
|
|
3
|
+
const contextLoaders = new WeakSet();
|
|
4
|
+
export function hasContextLoader(record) {
|
|
5
|
+
return contextLoaders.has(record);
|
|
6
|
+
}
|
|
7
|
+
function isConstructor(input) {
|
|
8
|
+
return typeof input === "function";
|
|
9
|
+
}
|
|
10
|
+
function normalizeChildren(children) {
|
|
11
|
+
if (children === undefined || children.length === 0) {
|
|
12
|
+
return undefined;
|
|
13
|
+
}
|
|
14
|
+
return children.map((child) => normalizeInput(child));
|
|
15
|
+
}
|
|
16
|
+
function definitionToRecord(input, fromClass) {
|
|
17
|
+
const record = { path: input.path };
|
|
18
|
+
if (input.name !== undefined) {
|
|
19
|
+
record.name = input.name;
|
|
20
|
+
}
|
|
21
|
+
if (input.component !== undefined) {
|
|
22
|
+
record.component = input.component;
|
|
23
|
+
}
|
|
24
|
+
const children = normalizeChildren(input.children);
|
|
25
|
+
if (children !== undefined) {
|
|
26
|
+
record.children = children;
|
|
27
|
+
}
|
|
28
|
+
if (input.redirect !== undefined) {
|
|
29
|
+
record.redirect = input.redirect;
|
|
30
|
+
}
|
|
31
|
+
if (input.meta !== undefined) {
|
|
32
|
+
record.meta = input.meta;
|
|
33
|
+
}
|
|
34
|
+
if (input.beforeEnter !== undefined) {
|
|
35
|
+
record.beforeEnter = input.beforeEnter;
|
|
36
|
+
}
|
|
37
|
+
if (input.load !== undefined) {
|
|
38
|
+
record.load = input.load;
|
|
39
|
+
if (fromClass) {
|
|
40
|
+
contextLoaders.add(record);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return record;
|
|
44
|
+
}
|
|
45
|
+
function normalizeInput(input) {
|
|
46
|
+
if (isConstructor(input)) {
|
|
47
|
+
return definitionToRecord(new input(), true);
|
|
48
|
+
}
|
|
49
|
+
if (input instanceof Route) {
|
|
50
|
+
return definitionToRecord(input, true);
|
|
51
|
+
}
|
|
52
|
+
return definitionToRecord(input, false);
|
|
53
|
+
}
|
|
54
|
+
export function normalizeRoutes(routes) {
|
|
55
|
+
return routes.map((route) => normalizeInput(route));
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=route.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../src/route.ts"],"names":[],"mappings":"AAyGA,MAAM,OAAgB,KAAK;CAU1B;AAmBD,MAAM,cAAc,GAAG,IAAI,OAAO,EAAe,CAAC;AAElD,MAAM,UAAU,gBAAgB,CAAC,MAAmB;IAClD,OAAO,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,aAAa,CAAC,KAAiB;IACtC,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC;AACrC,CAAC;AAED,SAAS,iBAAiB,CACxB,QAA2C;IAE3C,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAsB,EACtB,SAAkB;IAElB,MAAM,MAAM,GASR,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;IAEzB,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAC3B,CAAC;IACD,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;IACrC,CAAC;IACD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACnD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IACnC,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAC3B,CAAC;IACD,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,WAAyB,CAAC;IACvD,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,IAAmB,CAAC;QACxC,IAAI,SAAS,EAAE,CAAC;YACd,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,KAAiB;IACvC,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,kBAAkB,CAAC,IAAI,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,MAA6B;IAE7B,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;AACtD,CAAC"}
|
package/dist/router-view.d.ts
CHANGED
|
@@ -1,17 +1,12 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
import {
|
|
1
|
+
import { type RouteQuery } from "./match.js";
|
|
2
|
+
import type { RouteViewProps } from "./route.js";
|
|
3
|
+
import { type IRouter } from "./router.js";
|
|
3
4
|
export declare const ROUTER_VIEW_MARKER = "silent-router-view";
|
|
4
5
|
export interface RouterViewProps {
|
|
5
|
-
readonly router?:
|
|
6
|
+
readonly router?: IRouter;
|
|
6
7
|
readonly depth?: number;
|
|
7
8
|
readonly fallback?: unknown;
|
|
8
9
|
}
|
|
9
|
-
export
|
|
10
|
-
readonly route: RouteLocation | null;
|
|
11
|
-
readonly params: RouteParams;
|
|
12
|
-
readonly query: RouteQuery;
|
|
13
|
-
readonly hash: string;
|
|
14
|
-
readonly router: Router;
|
|
15
|
-
}
|
|
10
|
+
export type RouterViewComponentProps<Path extends string = string, Query = RouteQuery> = RouteViewProps<Path, Query>;
|
|
16
11
|
export declare function RouterView(props: RouterViewProps): Node;
|
|
17
12
|
//# sourceMappingURL=router-view.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-view.d.ts","sourceRoot":"","sources":["../src/router-view.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"router-view.d.ts","sourceRoot":"","sources":["../src/router-view.ts"],"names":[],"mappings":"AAUA,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAU,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,MAAM,wBAAwB,CAClC,IAAI,SAAS,MAAM,GAAG,MAAM,EAC5B,KAAK,GAAG,UAAU,IAChB,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAgEhC,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAsCvD"}
|
package/dist/router-view.js
CHANGED
|
@@ -1,10 +1,17 @@
|
|
|
1
|
-
import { collectNodes, createMountPoint, isServerMode, } from "@ivlev-dev/silent-core";
|
|
2
|
-
import { createMemo, createRenderEffect, onCleanup } from "@ivlev-dev/silent-reactivity";
|
|
1
|
+
import { collectNodes, component, createMountPoint, getRuntimeOptions, isServerMode, } from "@ivlev-dev/silent-core";
|
|
2
|
+
import { createMemo, createRenderEffect, createRoot, onCleanup } from "@ivlev-dev/silent-reactivity";
|
|
3
3
|
import { RouterMissingError, } from "./match.js";
|
|
4
4
|
import { Router } from "./router.js";
|
|
5
5
|
export const ROUTER_VIEW_MARKER = "silent-router-view";
|
|
6
6
|
function resolveRouter(router) {
|
|
7
|
-
|
|
7
|
+
if (router !== undefined) {
|
|
8
|
+
return router;
|
|
9
|
+
}
|
|
10
|
+
const injected = getRuntimeOptions().container?.peek(Router);
|
|
11
|
+
if (injected !== undefined) {
|
|
12
|
+
return injected;
|
|
13
|
+
}
|
|
14
|
+
const resolved = Router.current();
|
|
8
15
|
if (resolved === null) {
|
|
9
16
|
throw new RouterMissingError("RouterView требует Router: передайте router или создайте экземпляр");
|
|
10
17
|
}
|
|
@@ -27,8 +34,8 @@ function sameSelection(left, right) {
|
|
|
27
34
|
}
|
|
28
35
|
function renderSelection(router, props, selection) {
|
|
29
36
|
const entry = selection.entry;
|
|
30
|
-
const
|
|
31
|
-
if (entry === undefined ||
|
|
37
|
+
const routeComponent = entry?.component;
|
|
38
|
+
if (entry === undefined || routeComponent === undefined || selection.route === null) {
|
|
32
39
|
return props.fallback;
|
|
33
40
|
}
|
|
34
41
|
const viewProps = {
|
|
@@ -38,7 +45,7 @@ function renderSelection(router, props, selection) {
|
|
|
38
45
|
hash: selection.hash,
|
|
39
46
|
router,
|
|
40
47
|
};
|
|
41
|
-
return component(viewProps);
|
|
48
|
+
return component(routeComponent, viewProps);
|
|
42
49
|
}
|
|
43
50
|
export function RouterView(props) {
|
|
44
51
|
const router = resolveRouter(props.router);
|
|
@@ -55,10 +62,23 @@ export function RouterView(props) {
|
|
|
55
62
|
}
|
|
56
63
|
const mount = createMountPoint(container, marker);
|
|
57
64
|
const selection = createMemo(() => selectView(router, depth), { equals: sameSelection });
|
|
65
|
+
let viewRootDispose = null;
|
|
58
66
|
createRenderEffect(() => {
|
|
59
|
-
|
|
67
|
+
const current = selection();
|
|
68
|
+
mount.clear();
|
|
69
|
+
viewRootDispose?.();
|
|
70
|
+
viewRootDispose = null;
|
|
71
|
+
const output = createRoot((dispose) => {
|
|
72
|
+
viewRootDispose = dispose;
|
|
73
|
+
return renderSelection(router, props, current);
|
|
74
|
+
});
|
|
75
|
+
mount.render(output);
|
|
76
|
+
});
|
|
77
|
+
onCleanup(() => {
|
|
78
|
+
mount.clear();
|
|
79
|
+
viewRootDispose?.();
|
|
80
|
+
viewRootDispose = null;
|
|
60
81
|
});
|
|
61
|
-
onCleanup(mount.clear);
|
|
62
82
|
return container;
|
|
63
83
|
}
|
|
64
84
|
//# sourceMappingURL=router-view.js.map
|
package/dist/router-view.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-view.js","sourceRoot":"","sources":["../src/router-view.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,YAAY,
|
|
1
|
+
{"version":3,"file":"router-view.js","sourceRoot":"","sources":["../src/router-view.ts"],"names":[],"mappings":"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"}
|
package/dist/router.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import type { Container } from "@ivlev-dev/silent-di";
|
|
1
2
|
import { type Accessor } from "@ivlev-dev/silent-reactivity";
|
|
2
3
|
import { type RouterHistory } from "./history.js";
|
|
3
|
-
import { type MatchedRoute, type RouteLocation, type RouteParams, type RouteQuery, type
|
|
4
|
+
import { type MatchedRoute, type RouteLocation, type RouteParams, type RouteQuery, type RouteTarget, type ScrollBehavior } from "./match.js";
|
|
5
|
+
import { type RouteInput } from "./route.js";
|
|
4
6
|
export interface RouterState {
|
|
5
7
|
readonly route: RouteLocation | null;
|
|
6
8
|
readonly params: RouteParams;
|
|
@@ -10,13 +12,32 @@ export interface RouterState {
|
|
|
10
12
|
readonly pending: boolean;
|
|
11
13
|
readonly error: unknown;
|
|
12
14
|
}
|
|
15
|
+
export interface IRouter {
|
|
16
|
+
readonly base: string;
|
|
17
|
+
readonly state: Accessor<RouterState>;
|
|
18
|
+
readonly route: RouteLocation | null;
|
|
19
|
+
readonly params: RouteParams;
|
|
20
|
+
readonly query: RouteQuery;
|
|
21
|
+
readonly hash: string;
|
|
22
|
+
readonly matched: readonly MatchedRoute[];
|
|
23
|
+
resolve(to: RouteTarget): RouteLocation;
|
|
24
|
+
href(to: RouteTarget): string;
|
|
25
|
+
push(to: RouteTarget): Promise<void>;
|
|
26
|
+
replace(to: RouteTarget): Promise<void>;
|
|
27
|
+
back(): void;
|
|
28
|
+
forward(): void;
|
|
29
|
+
start(): Promise<void>;
|
|
30
|
+
stop(): void;
|
|
31
|
+
dispose(): void;
|
|
32
|
+
}
|
|
13
33
|
export interface RouterOptions {
|
|
14
|
-
readonly routes: readonly
|
|
34
|
+
readonly routes: readonly RouteInput[];
|
|
15
35
|
readonly base?: string;
|
|
16
36
|
readonly history?: RouterHistory;
|
|
17
37
|
readonly scrollBehavior?: ScrollBehavior;
|
|
38
|
+
readonly container?: Container;
|
|
18
39
|
}
|
|
19
|
-
export declare class Router {
|
|
40
|
+
export declare class Router implements IRouter {
|
|
20
41
|
readonly base: string;
|
|
21
42
|
readonly state: Accessor<RouterState>;
|
|
22
43
|
private readonly compiled;
|
|
@@ -33,6 +54,7 @@ export declare class Router {
|
|
|
33
54
|
private controller;
|
|
34
55
|
constructor(options: RouterOptions);
|
|
35
56
|
static current(): Router | null;
|
|
57
|
+
provide(container: Container): this;
|
|
36
58
|
get route(): RouteLocation | null;
|
|
37
59
|
get params(): RouteParams;
|
|
38
60
|
get query(): RouteQuery;
|
|
@@ -60,4 +82,5 @@ export declare class Router {
|
|
|
60
82
|
private fullPathFromHistory;
|
|
61
83
|
private stripBase;
|
|
62
84
|
}
|
|
85
|
+
export declare const IRouter: typeof Router;
|
|
63
86
|
//# sourceMappingURL=router.d.ts.map
|
package/dist/router.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAQL,KAAK,YAAY,EAGjB,KAAK,aAAa,EAElB,KAAK,WAAW,EAChB,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAQL,KAAK,YAAY,EAGjB,KAAK,aAAa,EAElB,KAAK,WAAW,EAChB,KAAK,UAAU,EAEf,KAAK,WAAW,EAChB,KAAK,cAAc,EAEpB,MAAM,YAAY,CAAC;AACpB,OAAO,EAIL,KAAK,UAAU,EAEhB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;IAC1C,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;IACtC,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;IAC1C,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,aAAa,CAAC;IACxC,IAAI,CAAC,EAAE,EAAE,WAAW,GAAG,MAAM,CAAC;IAC9B,IAAI,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,IAAI,IAAI,CAAC;IACb,OAAO,IAAI,IAAI,CAAC;IAChB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,IAAI,CAAC;IACb,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IACvC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IACjC,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IACzC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;CAChC;AAwCD,qBAAa,MAAO,YAAW,OAAO;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;IAEtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA2B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6B;IAC5D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwD;IACpF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAwC;IACzE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqC;IACpE,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,UAAU,CAAgC;IAElD,YAAY,OAAO,EAAE,aAAa,EAqBjC;IAED,MAAM,CAAC,OAAO,IAAI,MAAM,GAAG,IAAI,CAG9B;IAED,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAGlC;IAED,IAAI,KAAK,IAAI,aAAa,GAAG,IAAI,CAEhC;IAED,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,IAAI,KAAK,IAAI,UAAU,CAEtB;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,OAAO,IAAI,SAAS,YAAY,EAAE,CAErC;IAED,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,aAAa,CAItC;IAED,IAAI,CAAC,EAAE,EAAE,WAAW,GAAG,MAAM,CAE5B;IAED,IAAI,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnC;IAED,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtC;IAED,IAAI,IAAI,IAAI,CAEX;IAED,OAAO,IAAI,IAAI,CAEd;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAa3B;IAED,IAAI,IAAI,IAAI,CASX;IAED,OAAO,IAAI,IAAI,CAad;IAED,OAAO,CAAC,QAAQ;YAQF,mBAAmB;YAQnB,QAAQ;YA2GR,SAAS;YAsCT,UAAU;IAmDxB,OAAO,CAAC,MAAM;YA2BA,aAAa;IAsB3B,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,gBAAgB;IAmBxB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,SAAS;CAYlB;AAED,eAAO,MAAM,OAAO,EAAE,OAAO,MAAe,CAAC"}
|
package/dist/router.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createSignal, } from "@ivlev-dev/silent-reactivity";
|
|
2
2
|
import { BrowserHistory, MemoryHistory, } from "./history.js";
|
|
3
3
|
import { RouterAbortError, RouterNavigationError, ROUTER_MAX_REDIRECT_STEPS, compileRoutes, normalizePath, resolveLocation, } from "./match.js";
|
|
4
|
+
import { hasContextLoader, normalizeRoutes, } from "./route.js";
|
|
4
5
|
const EMPTY_PARAMS = Object.freeze({});
|
|
5
6
|
const EMPTY_QUERY = Object.freeze({});
|
|
6
7
|
const EMPTY_MATCHED = Object.freeze([]);
|
|
@@ -46,7 +47,7 @@ export class Router {
|
|
|
46
47
|
controller = null;
|
|
47
48
|
constructor(options) {
|
|
48
49
|
this.base = normalizeBase(options.base ?? "");
|
|
49
|
-
this.compiled = compileRoutes(options.routes);
|
|
50
|
+
this.compiled = compileRoutes(normalizeRoutes(options.routes));
|
|
50
51
|
this.history = options.history ?? createDefaultHistory();
|
|
51
52
|
this.ownsHistory = options.history === undefined;
|
|
52
53
|
this.scrollBehavior = options.scrollBehavior;
|
|
@@ -61,11 +62,18 @@ export class Router {
|
|
|
61
62
|
});
|
|
62
63
|
this.state = this.stateSignal[0];
|
|
63
64
|
this.activate();
|
|
65
|
+
if (options.container !== undefined) {
|
|
66
|
+
this.provide(options.container);
|
|
67
|
+
}
|
|
64
68
|
}
|
|
65
69
|
static current() {
|
|
66
70
|
const router = routers[routers.length - 1];
|
|
67
71
|
return router ?? null;
|
|
68
72
|
}
|
|
73
|
+
provide(container) {
|
|
74
|
+
container.bindValue(Router, this);
|
|
75
|
+
return this;
|
|
76
|
+
}
|
|
69
77
|
get route() {
|
|
70
78
|
return this.stateSignal[0]().route;
|
|
71
79
|
}
|
|
@@ -271,7 +279,20 @@ export class Router {
|
|
|
271
279
|
}
|
|
272
280
|
let result;
|
|
273
281
|
try {
|
|
274
|
-
|
|
282
|
+
if (hasContextLoader(entry.record)) {
|
|
283
|
+
const context = {
|
|
284
|
+
route: location,
|
|
285
|
+
params: location.params,
|
|
286
|
+
query: location.query,
|
|
287
|
+
hash: location.hash,
|
|
288
|
+
router: this,
|
|
289
|
+
signal,
|
|
290
|
+
};
|
|
291
|
+
result = await load(context);
|
|
292
|
+
}
|
|
293
|
+
else {
|
|
294
|
+
result = await load(location, signal);
|
|
295
|
+
}
|
|
275
296
|
}
|
|
276
297
|
catch (error) {
|
|
277
298
|
if (signal.aborted || id !== this.navigationId) {
|
|
@@ -387,4 +408,5 @@ export class Router {
|
|
|
387
408
|
return normalizePath(pathname);
|
|
388
409
|
}
|
|
389
410
|
}
|
|
411
|
+
export const IRouter = Router;
|
|
390
412
|
//# sourceMappingURL=router.js.map
|
package/dist/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ivlev-dev/silent-router",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.11.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -15,10 +15,12 @@
|
|
|
15
15
|
"dist"
|
|
16
16
|
],
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@ivlev-dev/silent-core": "0.
|
|
19
|
-
"@ivlev-dev/silent-
|
|
18
|
+
"@ivlev-dev/silent-core": "0.11.0",
|
|
19
|
+
"@ivlev-dev/silent-di": "0.11.0",
|
|
20
|
+
"@ivlev-dev/silent-reactivity": "0.11.0"
|
|
20
21
|
},
|
|
21
22
|
"devDependencies": {
|
|
23
|
+
"@ivlev-dev/silent-swc": "0.11.0",
|
|
22
24
|
"jsdom": "^31.0.0",
|
|
23
25
|
"typescript": "^7.0.2",
|
|
24
26
|
"vitest": "^5.1.0"
|