@tramvai/module-router 1.30.0 → 1.31.1

package/README.md

@@ -1,16 +1,17 @@
 # @tramvai/module-router
 
-Модуль для роутинга в приложении. Экспортирует два варианта модуля: с клиентскими спа-переходами и без.
+Module for routing in the application.
+Exports two sub-modules: with client SPA transitions, and no-SPA.
 
-## Подключение
+## Installation
 
-Необходимо установить `@tramvai/module-router`
+You need to install `@tramvai/module-router`:
 
 ```bash
 yarn add @tramvai/module-router
 ```
 
-И подключить в проекте
+And connect in the project:
 
 ```tsx
 import { createApp } from '@tramvai/core';
@@ -19,55 +20,55 @@ import { NoSpaRouterModule, SpaRouterModule } from '@tramvai/module-router';
 createApp({
   name: 'tincoin',
   modules: [SpaRouterModule],
-  //modules: [ NoSpaRouterModule ], если нужно отключить клиентские спа-переходы
+  // modules: [ NoSpaRouterModule ], if you want to disable client SPA transitions
 });
 ```
 
 ## Explanation
 
-Модуль основан на библиотеке [@tinkoff/router](references/libs/router.md)
+The module is based on the library [@tinkoff/router](references/libs/router.md)
 
-### Флоу работы навигации на сервере
+### Navigation flow on the server
 
-![Диаграмма](/img/router/navigate-flow-server.drawio.svg)
+![Diagramm](/img/router/navigate-flow-server.drawio.svg)
 
-### Флоу работы первой навигации на клиенте
+### Flow of the first navigation on the client
 
-![Диаграмма](/img/router/rehydrate-client.drawio.svg)
+![Diagramm](/img/router/rehydrate-client.drawio.svg)
 
-### Флоу работы навигации на клиенте без спа
+### Flow of navigation on the client without SPA transitions
 
-![Диаграмма](/img/router/navigate-flow-client-no-spa.drawio.svg)
+![Diagramm](/img/router/navigate-flow-client-no-spa.drawio.svg)
 
-### Флоу работы навигации на клиенте со спа
+### Flow of navigation on the client with SPA transitions
 
-![Диаграмма](/img/router/navigate-flow-client-spa.drawio.svg)
+![Diagramm](/img/router/navigate-flow-client-spa.drawio.svg)
 
 ## API
 
-### Задание статичных роутов в приложении
+### Static routes in the application
 
-Формат описания роута:
+Route description format:
 
 ```ts
 const routes = [
   {
-    // обязательно имя роута
+    // the name of the route is required
     name: 'route1',
-    // обязательно соответствующий path для роута
+    // the path of the route is required
     path: '/route/a/',
-    // дополнительные конфиги для роута
+    // additional configs for the route
     config: {
-      // имя компонента для layout
+      // layout component name
       layoutComponent: 'layout',
-      // имя страничного компонента
+      // page component name
       pageComponent: 'page',
     },
   },
 ];
 ```
 
-Передать в роутинг список роутов можно явно при добавлении модуля роутинга:
+You can explicitly transfer a list of routes to routing when adding a router module:
 
 ```ts
 import { createApp } from '@tramvai/core';
@@ -85,7 +86,7 @@ createApp({
 });
 ```
 
