@tramvai/module-router 2.109.1 → 2.111.0

package/lib/modules/common.browser.js

@@ -1,14 +1,13 @@
 import flatten from '@tinkoff/utils/array/flatten';
 import { provide, commandLineListTokens } from '@tramvai/core';
 import { setLogger } from '@tinkoff/router';
-import { LOGGER_TOKEN, COMPONENT_REGISTRY_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
-import { ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_GUARD_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import { LOGGER_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
+import { ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_GUARD_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
 import { routerClassToken, additionalRouterParameters, routeTransformToken, onChangeHooksToken, beforeResolveHooksToken, beforeNavigateHooksToken, afterNavigateHooksToken, beforeUpdateCurrentHooksToken, afterUpdateCurrentHooksToken } from './tokens.browser.js';
 import { RouterStore } from '../stores/RouterStore.browser.js';
 import { commonGuards } from './guards/common/index.browser.js';
 import { commonHooks } from './hooks/common/index.browser.js';
 import { commonTokens } from './tokens/common/index.browser.js';
-import { PageService } from '../services/page.browser.js';
 import { providers as providers$1 } from './fileSystemPages.browser.js';
 
 const providers = [
@@ -123,14 +122,6 @@ const providers = [
         // рассмотреть возможность замены после доработок экшенов
         useValue: 'after',
     }),
-    provide({
-        provide: PAGE_SERVICE_TOKEN,
-        useClass: PageService,
-        deps: {
-            router: ROUTER_TOKEN,
-            componentRegistry: COMPONENT_REGISTRY_TOKEN,
-        },
-    }),
     provide({
         provide: COMBINE_REDUCERS,
         multi: true,

package/lib/modules/common.d.ts

@@ -1,6 +1,10 @@
 import type { Provider } from '@tinkoff/dippy';
 declare module '@tinkoff/router' {
     interface RouteConfig {
+        bundle?: string;
+        pageComponent?: string;
+        layoutComponent?: string;
+        nestedLayoutComponent?: string;
         forceRouteResolve?: boolean;
     }
 }

package/lib/modules/common.es.js

@@ -1,14 +1,13 @@
 import flatten from '@tinkoff/utils/array/flatten';
 import { provide, commandLineListTokens } from '@tramvai/core';
 import { setLogger } from '@tinkoff/router';
-import { LOGGER_TOKEN, COMPONENT_REGISTRY_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
-import { ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_GUARD_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import { LOGGER_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
+import { ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_GUARD_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
 import { routerClassToken, additionalRouterParameters, routeTransformToken, onChangeHooksToken, beforeResolveHooksToken, beforeNavigateHooksToken, afterNavigateHooksToken, beforeUpdateCurrentHooksToken, afterUpdateCurrentHooksToken } from './tokens.es.js';
 import { RouterStore } from '../stores/RouterStore.es.js';
 import { commonGuards } from './guards/common/index.es.js';
 import { commonHooks } from './hooks/common/index.es.js';
 import { commonTokens } from './tokens/common/index.es.js';
-import { PageService } from '../services/page.es.js';
 import { providers as providers$1 } from './fileSystemPages.es.js';
 
 const providers = [
@@ -123,14 +122,6 @@ const providers = [
         // рассмотреть возможность замены после доработок экшенов
         useValue: 'after',
     }),
-    provide({
-        provide: PAGE_SERVICE_TOKEN,
-        useClass: PageService,
-        deps: {
-            router: ROUTER_TOKEN,
-            componentRegistry: COMPONENT_REGISTRY_TOKEN,
-        },
-    }),
     provide({
         provide: COMBINE_REDUCERS,
         multi: true,

package/lib/modules/common.js

@@ -12,7 +12,6 @@ var RouterStore = require('../stores/RouterStore.js');
 var index = require('./guards/common/index.js');
 var index$1 = require('./hooks/common/index.js');
 var index$2 = require('./tokens/common/index.js');
-var page = require('../services/page.js');
 var fileSystemPages = require('./fileSystemPages.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -131,14 +130,6 @@ const providers = [
         // рассмотреть возможность замены после доработок экшенов
         useValue: 'after',
     }),
-    core.provide({
-        provide: tokensRouter.PAGE_SERVICE_TOKEN,
-        useClass: page.PageService,
-        deps: {
-            router: tokensRouter.ROUTER_TOKEN,
-            componentRegistry: tokensCommon.COMPONENT_REGISTRY_TOKEN,
-        },
-    }),
     core.provide({
         provide: tokensCommon.COMBINE_REDUCERS,
         multi: true,

package/lib/modules/guards/common/index.browser.js

@@ -1,24 +1,22 @@
-import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, RESPONSE_MANAGER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN } from '@tramvai/tokens-common';
-import { ROUTER_GUARD_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import { provide } from '@tramvai/core';
+import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import { ROUTER_GUARD_TOKEN, PAGE_REGISTRY_TOKEN } from '@tramvai/tokens-router';
 import { loadBundle } from './loadBundle.browser.js';
 import { internalError } from './internalError.browser.js';
 
 const commonGuards = [
-    {
+    provide({
         provide: ROUTER_GUARD_TOKEN,
         multi: true,
         useFactory: loadBundle,
         deps: {
             logger: LOGGER_TOKEN,
             bundleManager: BUNDLE_MANAGER_TOKEN,
-            actionRegistry: ACTION_REGISTRY_TOKEN,
             responseManager: RESPONSE_MANAGER_TOKEN,
-            dispatcher: DISPATCHER_TOKEN,
-            dispatcherContext: DISPATCHER_CONTEXT_TOKEN,
-            pageService: PAGE_SERVICE_TOKEN,
+            pageRegistry: PAGE_REGISTRY_TOKEN,
         },
-    },
-    {
+    }),
+    provide({
         provide: ROUTER_GUARD_TOKEN,
         multi: true,
         useFactory: internalError,
@@ -26,7 +24,7 @@ const commonGuards = [
             logger: LOGGER_TOKEN,
             responseManager: RESPONSE_MANAGER_TOKEN,
         },
-    },
+    }),
 ];
 
 export { commonGuards };

package/lib/modules/guards/common/index.es.js

@@ -1,24 +1,22 @@
-import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, RESPONSE_MANAGER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN } from '@tramvai/tokens-common';
-import { ROUTER_GUARD_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import { provide } from '@tramvai/core';
+import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import { ROUTER_GUARD_TOKEN, PAGE_REGISTRY_TOKEN } from '@tramvai/tokens-router';
 import { loadBundle } from './loadBundle.es.js';
 import { internalError } from './internalError.es.js';
 
 const commonGuards = [
-    {
+    provide({
         provide: ROUTER_GUARD_TOKEN,
         multi: true,
         useFactory: loadBundle,
         deps: {
             logger: LOGGER_TOKEN,
             bundleManager: BUNDLE_MANAGER_TOKEN,
-            actionRegistry: ACTION_REGISTRY_TOKEN,
             responseManager: RESPONSE_MANAGER_TOKEN,
-            dispatcher: DISPATCHER_TOKEN,
-            dispatcherContext: DISPATCHER_CONTEXT_TOKEN,
-            pageService: PAGE_SERVICE_TOKEN,
+            pageRegistry: PAGE_REGISTRY_TOKEN,
         },
-    },
-    {
+    }),
+    provide({
         provide: ROUTER_GUARD_TOKEN,
         multi: true,
         useFactory: internalError,
@@ -26,7 +24,7 @@ const commonGuards = [
             logger: LOGGER_TOKEN,
             responseManager: RESPONSE_MANAGER_TOKEN,
         },
-    },
+    }),
 ];
 
 export { commonGuards };

package/lib/modules/guards/common/index.js

@@ -2,27 +2,25 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var core = require('@tramvai/core');
 var tokensCommon = require('@tramvai/tokens-common');
 var tokensRouter = require('@tramvai/tokens-router');
 var loadBundle = require('./loadBundle.js');
 var internalError = require('./internalError.js');
 
 const commonGuards = [
-    {
+    core.provide({
         provide: tokensRouter.ROUTER_GUARD_TOKEN,
         multi: true,
         useFactory: loadBundle.loadBundle,
         deps: {
             logger: tokensCommon.LOGGER_TOKEN,
             bundleManager: tokensCommon.BUNDLE_MANAGER_TOKEN,
-            actionRegistry: tokensCommon.ACTION_REGISTRY_TOKEN,
             responseManager: tokensCommon.RESPONSE_MANAGER_TOKEN,
-            dispatcher: tokensCommon.DISPATCHER_TOKEN,
-            dispatcherContext: tokensCommon.DISPATCHER_CONTEXT_TOKEN,
-            pageService: tokensRouter.PAGE_SERVICE_TOKEN,
+            pageRegistry: tokensRouter.PAGE_REGISTRY_TOKEN,
         },
-    },
-    {
+    }),
+    core.provide({
         provide: tokensRouter.ROUTER_GUARD_TOKEN,
         multi: true,
         useFactory: internalError.internalError,
@@ -30,7 +28,7 @@ const commonGuards = [
             logger: tokensCommon.LOGGER_TOKEN,
             responseManager: tokensCommon.RESPONSE_MANAGER_TOKEN,
         },
-    },
+    }),
 ];
 
 exports.commonGuards = commonGuards;

package/lib/modules/guards/common/loadBundle.browser.js

@@ -1,57 +1,22 @@
-import isArray from '@tinkoff/utils/is/array';
-import { resolveLazyComponent } from '@tramvai/react';
-
-const loadBundle = ({ bundleManager, logger, actionRegistry, responseManager, dispatcher, dispatcherContext, pageService, }) => {
+const loadBundle = ({ bundleManager, logger, responseManager, pageRegistry, }) => {
     const log = logger('route:load-bundles');
     return async ({ to }) => {
-        var _a;
         log.debug({
             event: 'load-bundle',
             route: to,
         });
-        const { bundle, pageComponent, nestedLayoutComponent } = to.config;
+        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;
         }
-        // Пытаемся загрузить и в случае инициализации на клиенте, т.к.
-        // несмотря на наличие бандла в разметке, все равно мы должны дождаться
-        // его загрузки перед рендером
         try {
-            const promises = [];
-            // for file-system pages bundle is virtual, so it will be loaded in parallel with nested layout
-            // for classic bundles, page component will be loaded after bundle loading
-            promises.push(bundleManager.get(bundle, pageComponent));
-            if (nestedLayoutComponent) {
-                promises.push(resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout')));
-            }
-            const [resolvedBundle, resolvedLayout] = await Promise.all(promises);
-            const { components, reducers } = resolvedBundle;
-            const component = components[pageComponent];
-            // pageComponent should have required fields even if it is lazy,
-            // thanks to `git log 9466cb32bfb71ba49144ef839d3d5bce246e213c -L90,103:packages/modules/common/src/bundleManager/bundleManager.ts`
-            (_a = component === null || component === void 0 ? void 0 : component.reducers) === null || _a === void 0 ? void 0 : _a.forEach((reducer) => dispatcherContext.getStore(reducer));
-            reducers === null || reducers === void 0 ? void 0 : reducers.forEach((reducer) => dispatcherContext.getStore(reducer));
-            // @todo: reuse logic from bundleManager?
-            // register nested layout actions and reducers for current page
-            if (resolvedLayout) {
-                if ('actions' in resolvedLayout && isArray(resolvedLayout.actions)) {
-                    actionRegistry.add(pageComponent, resolvedLayout.actions);
-                }
-                if ('reducers' in resolvedLayout && isArray(resolvedLayout.reducers)) {
-                    resolvedLayout.reducers.forEach((reducer) => {
-                        dispatcher.registerStore(reducer);
-                        dispatcherContext.getStore(reducer);
-                    });
-                }
-            }
+            await pageRegistry.resolve(to);
         }
         catch (error) {
             log.error({

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

@@ -1,12 +1,9 @@
 import type { NavigationGuard } from '@tinkoff/router';
-import type { BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, LOGGER_TOKEN, RESPONSE_MANAGER_TOKEN, DISPATCHER_CONTEXT_TOKEN, DISPATCHER_TOKEN } from '@tramvai/tokens-common';
-import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
-export declare const loadBundle: ({ bundleManager, logger, actionRegistry, responseManager, dispatcher, dispatcherContext, pageService, }: {
+import type { BUNDLE_MANAGER_TOKEN, LOGGER_TOKEN, RESPONSE_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import type { PAGE_REGISTRY_TOKEN } from '@tramvai/tokens-router';
+export declare const loadBundle: ({ bundleManager, logger, responseManager, pageRegistry, }: {
     bundleManager: typeof BUNDLE_MANAGER_TOKEN;
     logger: typeof LOGGER_TOKEN;
-    actionRegistry: typeof ACTION_REGISTRY_TOKEN;
     responseManager: typeof RESPONSE_MANAGER_TOKEN;
-    dispatcher: typeof DISPATCHER_TOKEN;
-    dispatcherContext: typeof DISPATCHER_CONTEXT_TOKEN;
-    pageService: typeof PAGE_SERVICE_TOKEN;
+    pageRegistry: typeof PAGE_REGISTRY_TOKEN;
 }) => NavigationGuard;

package/lib/modules/guards/common/loadBundle.es.js

@@ -1,57 +1,22 @@
-import isArray from '@tinkoff/utils/is/array';
-import { resolveLazyComponent } from '@tramvai/react';
-
-const loadBundle = ({ bundleManager, logger, actionRegistry, responseManager, dispatcher, dispatcherContext, pageService, }) => {
+const loadBundle = ({ bundleManager, logger, responseManager, pageRegistry, }) => {
     const log = logger('route:load-bundles');
     return async ({ to }) => {
-        var _a;
         log.debug({
             event: 'load-bundle',
             route: to,
         });
-        const { bundle, pageComponent, nestedLayoutComponent } = to.config;
+        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;
         }
-        // Пытаемся загрузить и в случае инициализации на клиенте, т.к.
-        // несмотря на наличие бандла в разметке, все равно мы должны дождаться
-        // его загрузки перед рендером
         try {
-            const promises = [];
-            // for file-system pages bundle is virtual, so it will be loaded in parallel with nested layout
-            // for classic bundles, page component will be loaded after bundle loading
-            promises.push(bundleManager.get(bundle, pageComponent));
-            if (nestedLayoutComponent) {
-                promises.push(resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout')));
-            }
-            const [resolvedBundle, resolvedLayout] = await Promise.all(promises);
-            const { components, reducers } = resolvedBundle;
-            const component = components[pageComponent];
-            // pageComponent should have required fields even if it is lazy,
-            // thanks to `git log 9466cb32bfb71ba49144ef839d3d5bce246e213c -L90,103:packages/modules/common/src/bundleManager/bundleManager.ts`
-            (_a = component === null || component === void 0 ? void 0 : component.reducers) === null || _a === void 0 ? void 0 : _a.forEach((reducer) => dispatcherContext.getStore(reducer));
-            reducers === null || reducers === void 0 ? void 0 : reducers.forEach((reducer) => dispatcherContext.getStore(reducer));
-            // @todo: reuse logic from bundleManager?
-            // register nested layout actions and reducers for current page
-            if (resolvedLayout) {
-                if ('actions' in resolvedLayout && isArray(resolvedLayout.actions)) {
-                    actionRegistry.add(pageComponent, resolvedLayout.actions);
-                }
-                if ('reducers' in resolvedLayout && isArray(resolvedLayout.reducers)) {
-                    resolvedLayout.reducers.forEach((reducer) => {
-                        dispatcher.registerStore(reducer);
-                        dispatcherContext.getStore(reducer);
-                    });
-                }
-            }
+            await pageRegistry.resolve(to);
         }
         catch (error) {
             log.error({

package/lib/modules/guards/common/loadBundle.js

@@ -2,64 +2,25 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var isArray = require('@tinkoff/utils/is/array');
-var react = require('@tramvai/react');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
-
-const loadBundle = ({ bundleManager, logger, actionRegistry, responseManager, dispatcher, dispatcherContext, pageService, }) => {
+const loadBundle = ({ bundleManager, logger, responseManager, pageRegistry, }) => {
     const log = logger('route:load-bundles');
     return async ({ to }) => {
-        var _a;
         log.debug({
             event: 'load-bundle',
             route: to,
         });
-        const { bundle, pageComponent, nestedLayoutComponent } = to.config;
+        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;
         }
-        // Пытаемся загрузить и в случае инициализации на клиенте, т.к.
-        // несмотря на наличие бандла в разметке, все равно мы должны дождаться
-        // его загрузки перед рендером
         try {
-            const promises = [];
-            // for file-system pages bundle is virtual, so it will be loaded in parallel with nested layout
-            // for classic bundles, page component will be loaded after bundle loading
-            promises.push(bundleManager.get(bundle, pageComponent));
-            if (nestedLayoutComponent) {
-                promises.push(react.resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout')));
-            }
-            const [resolvedBundle, resolvedLayout] = await Promise.all(promises);
-            const { components, reducers } = resolvedBundle;
-            const component = components[pageComponent];
-            // pageComponent should have required fields even if it is lazy,
-            // thanks to `git log 9466cb32bfb71ba49144ef839d3d5bce246e213c -L90,103:packages/modules/common/src/bundleManager/bundleManager.ts`
-            (_a = component === null || component === void 0 ? void 0 : component.reducers) === null || _a === void 0 ? void 0 : _a.forEach((reducer) => dispatcherContext.getStore(reducer));
-            reducers === null || reducers === void 0 ? void 0 : reducers.forEach((reducer) => dispatcherContext.getStore(reducer));
-            // @todo: reuse logic from bundleManager?
-            // register nested layout actions and reducers for current page
-            if (resolvedLayout) {
-                if ('actions' in resolvedLayout && isArray__default["default"](resolvedLayout.actions)) {
-                    actionRegistry.add(pageComponent, resolvedLayout.actions);
-                }
-                if ('reducers' in resolvedLayout && isArray__default["default"](resolvedLayout.reducers)) {
-                    resolvedLayout.reducers.forEach((reducer) => {
-                        dispatcher.registerStore(reducer);
-                        dispatcherContext.getStore(reducer);
-                    });
-                }
-            }
+            await pageRegistry.resolve(to);
         }
         catch (error) {
             log.error({

package/lib/modules/tokens/browser/index.d.ts

@@ -22,13 +22,7 @@ export declare const clientTokens: (import("@tinkoff/dippy/lib/Provider").ValueP
         token: import("@tramvai/tokens-router").RouteResolve & {
             __type?: "base token";
         };
-        optional: boolean;
-    };
-    componentRegistry: import("@tramvai/tokens-common").ComponentRegistry & {
-        __type?: "base token";
-    };
-    bundleManager: import("@tramvai/tokens-common").BundleManager & {
-        __type?: "base token";
+        optional: true;
     };
     logger: import("@tramvai/tokens-common").Logger & ((configOrName: string | {
         [key: string]: any;
@@ -44,6 +38,15 @@ export declare const clientTokens: (import("@tinkoff/dippy/lib/Provider").ValueP
     } & {
         __type?: "base token";
     };
+    pageRegistry: import("@tramvai/tokens-router").PageRegistry & {
+        __type?: "base token";
+    };
+    prefetchHandlers: {
+        token: ((route: import("@tinkoff/router").Route) => Promise<void>) & {
+            __type?: "multi token";
+        };
+        optional: true;
+    };
 }, {
     prefetch: (url: string) => Promise<void>;
 }> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithoutDeps<{
@@ -59,13 +62,7 @@ export declare const clientTokens: (import("@tinkoff/dippy/lib/Provider").ValueP
         token: import("@tramvai/tokens-router").RouteResolve & {
             __type?: "base token";
         };
-        optional: boolean;
-    };
-    componentRegistry: import("@tramvai/tokens-common").ComponentRegistry & {
-        __type?: "base token";
-    };
-    bundleManager: import("@tramvai/tokens-common").BundleManager & {
-        __type?: "base token";
+        optional: true;
     };
     logger: import("@tramvai/tokens-common").Logger & ((configOrName: string | {
         [key: string]: any;
@@ -81,6 +78,15 @@ export declare const clientTokens: (import("@tinkoff/dippy/lib/Provider").ValueP
     } & {
         __type?: "base token";
     };
+    pageRegistry: import("@tramvai/tokens-router").PageRegistry & {
+        __type?: "base token";
+    };
+    prefetchHandlers: {
+        token: ((route: import("@tinkoff/router").Route) => Promise<void>) & {
+            __type?: "multi token";
+        };
+        optional: true;
+    };
 }, {
     prefetch: (url: string) => Promise<void>;
 }> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithoutDeps<{

package/lib/modules/tokens/browser/prefetch.browser.js

@@ -1,10 +1,8 @@
-import { createToken, provide } from '@tramvai/core';
-import { COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, LOGGER_TOKEN } from '@tramvai/tokens-common';
-import { LINK_PREFETCH_MANAGER_TOKEN, ROUTER_TOKEN, ROUTE_RESOLVE_TOKEN } from '@tramvai/tokens-router';
+import { createToken, provide, optional } from '@tramvai/core';
+import { LOGGER_TOKEN } from '@tramvai/tokens-common';
+import { LINK_PREFETCH_MANAGER_TOKEN, ROUTER_TOKEN, ROUTE_RESOLVE_TOKEN, PAGE_REGISTRY_TOKEN, LINK_PREFETCH_HANDLER_TOKEN } from '@tramvai/tokens-router';
 import { parse } from '@tinkoff/url';
-import { resolveLazyComponent } from '@tramvai/react';
 import { scheduling } from '@tramvai/state';
-import { isFileSystemPageComponent } from '@tramvai/experiments';
 import { routeTransformToken } from '../../tokens.browser.js';
 
 const PREFETCHED_LINKS_CACHE_TOKEN = createToken();
@@ -37,7 +35,7 @@ const prefetchProviders = [
     }),
     provide({
         provide: LINK_PREFETCH_MANAGER_TOKEN,
-        useFactory: ({ router, routeTransform, routeResolve, componentRegistry, bundleManager, logger, prefetchedLinksCache, prefetchedLinksQueue, }) => {
+        useFactory: ({ router, routeTransform, routeResolve, logger, prefetchedLinksCache, prefetchedLinksQueue, pageRegistry, prefetchHandlers, }) => {
             const log = logger('link-prefetch-manager');
             const prefetch = async (url) => {
                 // prefetch needed for cache assets by browser, so we want to prefetch resources for any page only once.
@@ -68,33 +66,18 @@ const prefetchProviders = [
                     return;
                 }
                 // @todo: очередь запросов!
-                // get name of everything what we need to prefetch,
-                // @loadable will load all scripts and styles for us
-                const { config: { pageComponent, bundle, nestedLayoutComponent }, } = route;
-                const promises = [];
-                // no need for bundle and page component actions amd reducers initialization,
-                // so copy only part of `modules/guards/common/loadBundle.ts` logic,
-                // all relative assets will be fetched
-                if (bundleManager.has(bundle, pageComponent)) {
-                    promises.push(bundleManager.get(bundle, pageComponent));
-                }
-                // no need for nestedLayoutComponent actions amd reducers initialization,
-                // so copy only part of `modules/guards/common/loadBundle.ts` logic,
-                // all relative assets will be fetched
-                if (nestedLayoutComponent) {
-                    promises.push(resolveLazyComponent(componentRegistry.get(nestedLayoutComponent, isFileSystemPageComponent(pageComponent) ? '__default' : bundle)));
-                }
-                await Promise.all(promises)
-                    .then(() => {
+                try {
+                    await pageRegistry.resolve(route);
+                    await Promise.all(prefetchHandlers.map((handler) => handler(route)));
                     log.info({ event: 'prefetch-route-success', url });
-                })
-                    .catch((error) => {
+                }
+                catch (error) {
                     log.warn({
                         event: 'prefetch-fail',
                         url,
                         error,
                     });
-                });
+                }
             };
             return {
                 prefetch: (url) => {
@@ -106,15 +89,12 @@ const prefetchProviders = [
         deps: {
             router: ROUTER_TOKEN,
             routeTransform: routeTransformToken,
-            routeResolve: {
-                token: ROUTE_RESOLVE_TOKEN,
-                optional: true,
-            },
-            componentRegistry: COMPONENT_REGISTRY_TOKEN,
-            bundleManager: BUNDLE_MANAGER_TOKEN,
+            routeResolve: optional(ROUTE_RESOLVE_TOKEN),
             logger: LOGGER_TOKEN,
             prefetchedLinksCache: PREFETCHED_LINKS_CACHE_TOKEN,
             prefetchedLinksQueue: PREFETCHED_LINKS_QUEUE_TOKEN,
+            pageRegistry: PAGE_REGISTRY_TOKEN,
+            prefetchHandlers: optional(LINK_PREFETCH_HANDLER_TOKEN),
         },
     }),
 ];

package/lib/modules/tokens/browser/prefetch.d.ts

@@ -1,3 +1,4 @@
+import type { Route } from '@tinkoff/router';
 export declare const prefetchProviders: (import("@tramvai/core").Provider<unknown, Set<string>> | import("@tramvai/core").Provider<unknown, {
     add(run: () => Promise<void>): Promise<void>;
 }> | import("@tramvai/core").Provider<{
@@ -11,13 +12,7 @@ export declare const prefetchProviders: (import("@tramvai/core").Provider<unknow
         token: import("@tramvai/tokens-router").RouteResolve & {
             __type?: "base token";
         };
-        optional: boolean;
-    };
-    componentRegistry: import("@tramvai/tokens-common").ComponentRegistry & {
-        __type?: "base token";
-    };
-    bundleManager: import("@tramvai/tokens-common").BundleManager & {
-        __type?: "base token";
+        optional: true;
     };
     logger: import("@tramvai/tokens-common").Logger & ((configOrName: string | {
         [key: string]: any;
@@ -33,6 +28,15 @@ export declare const prefetchProviders: (import("@tramvai/core").Provider<unknow
     } & {
         __type?: "base token";
     };
+    pageRegistry: import("@tramvai/tokens-router").PageRegistry & {
+        __type?: "base token";
+    };
+    prefetchHandlers: {
+        token: ((route: Route) => Promise<void>) & {
+            __type?: "multi token";
+        };
+        optional: true;
+    };
 }, {
     prefetch: (url: string) => Promise<void>;
 }>)[];