-Или отдельно токеном `ROUTES_TOKEN` (можно задавать несколько раз):
+Or separately with the `ROUTES_TOKEN` token (you can set it several times):
 
 ```ts
 import { ROUTES_TOKEN } from '@tramvai/module-router';
@@ -115,39 +116,41 @@ const providers = [
 
 ### PAGE_SERVICE_TOKEN
 
-Сервис-обёртка для работы с роутингом. Служит для скрытия работы с роутингом и является предпочтительным способом работы с роутингом.
+Service wrapper for working with routing. Serves to hide routing work and is the preferred way of routing work.
 
-Методы:
+Methods:
 
-- `getCurrentRoute()` - получить текущий роут,
-- `getCurrentUrl()` - объект-результат парсинга текущего урла
-- `getConfig()` - получить конфиг текущей страницы
-- `getContent()` - получить контент для текущей страницы
-- `getMeta()` - получить мету для текущей страницы
-- `navigate(options)` - навигация на новую страницу [подробнее](references/libs/router.md)
-- `updateCurrentRoute(options)` - обновить текущий роут новыми параметрами [подробнее](references/libs/router.md)
-- `back()` - переход по истории назад
-- `forward()` - переход по истории вперёд
-- `go(to)` - переход на указанную дельту по истории
+- `getCurrentRoute()` - get the current route
+- `getCurrentUrl()` - object-result of parsing the current url
+- `getConfig()` - get the config of the current page
+- `getContent()` - get content for the current page
+- `getMeta()` - get the meta for the current page
+- `navigate(options)` - navigation to a new page [more](references/libs/router.md)
+- `updateCurrentRoute(options)` - update the current route with new parameters [more](references/libs/router.md)
+- `back()` - go back through history
+- `forward()` - go forward through history
+- `go(to)` - go to the specified delta by history
+- `addComponent(name, component)` - add new component to current page into ComponentRegistry
+- `getComponent(name)` - get component from current page components from ComponentRegistry
 
 ### RouterStore
 
-Стор, хранящий информацию о текущем и предыдущем роуте.
+Store that stores information about the current and previous routes.
 
-Свойства:
+Properties:
 
-- `currentRoute` - текущий роут
-- `currentUrl` - теущий урл
-- `previousRoute` - предыдущий роут
-- `previousUrl` - предыдущий урл
+- `currentRoute` - current route
+- `currentUrl` - current url
+- `previousRoute` - previous route
+- `previousUrl` - previous url
 
 ### ROUTER_GUARD_TOKEN
 
-Позволяет блокировать или перенаправлять переход на страницу при определённых условиях. Подробнее смотри доку [@tinkoff/router](/references/libs/router.md)
+Allows you to block or redirect the transition to the page under certain conditions. See [@tinkoff/router](/references/libs/router.md)
 
-### Задание редиректов
+### Redirects
 
-Редиректы могут выполняться через [guards](#ROUTER_GUARD_TOKEN) или явно через свойство `redirect` в роуте.
+Redirects can be done via [guards](#ROUTER_GUARD_TOKEN) or explicitly via the `redirect` property in the route.
 
 ```ts
 const routes = [
@@ -160,9 +163,9 @@ const routes = [
 ];
 ```
 
-### Not Found роут
+### Not Found route
 
-Роут, используемый, если не было найдено соответствий для текущей страницы можно задать специальным способом в списке роутов.
+The route used if no matches were found for the current page, can be specified in a special way in the list of routes.
 
 ```ts
 const route = [
@@ -179,19 +182,19 @@ const route = [
 
 ### ROUTE_RESOLVE_TOKEN
 
-Позволяет задать асинхронную функцию, возвращающую объект роута, которая будет вызвана если не было найдено подходящего статичного роута в приложении.
+Allows you to define an asynchronous function that returns a route object that will be called if no suitable static route was found in the application.
 
 ### ROUTE_TRANSFORM_TOKEN
 
-Функция-трансформер для роутов приложения (заданных статично и тех, что будут загружены через ROUTE_RESOLVE_TOKEN)
+Transformer function for application routes (set statically and those that will be loaded via ROUTE_RESOLVE_TOKEN)
 
-### Способ задания когда должны выполняться экшены при спа-переходах
+### Method of setting when actions should be performed during SPA transitions
 
-По умолчанию при спа-переходах после определения следующего роута, но перед фактом самого перехода выполняются экшены, что позволяет отобразить страницу сразу с новыми данными, но может вызывать заметную визуальную задержку, если экшены выполняются достаточно долго.
+By default, SPA transitions execute actions after defining the next route, but before the actual transition, which allows the page to be displayed immediately with new data, but can cause a noticeable visual lag if the actions are taken long enough.
 
-Есть возможность поменять поведение и сделать выполнение экшенов уже после самого перехода. Тогда при разработке компонентов потребуется учитывать, что данные будут подгружаться по мере поступления.
+It is possible to change the behavior and make the execution of actions after the transition itself. Then, when developing components, you will need to take into account that data will be loaded as it becomes available.
 
-Конфигурируется явно при использовании модуля роутинга:
+Configurable explicitly when using the routing module:
 
 ```ts
 import { createApp } from '@tramvai/core';
@@ -201,13 +204,13 @@ createApp({
   modules: [
     // ...,
     SpaRouterModule.forRoot([], {
-      spaActionsMode: 'after', // по умолчанию 'before'
+      spaActionsMode: 'after', // default is 'before'
     }),
   ],
 });
 ```
 
-или токеном `ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN`:
+or through token `ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN`:
 
 ```ts
 import { ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/module-router';
@@ -224,9 +227,9 @@ const providers = [
 
 ## How to
 
-### Работа с навигацией в провайдерах и экшенах
+### Working with navigation in providers and actions
 
-В этом случае лучше всего использовать токен [PAGE_SERVICE_TOKEN](#page_service_token)
+In this case, it is best to use the [PAGE_SERVICE_TOKEN](#page_service_token)
 
 ```ts
 import { provide, createAction } from '@tramvai/core';
@@ -257,65 +260,66 @@ const action = createAction({
 });
 ```
 
-### Работа с навигацией в React-компонентах
+### Working with navigation in React components
 
-Работать с роутингом внутри React компонентов можно с помощью хуков и компонентов - useNavigate, useRoute, Link из пакета [@tinkoff/router](references/libs/router.md#интеграция-с-react)
+You can work with routing inside React components using hooks and components - `useNavigate`, `useRoute`, `Link` from the [@tinkoff/router](references/libs/router.md#интеграция-с-react)
 
 <p>
 <details>
-<summary>Пример работы с навигацией в приложение</summary>
+<summary>An example of working with navigation in the application</summary>
 
 @inline ../../../examples/how-to/router-navigate/index.tsx
 
 </details>
 </p>
 
-### Как задать статичные роуты
+### How to set static routes
 
-[RouterModule](references/modules/router.md) позволяет добавить новые роуты при конфигурации приложения. Второй способ, передавать статичные роуты в DI через токен `ROUTES_TOKEN`.
+[RouterModule](references/modules/router.md) allows you to add new routes when configuring your application.
+The second way is to pass static routes to DI via the `ROUTES_TOKEN` token.
 
 <p>
 <details>
-<summary>Пример добавления статичных роутов в приложение</summary>
+<summary>An example of adding static routes to an application</summary>
 
 @inline ../../../examples/how-to/router-static-routes/index.tsx
 
 </details>
 </p>
 
-### Как задать Route Guard
+### How to set Route Guard
 
-[ROUTER_GUARD_TOKEN](references/modules/router.md#router_guard_token) задаются как асинхронная функция, что позволяет выполнять различные действия и влиять на поведение роутинга.
+[ROUTER_GUARD_TOKEN](references/modules/router.md#router_guard_token) is set as an asynchronous function, which allows you to perform various actions and influence the routing behavior.
 
 <p>
 <details>
-<summary>Пример задания router guards в приложении</summary>
+<summary>Example router guards job in application</summary>
 
 @inline ../../../examples/how-to/router-guards/index.tsx
 
 </details>
 </p>
 
-### Как задать Not found роут
+### How to set the Not found route
 
-Not-found роут используется в том случае, если для урла не найден соответствующий роут.
+The Not found route is used if the corresponding route is not found for the url.
 
-Такой роут задаётся в списке роутов со специальным символом `*` в свойстве `path`.
+Such a route is specified in the list of routes with the special `*` character in the `path` property.
 
 <p>
 <details>
-<summary>Пример задания Not-found роута в приложении</summary>
+<summary>An example of setting a Not Found route in an application</summary>
 
 @inline ../../../examples/how-to/router-not-found/index.tsx
 
 </details>
 </p>
 
-### Тестирование
+### Testing
 
-#### Тестирование расширений ROUTER_GUARD_TOKEN
+#### Testing ROUTER_GUARD_TOKEN extensions
 
-Если у вас имеется модуль или провайдеры которые определяют ROUTER_GUARD_TOKEN, то удобно будет использовать специальные утилиты для того чтобы протестировать их отдельно
+If you have a module or providers that define `ROUTER_GUARD_TOKEN`, then it will be convenient to use special utilities to test them separately
 
 ```ts
 import { ROUTER_GUARD_TOKEN } from '@tramvai/tokens-router';
@@ -352,6 +356,6 @@ describe('router guards', () => {
 });
 ```
 
-## Экспортируемые токены
+## Exported tokens
 
-[ссылка](references/tokens/router-tokens.md)
+[link](references/tokens/router-tokens.md)

package/lib/index.browser.js

@@ -1,7 +1,7 @@
 import { provide, commandLineListTokens, Module, DI_TOKEN, COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
 import { Provider, setLogger, NoSpaRouter, Router } from '@tinkoff/router';
 export { Link, Provider, useNavigate, useRoute, useRouter, useUrl } from '@tinkoff/router';
-import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, COMPONENT_REGISTRY_TOKEN, ACTION_REGISTRY_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN, COMBINE_REDUCERS, STORE_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
+import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN, COMPONENT_REGISTRY_TOKEN, COMBINE_REDUCERS, STORE_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
 import { ROUTER_GUARD_TOKEN, ROUTE_TRANSFORM_TOKEN, ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 export * from '@tramvai/tokens-router';
 import { createEvent, createReducer } from '@tramvai/state';
@@ -12,7 +12,7 @@ import identity from '@tinkoff/utils/function/identity';
 import compose from '@tinkoff/utils/function/compose';
 import replace from '@tinkoff/utils/string/replace';
 import React from 'react';
-import { fileSystemPagesEnabled, getStaticFileSystemPages, fileSystemPageToRoute } from '@tramvai/experiments';
+import { isFileSystemPageComponent, fileSystemPagesEnabled, getStaticFileSystemPages, fileSystemPageToRoute } from '@tramvai/experiments';
 import uniq from '@tinkoff/utils/array/uniq';
 import { isRedirectFoundError, isNotFoundError } from '@tinkoff/errors';
 import noop from '@tinkoff/utils/function/noop';
@@ -62,7 +62,7 @@ const afterUpdateCurrentHooksToken = createToken('router afterUpdateCurrentHooks
 const routeTransformToken = createToken('router finalRouteTransform');
 createToken('router bundleInfoAdditional');
 
-const loadBundle = ({ bundleManager, logger, actionRegistry, componentRegistry, responseManager, }) => {
+const loadBundle = ({ bundleManager, logger, actionRegistry, responseManager, }) => {
     const log = logger('route:load-bundles');
     return async ({ to }) => {
         log.debug({
@@ -71,6 +71,11 @@ const loadBundle = ({ bundleManager, logger, actionRegistry, componentRegistry,
         });
         const { bundle, pageComponent } = to.config;
         if (!bundleManager.has(bundle, pageComponent)) {
+            log.info({
+                event: 'load-bundle-not-found',
+                bundle,
+                pageComponent,
+            });
             // если бандл не найдён, то всё ок мы должны вернуть 404 на сервере, а на клиенте просто загрузить новую страницу
             responseManager.setStatus(404);
             return false;
@@ -113,7 +118,6 @@ const commonGuards = [
         deps: {
             logger: LOGGER_TOKEN,
             bundleManager: BUNDLE_MANAGER_TOKEN,
-            componentRegistry: COMPONENT_REGISTRY_TOKEN,
             actionRegistry: ACTION_REGISTRY_TOKEN,
             responseManager: RESPONSE_MANAGER_TOKEN,
         },
@@ -208,8 +212,9 @@ const commonTokens = [
 ];
 
 class PageService {
-    constructor({ router }) {
+    constructor({ router, componentRegistry }) {
         this.router = router;
+        this.componentRegistry = componentRegistry;
     }
     getCurrentRoute() {
         return this.router.getCurrentRoute();
@@ -244,6 +249,19 @@ class PageService {
     go(to, options) {
         return this.router.go(to, options);
     }
+    addComponent(name, component) {
+        const group = this.getComponentsGroupName();
+        return this.componentRegistry.add(name, component, group);
+    }
+    getComponent(name) {
+        const group = this.getComponentsGroupName();
+        return this.componentRegistry.get(name, group);
+    }
+    getComponentsGroupName() {
+        const { bundle, pageComponent } = this.getConfig();
+        const group = isFileSystemPageComponent(pageComponent) ? pageComponent : bundle;
+        return group;
+    }
 }
 
 const providers$2 = [
@@ -252,10 +270,10 @@ const providers$2 = [
             provide: ROUTES_TOKEN,
             multi: true,
             useFactory: ({ logger }) => {
-                const log = logger('route:file-system-pages');
+                const log = logger('file-system-pages:route');
                 const pagesNames = Object.keys(getStaticFileSystemPages());
                 const routes = pagesNames.map(fileSystemPageToRoute);
-                log.debug({
+                log.info({
                     event: 'create static routes from file-system pages',
                     routes,
                 });
@@ -375,13 +393,14 @@ const providers$1 = [
         // рассмотреть возможность замены после доработок экшенов
         useValue: 'after',
     },
-    {
+    provide({
         provide: PAGE_SERVICE_TOKEN,
         useClass: PageService,
         deps: {
             router: ROUTER_TOKEN,
+            componentRegistry: COMPONENT_REGISTRY_TOKEN,
         },
-    },
+    }),
     {
         provide: COMBINE_REDUCERS,
         multi: true,

package/lib/index.es.js

@@ -2,7 +2,7 @@ import { __decorate } from 'tslib';
 import { provide, commandLineListTokens, Module } from '@tramvai/core';
 import { Provider, setLogger, Router } from '@tinkoff/router';
 export { Link, Provider, useNavigate, useRoute, useRouter, useUrl } from '@tinkoff/router';
-import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, COMPONENT_REGISTRY_TOKEN, ACTION_REGISTRY_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN, COMBINE_REDUCERS, REQUEST_MANAGER_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
+import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN, COMPONENT_REGISTRY_TOKEN, COMBINE_REDUCERS, REQUEST_MANAGER_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
 import { ROUTER_GUARD_TOKEN, ROUTE_TRANSFORM_TOKEN, ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 export * from '@tramvai/tokens-router';
 import flatten from '@tinkoff/utils/array/flatten';
@@ -13,7 +13,7 @@ import identity from '@tinkoff/utils/function/identity';
 import compose from '@tinkoff/utils/function/compose';
 import replace from '@tinkoff/utils/string/replace';
 import React from 'react';
-import { fileSystemPagesEnabled, getStaticFileSystemPages, fileSystemPageToRoute } from '@tramvai/experiments';
+import { isFileSystemPageComponent, fileSystemPagesEnabled, getStaticFileSystemPages, fileSystemPageToRoute } from '@tramvai/experiments';
 import uniq from '@tinkoff/utils/array/uniq';
 import { isRedirectFoundError, isNotFoundError, throwHttpError, throwRedirectFoundError } from '@tinkoff/errors';
 import { SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
@@ -65,7 +65,7 @@ const RouterStore = createReducer('router', initialState)
     };
 });
 
-const loadBundle = ({ bundleManager, logger, actionRegistry, componentRegistry, responseManager, }) => {
+const loadBundle = ({ bundleManager, logger, actionRegistry, responseManager, }) => {
     const log = logger('route:load-bundles');
     return async ({ to }) => {
         log.debug({
@@ -74,6 +74,11 @@ const loadBundle = ({ bundleManager, logger, actionRegistry, componentRegistry,
         });
         const { bundle, pageComponent } = to.config;
         if (!bundleManager.has(bundle, pageComponent)) {
+            log.info({
+                event: 'load-bundle-not-found',
+                bundle,
+                pageComponent,
+            });
             // если бандл не найдён, то всё ок мы должны вернуть 404 на сервере, а на клиенте просто загрузить новую страницу
             responseManager.setStatus(404);
             return false;
@@ -116,7 +121,6 @@ const commonGuards = [
         deps: {
             logger: LOGGER_TOKEN,
             bundleManager: BUNDLE_MANAGER_TOKEN,
-            componentRegistry: COMPONENT_REGISTRY_TOKEN,
             actionRegistry: ACTION_REGISTRY_TOKEN,
             responseManager: RESPONSE_MANAGER_TOKEN,
         },
@@ -211,8 +215,9 @@ const commonTokens = [
 ];
 
 class PageService {
-    constructor({ router }) {
+    constructor({ router, componentRegistry }) {
         this.router = router;
+        this.componentRegistry = componentRegistry;
     }
     getCurrentRoute() {
         return this.router.getCurrentRoute();
@@ -247,6 +252,19 @@ class PageService {
     go(to, options) {
         return this.router.go(to, options);
     }
+    addComponent(name, component) {
+        const group = this.getComponentsGroupName();
+        return this.componentRegistry.add(name, component, group);
+    }
+    getComponent(name) {
+        const group = this.getComponentsGroupName();
+        return this.componentRegistry.get(name, group);
+    }
+    getComponentsGroupName() {
+        const { bundle, pageComponent } = this.getConfig();
+        const group = isFileSystemPageComponent(pageComponent) ? pageComponent : bundle;
+        return group;
+    }
 }
 
 const providers$1 = [
@@ -255,10 +273,10 @@ const providers$1 = [
             provide: ROUTES_TOKEN,
             multi: true,
             useFactory: ({ logger }) => {
-                const log = logger('route:file-system-pages');
+                const log = logger('file-system-pages:route');
                 const pagesNames = Object.keys(getStaticFileSystemPages());
                 const routes = pagesNames.map(fileSystemPageToRoute);
-                log.debug({
+                log.info({
                     event: 'create static routes from file-system pages',
                     routes,
                 });
@@ -378,13 +396,14 @@ const providers = [
         // рассмотреть возможность замены после доработок экшенов
         useValue: 'after',
     },
-    {
+    provide({
         provide: PAGE_SERVICE_TOKEN,
         useClass: PageService,
         deps: {
             router: ROUTER_TOKEN,
+            componentRegistry: COMPONENT_REGISTRY_TOKEN,
         },
-    },
+    }),
     {
         provide: COMBINE_REDUCERS,
         multi: true,
@@ -399,7 +418,7 @@ const httpMethod = ({ requestManager, responseManager, logger, }) => {
         if (httpMethods) {
             const currentMethod = requestManager.getMethod().toLowerCase();
             if (!httpMethods.split(',').includes(currentMethod)) {
-                log.debug({
+                log.info({
                     event: 'check-failed',
                     currentMethod,
                     route: to,

package/lib/index.js

@@ -77,7 +77,7 @@ const RouterStore = state.createReducer('router', initialState)
     };
 });
 
-const loadBundle = ({ bundleManager, logger, actionRegistry, componentRegistry, responseManager, }) => {
+const loadBundle = ({ bundleManager, logger, actionRegistry, responseManager, }) => {
     const log = logger('route:load-bundles');
     return async ({ to }) => {
         log.debug({
@@ -86,6 +86,11 @@ const loadBundle = ({ bundleManager, logger, actionRegistry, componentRegistry,
         });
         const { bundle, pageComponent } = to.config;
         if (!bundleManager.has(bundle, pageComponent)) {
+            log.info({
+                event: 'load-bundle-not-found',
+                bundle,
+                pageComponent,
+            });
             // если бандл не найдён, то всё ок мы должны вернуть 404 на сервере, а на клиенте просто загрузить новую страницу
             responseManager.setStatus(404);
             return false;
@@ -128,7 +133,6 @@ const commonGuards = [
         deps: {
             logger: tokensCommon.LOGGER_TOKEN,
             bundleManager: tokensCommon.BUNDLE_MANAGER_TOKEN,
-            componentRegistry: tokensCommon.COMPONENT_REGISTRY_TOKEN,
             actionRegistry: tokensCommon.ACTION_REGISTRY_TOKEN,
             responseManager: tokensCommon.RESPONSE_MANAGER_TOKEN,
         },
@@ -223,8 +227,9 @@ const commonTokens = [
 ];
 
 class PageService {
-    constructor({ router }) {
+    constructor({ router, componentRegistry }) {
         this.router = router;
+        this.componentRegistry = componentRegistry;
     }
     getCurrentRoute() {
         return this.router.getCurrentRoute();
@@ -259,6 +264,19 @@ class PageService {
     go(to, options) {
         return this.router.go(to, options);
     }
+    addComponent(name, component) {
+        const group = this.getComponentsGroupName();
+        return this.componentRegistry.add(name, component, group);
+    }
+    getComponent(name) {
+        const group = this.getComponentsGroupName();
+        return this.componentRegistry.get(name, group);
+    }
+    getComponentsGroupName() {
+        const { bundle, pageComponent } = this.getConfig();
+        const group = experiments.isFileSystemPageComponent(pageComponent) ? pageComponent : bundle;
+        return group;
+    }
 }
 
 const providers$1 = [
@@ -267,10 +285,10 @@ const providers$1 = [
             provide: tokensRouter.ROUTES_TOKEN,
             multi: true,
             useFactory: ({ logger }) => {
-                const log = logger('route:file-system-pages');
+                const log = logger('file-system-pages:route');
                 const pagesNames = Object.keys(experiments.getStaticFileSystemPages());
                 const routes = pagesNames.map(experiments.fileSystemPageToRoute);
-                log.debug({
+                log.info({
                     event: 'create static routes from file-system pages',
                     routes,
                 });
@@ -390,13 +408,14 @@ const providers = [
         // рассмотреть возможность замены после доработок экшенов
         useValue: 'after',
     },
-    {
+    core.provide({
         provide: tokensRouter.PAGE_SERVICE_TOKEN,
         useClass: PageService,
         deps: {
             router: tokensRouter.ROUTER_TOKEN,
+            componentRegistry: tokensCommon.COMPONENT_REGISTRY_TOKEN,
         },
-    },
+    }),
     {
         provide: tokensCommon.COMBINE_REDUCERS,
         multi: true,
@@ -411,7 +430,7 @@ const httpMethod = ({ requestManager, responseManager, logger, }) => {
         if (httpMethods) {
             const currentMethod = requestManager.getMethod().toLowerCase();
             if (!httpMethods.split(',').includes(currentMethod)) {
-                log.debug({
+                log.info({
                     event: 'check-failed',
                     currentMethod,
                     route: to,

package/lib/modules/guards/common/loadBundle.d.ts

@@ -1,9 +1,8 @@
 import type { NavigationGuard } from '@tinkoff/router';
-import type { BUNDLE_MANAGER_TOKEN, COMPONENT_REGISTRY_TOKEN, ACTION_REGISTRY_TOKEN, LOGGER_TOKEN, RESPONSE_MANAGER_TOKEN } from '@tramvai/tokens-common';
-export declare const loadBundle: ({ bundleManager, logger, actionRegistry, componentRegistry, responseManager, }: {
+import type { BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, LOGGER_TOKEN, RESPONSE_MANAGER_TOKEN } from '@tramvai/tokens-common';
+export declare const loadBundle: ({ bundleManager, logger, actionRegistry, responseManager, }: {
     bundleManager: typeof BUNDLE_MANAGER_TOKEN;
     logger: typeof LOGGER_TOKEN;
     actionRegistry: typeof ACTION_REGISTRY_TOKEN;
-    componentRegistry: typeof COMPONENT_REGISTRY_TOKEN;
     responseManager: typeof RESPONSE_MANAGER_TOKEN;
 }) => NavigationGuard;

package/lib/services/page.d.ts

@@ -4,8 +4,10 @@ import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 declare type PageServiceInterface = typeof PAGE_SERVICE_TOKEN;
 export declare class PageService implements PageServiceInterface {
     private router;
-    constructor({ router }: {
+    private componentRegistry;
+    constructor({ router, componentRegistry }: {
         router: any;
+        componentRegistry: any;
     });
     getCurrentRoute(): NavigationRoute;
     getCurrentUrl(): Url;
@@ -17,5 +19,8 @@ export declare class PageService implements PageServiceInterface {
     back(options?: HistoryOptions): Promise<void>;
     forward(): Promise<void>;
     go(to: number, options?: HistoryOptions): Promise<void>;
+    addComponent(name: string, component: any): void;
+    getComponent(name: string): any;
+    private getComponentsGroupName;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "1.30.0",
+  "version": "1.31.1",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -23,24 +23,24 @@
   },
   "dependencies": {
     "@tinkoff/errors": "0.2.18",
-    "@tinkoff/router": "0.1.61",
+    "@tinkoff/router": "0.1.62",
     "@tinkoff/url": "0.7.37",
-    "@tramvai/tokens-render": "1.30.0",
-    "@tramvai/tokens-router": "1.30.0",
-    "@tramvai/tokens-server": "1.30.0",
-    "@tramvai/experiments": "1.30.0"
+    "@tramvai/tokens-render": "1.31.1",
+    "@tramvai/tokens-router": "1.31.1",
+    "@tramvai/tokens-server": "1.31.1",
+    "@tramvai/experiments": "1.31.1"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.30.0",
-    "@tramvai/core": "1.30.0",
-    "@tramvai/module-log": "1.30.0",
-    "@tramvai/module-server": "1.30.0",
-    "@tramvai/papi": "1.30.0",
-    "@tramvai/state": "1.30.0",
-    "@tramvai/test-helpers": "1.30.0",
-    "@tramvai/test-mocks": "1.30.0",
-    "@tramvai/tokens-common": "1.30.0",
+    "@tramvai/cli": "1.31.1",
+    "@tramvai/core": "1.31.1",
+    "@tramvai/module-log": "1.31.1",
+    "@tramvai/module-server": "1.31.1",
+    "@tramvai/papi": "1.31.1",
+    "@tramvai/state": "1.31.1",
+    "@tramvai/test-helpers": "1.31.1",
+    "@tramvai/test-mocks": "1.31.1",
+    "@tramvai/tokens-common": "1.31.1",
     "@tinkoff/dippy": "0.7.35",
     "react": "*",
     "tslib": "^2.0.3"

package/README.en.md

@@ -1,359 +0,0 @@
-# @tramvai/module-router
-
-Module for routing in the application.
-Exports two sub-modules: with client SPA transitions, and no-SPA.
-
-## Installation
-
-You need to install `@tramvai/module-router`:
-
-```bash
-yarn add @tramvai/module-router
-```
-
-And connect in the project:
-
-```tsx
-import { createApp } from '@tramvai/core';
-import { NoSpaRouterModule, SpaRouterModule } from '@tramvai/module-router';
-
-createApp({
-  name: 'tincoin',
-  modules: [SpaRouterModule],
-  // modules: [ NoSpaRouterModule ], if you want to disable client SPA transitions
-});
-```
-
-## Explanation
-
-The module is based on the library [@tinkoff/router](../libs/router)
-
-### Navigation flow on the server
-
-![Diagramm](/img/router/navigate-flow-server.drawio.svg)
-
-### Flow of the first navigation on the client
-
-![Diagramm](/img/router/rehydrate-client.drawio.svg)
-
-### Flow of navigation on the client without SPA transitions
-
-![Diagramm](/img/router/navigate-flow-client-no-spa.drawio.svg)
-
-### Flow of navigation on the client with SPA transitions
-
-![Diagramm](/img/router/navigate-flow-client-spa.drawio.svg)
-
-## API
-
-### Static routes in the application
-
-Route description format:
-
-```ts
-const routes = [
-  {
-    // the name of the route is required
-    name: 'route1',
-    // the path of the route is required
-    path: '/route/a/',
-    // additional configs for the route
-    config: {
-      // layout component name
-      layoutComponent: 'layout',
-      // page component name
-      pageComponent: 'page',
-    },
-  },
-];
-```
-
-You can explicitly transfer a list of routes to routing when adding a router module:
-
-```ts
-import { createApp } from '@tramvai/core';
-import { SpaRouterModule } from '@tramvai/module-router';
-
-const routes = [
-  // ...
-];
-
-createApp({
-  modules: [
-    // ...,
-    SpaRouterModule.forRoot(routes),
-  ],
-});
-```
-
-Or separately with the `ROUTES_TOKEN` token (you can set it several times):
-
-```ts
-import { ROUTES_TOKEN } from '@tramvai/module-router';
-import { provide } from '@tramvai/core';
-
-const routesCommon = [
-  // ...
-];
-const routesSpecific = [
-  // ...
-];
-
-const providers = [
-  // ...,
-  provide({
-    provide: ROUTES_TOKEN,
-    multi: true,
-    useValue: routesCommon,
-  }),
-  provide({
-    provide: ROUTES_TOKEN,
-    multi: true,
-    useValue: routesSpecific,
-  }),
-];
-```
-
-### PAGE_SERVICE_TOKEN
-
-Service wrapper for working with routing. Serves to hide routing work and is the preferred way of routing work.
-
-Методы:
-
-- `getCurrentRoute()` - get the current route,
-- `getCurrentUrl()` - object-result of parsing the current url
-- `getConfig()` - get the config of the current page
-- `getContent()` - get content for the current page
-- `getMeta()` - get the meta for the current page
-- `navigate(options)` - navigation to a new page [more](references/libs/router.md)
-- `updateCurrentRoute(options)` - update the current route with new parameters [more](references/libs/router.md)
-- `back()` - go back through history
-- `forward()` - go forward through history
-- `go(to)` - go to the specified delta by history
-
-### RouterStore
-
-Store that stores information about the current and previous routes.
-
-Properties:
-
-- `currentRoute` - current route
-- `currentUrl` - current url
-- `previousRoute` - previous route
-- `previousUrl` - previous url
-
-### ROUTER_GUARD_TOKEN
-
-Allows you to block or redirect the transition to the page under certain conditions. See [@tinkoff/router](/references/libs/router.md)
-
-### Redirects
-
-Redirects can be done via [guards](#ROUTER_GUARD_TOKEN) or explicitly via the `redirect` property in the route.
-
-```ts
-const routes = [
-  // ...,
-  {
-    name: 'redirect',
-    path: '/from/',
-    redirect: '/to/',
-  },
-];
-```
-
-### Not Found route
-
-The route used if no matches were found for the current page, can be specified in a special way in the list of routes.
-
-```ts
-const route = [
-  // ...other routes,
-  {
-    name: 'not-found',
-    path: '*',
-    config: {
-      pageComponent: 'notfoundComponentName',
-    },
-  },
-];
-```
-
-### ROUTE_RESOLVE_TOKEN
-
-Allows you to define an asynchronous function that returns a route object that will be called if no suitable static route was found in the application.
-
-### ROUTE_TRANSFORM_TOKEN
-
-Transformer function for application routes (set statically and those that will be loaded via ROUTE_RESOLVE_TOKEN)
-
-### Method of setting when actions should be performed during SPA transitions
-
-By default, SPA transitions execute actions after defining the next route, but before the actual transition, which allows the page to be displayed immediately with new data, but can cause a noticeable visual lag if the actions are taken long enough.
-
-It is possible to change the behavior and make the execution of actions after the transition itself. Then, when developing components, you will need to take into account that data will be loaded as it becomes available.
-
-Configurable explicitly when using the routing module:
-
-```ts
-import { createApp } from '@tramvai/core';
-import { SpaRouterModule } from '@tramvai/module-router';
-
-createApp({
-  modules: [
-    // ...,
-    SpaRouterModule.forRoot([], {
-      spaActionsMode: 'after', // default is 'before'
-    }),
-  ],
-});
-```
-
-or through token `ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN`:
-
-```ts
-import { ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/module-router';
-import { provide } from '@tramvai/core';
-
-const providers = [
-  // ...,
-  provide({
-    provide: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
-    useValue: 'after',
-  }),
-];
-```
-
-## How to
-
-### Working with navigation in providers and actions
-
-In this case, it is best to use the [PAGE_SERVICE_TOKEN](#page_service_token)
-
-```ts
-import { provide, createAction } from '@tramvai/core';
-import { PAGE_SERVICE_TOKEN } from '@tramvai/module-router';
-
-const provider = provide({
-  provide: 'token',
-  useFactory: ({ pageService }) => {
-    if (pageService().getCurrentUrl().pathname === '/test/') {
-      return pageService.navigate({ url: '/redirect/', replace: true });
-    }
-  },
-  deps: {
-    pageService: PAGE_SERVICE_TOKEN,
-  },
-});
-
-const action = createAction({
-  name: 'action',
-  fn: (_, __, { pageService }) => {
-    if (pageService.getConfig().pageComponent === 'pageComponent') {
-      return page.updateCurrentRoute({ query: { test: 'true' } });
-    }
-  },
-  deps: {
-    pageService: PAGE_SERVICE_TOKEN,
-  },
-});
-```
-
-### Working with navigation in React components
-
-You can work with routing inside React components using hooks and components - `useNavigate`, `useRoute`, `Link` from the [@tinkoff/router](references/libs/router.md#интеграция-с-react)
-
-<p>
-<details>
-<summary>An example of working with navigation in the application</summary>
-
-@inline ../../../examples/how-to/router-navigate/index.tsx
-
-</details>
-</p>
-
-### How to set static routes
-
-[RouterModule](references/modules/router.md) allows you to add new routes when configuring your application.
-The second way is to pass static routes to DI via the `ROUTES_TOKEN` token.
-
-<p>
-<details>
-<summary>An example of adding static routes to an application</summary>
-
-@inline ../../../examples/how-to/router-static-routes/index.tsx
-
-</details>
-</p>
-
-### How to set Route Guard
-
-[ROUTER_GUARD_TOKEN](references/modules/router.md#router_guard_token) is set as an asynchronous function, which allows you to perform various actions and influence the routing behavior.
-
-<p>
-<details>
-<summary>Example router guards job in application</summary>
-
-@inline ../../../examples/how-to/router-guards/index.tsx
-
-</details>
-</p>
-
-### How to set the Not found route
-
-The Not found route is used if the corresponding route is not found for the url.
-
-Such a route is specified in the list of routes with the special `*` character in the `path` property.
-
-<p>
-<details>
-<summary>An example of setting a Not Found route in an application</summary>
-
-@inline ../../../examples/how-to/router-not-found/index.tsx
-
-</details>
-</p>
-
-### Testing
-
-#### Testing ROUTER_GUARD_TOKEN extensions
-
-If you have a module or providers that define `ROUTER_GUARD_TOKEN`, then it will be convenient to use special utilities to test them separately
-
-```ts
-import { ROUTER_GUARD_TOKEN } from '@tramvai/tokens-router';
-import { testGuard } from '@tramvai/module-router/tests';
-import { CustomModule } from './module';
-import { providers } from './providers';
-
-describe('router guards', () => {
-  it('should redirect from guard', async () => {
-    const { router } = testGuard({
-      providers,
-    });
-
-    await router.navigate('/test/');
-
-    expect(router.getCurrentUrl()).toMatchObject({
-      path: '/redirect/',
-    });
-  });
-
-  it('should block navigation', async () => {
-    const { router } = testGuard({
-      modules: [CustomModule],
-    });
-
-    expect(router.getCurrentUrl()).toMatchObject({ path: '/' });
-
-    await router.navigate('/test/').catch(() => null);
-
-    expect(router.getCurrentUrl()).toMatchObject({
-      path: '/',
-    });
-  });
-});
-```
-
-## Exported tokens
-
-[link](references/tokens/router-tokens.md)