@tramvai/module-router 7.5.1 → 7.7.0

package/lib/index.browser.js

@@ -9,5 +9,5 @@ export { RouterStore, setCurrentNavigation, setUrlOnRehydrate } from './stores/R
 export { PageErrorStore, setPageErrorEvent } from './stores/PageErrorStore.browser.js';
 export { usePageService } from './hooks/usePageService.browser.js';
 export { stopRunAtError } from './modules/utils/stopRunAtError.browser.js';
-export { PRERENDER_HOOKS_TOKEN, ROUTER_VIEW_TRANSITIONS_ENABLED, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken } from './modules/tokens.browser.js';
+export { ROUTER_VIEW_TRANSITIONS_ENABLED, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken } from './modules/tokens.browser.js';
 export { deserializeError, serializeError } from '@tramvai/safe-strings';

package/lib/index.d.ts

@@ -8,7 +8,7 @@ export * from './stores/RouterStore';
 export * from './stores/PageErrorStore';
 export * from './hooks/usePageService';
 export { stopRunAtError } from './modules/utils/stopRunAtError';
-export { onChangeHooksToken, beforeNavigateHooksToken, afterNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, afterUpdateCurrentHooksToken, routerBundleInfoAdditionalToken, routeTransformToken, ROUTER_VIEW_TRANSITIONS_ENABLED, PRERENDER_HOOKS_TOKEN, } from './modules/tokens';
+export { onChangeHooksToken, beforeNavigateHooksToken, afterNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, afterUpdateCurrentHooksToken, routerBundleInfoAdditionalToken, routeTransformToken, ROUTER_VIEW_TRANSITIONS_ENABLED, } from './modules/tokens';
 declare module '@tinkoff/router' {
     interface RouteConfig {
         bundle?: string;

package/lib/index.es.js

@@ -8,5 +8,5 @@ export { RouterStore, setCurrentNavigation, setUrlOnRehydrate } from './stores/R
 export { PageErrorStore, setPageErrorEvent } from './stores/PageErrorStore.es.js';
 export { usePageService } from './hooks/usePageService.es.js';
 export { stopRunAtError } from './modules/utils/stopRunAtError.es.js';
-export { PRERENDER_HOOKS_TOKEN, ROUTER_VIEW_TRANSITIONS_ENABLED, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken } from './modules/tokens.es.js';
+export { ROUTER_VIEW_TRANSITIONS_ENABLED, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken } from './modules/tokens.es.js';
 export { deserializeError, serializeError } from '@tramvai/safe-strings';

package/lib/index.js

@@ -57,7 +57,6 @@ exports.PageErrorStore = PageErrorStore.PageErrorStore;
 exports.setPageErrorEvent = PageErrorStore.setPageErrorEvent;
 exports.usePageService = usePageService.usePageService;
 exports.stopRunAtError = stopRunAtError.stopRunAtError;
-exports.PRERENDER_HOOKS_TOKEN = tokens.PRERENDER_HOOKS_TOKEN;
 exports.ROUTER_VIEW_TRANSITIONS_ENABLED = tokens.ROUTER_VIEW_TRANSITIONS_ENABLED;
 exports.afterNavigateHooksToken = tokens.afterNavigateHooksToken;
 exports.afterUpdateCurrentHooksToken = tokens.afterUpdateCurrentHooksToken;

package/lib/modules/tokens/server/bundleInfo.es.js

@@ -1,9 +1,9 @@
 import flatten from '@tinkoff/utils/array/flatten';
 import prop from '@tinkoff/utils/object/prop';
 import { createPapiMethod } from '@tramvai/papi';
-import { ROUTES_TOKEN } from '@tramvai/tokens-router';
+import { ROUTES_TOKEN, PRERENDER_HOOKS_TOKEN } from '@tramvai/tokens-router';
 import { isWildcard, isHistoryFallback } from '@tinkoff/router';
-import { routeTransformToken, routerBundleInfoAdditionalToken, PRERENDER_HOOKS_TOKEN } from '../../tokens.es.js';
+import { routeTransformToken, routerBundleInfoAdditionalToken } from '../../tokens.es.js';
 
 const deduplicateArray = (list) => {
     return Array.from(new Set(list));

package/lib/modules/tokens/server/bundleInfo.js

@@ -63,7 +63,7 @@ const bundleInfoPapi = papi.createPapiMethod({
         },
         routeTransform: tokens.routeTransformToken,
         getAdditionalRoutes: { token: tokens.routerBundleInfoAdditionalToken, optional: true },
-        hooks: tokens.PRERENDER_HOOKS_TOKEN,
+        hooks: tokensRouter.PRERENDER_HOOKS_TOKEN,
     },
 });
 const prerenderRoutesPapi = papi.createPapiMethod({
@@ -75,7 +75,7 @@ const prerenderRoutesPapi = papi.createPapiMethod({
         return routesList;
     },
     deps: {
-        hooks: tokens.PRERENDER_HOOKS_TOKEN,
+        hooks: tokensRouter.PRERENDER_HOOKS_TOKEN,
     },
 });
 

package/lib/modules/tokens/server/index.es.js

@@ -2,9 +2,9 @@ import prop from '@tinkoff/utils/object/prop';
 import { Scope, provide, TAPABLE_HOOK_FACTORY_TOKEN, commandLineListTokens, optional } from '@tramvai/core';
 import { REQUEST_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN, ASYNC_LOCAL_STORAGE_TOKEN } from '@tramvai/tokens-common';
 import { SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
-import { ROUTES_TOKEN, ROUTER_TOKEN } from '@tramvai/tokens-router';
+import { PRERENDER_HOOKS_TOKEN, ROUTES_TOKEN, ROUTER_TOKEN } from '@tramvai/tokens-router';
 import { HttpError, makeErrorSilent } from '@tinkoff/errors';
-import { additionalRouterParameters, PRERENDER_HOOKS_TOKEN, routerBundleInfoAdditionalToken, routeTransformToken } from '../../tokens.es.js';
+import { additionalRouterParameters, routerBundleInfoAdditionalToken, routeTransformToken } from '../../tokens.es.js';
 import { routerOptions } from './routerOptions.es.js';
 import { bundleInfoPapi, bundleInfoExtendedPapi, prerenderRoutesPapi, resolveRoutes, deduplicateArray } from './bundleInfo.es.js';
 import { prefetchProviders } from './prefetch.es.js';

package/lib/modules/tokens/server/index.js

@@ -46,7 +46,7 @@ const serverTokens = [
         useValue: bundleInfo.prerenderRoutesPapi,
     },
     core.provide({
-        provide: tokens.PRERENDER_HOOKS_TOKEN,
+        provide: tokensRouter.PRERENDER_HOOKS_TOKEN,
         scope: core.Scope.SINGLETON,
         useFactory: ({ hooksFactory }) => ({
             'prerender:routes': hooksFactory.createAsyncParallel('prerender:routes'),
@@ -76,7 +76,7 @@ const serverTokens = [
             };
         },
         deps: {
-            hooks: tokens.PRERENDER_HOOKS_TOKEN,
+            hooks: tokensRouter.PRERENDER_HOOKS_TOKEN,
             storage: tokensCommon.ASYNC_LOCAL_STORAGE_TOKEN,
         },
     }),
@@ -103,7 +103,7 @@ const serverTokens = [
             router: tokensRouter.ROUTER_TOKEN,
             requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
             responseManager: tokensCommon.RESPONSE_MANAGER_TOKEN,
-            hooks: tokens.PRERENDER_HOOKS_TOKEN,
+            hooks: tokensRouter.PRERENDER_HOOKS_TOKEN,
         },
     }),
     ...prefetch.prefetchProviders,

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

@@ -1,4 +1,33 @@
-export declare const prefetchProviders: import("@tramvai/core").Provider<unknown, {
+import { Route } from '@tinkoff/router';
+export declare const prefetchProviders: import("@tramvai/core").Provider<{
+    router: import("@tinkoff/router").AbstractRouter & {
+        __type?: "base token";
+    };
+    routeTransform: import("@tramvai/tokens-router").RouteTransform & {
+        __type?: "base token";
+    };
+    routeResolve: {
+        token: import("@tramvai/tokens-router").RouteResolve & {
+            __type?: "base token";
+        };
+        optional: true;
+    };
+    logger: import("@tramvai/tokens-common").Logger & ((configOrName: string | {
+        [key: string]: any;
+        name: string;
+    }) => import("@tramvai/tokens-common").Logger) & {
+        __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>;
 }>[];
 //# sourceMappingURL=prefetch.d.ts.map

package/lib/modules/tokens/server/prefetch.es.js

@@ -1,14 +1,63 @@
-import { provide } from '@tramvai/core';
-import { LINK_PREFETCH_MANAGER_TOKEN } from '@tramvai/tokens-router';
+import { parse } from '@tinkoff/url';
+import { provide, optional } from '@tramvai/core';
+import { LINK_PREFETCH_MANAGER_TOKEN, ROUTER_TOKEN, ROUTE_RESOLVE_TOKEN, PAGE_REGISTRY_TOKEN, LINK_PREFETCH_HANDLER_TOKEN } from '@tramvai/tokens-router';
+import { LOGGER_TOKEN } from '@tramvai/tokens-common';
+import { routeTransformToken } from '../../tokens.es.js';
 
-// do nothing on server side
-const prefetchManager = {
-    prefetch: async (url) => { },
-};
 const prefetchProviders = [
     provide({
         provide: LINK_PREFETCH_MANAGER_TOKEN,
-        useValue: prefetchManager,
+        useFactory: ({ router, routeTransform, routeResolve, logger, pageRegistry, prefetchHandlers, }) => {
+            const log = logger('link-prefetch-manager');
+            const prefetch = async (url) => {
+                log.info({ event: 'prefetch-route-init', url });
+                // first, try to find static or resolved dynamic route
+                let route = router.resolve(url);
+                // if route not found, try to resolve dynamic route,
+                // logic from `ROUTER_TOKEN` provider factory, without `router.addRoute` method call
+                if (!route && routeResolve) {
+                    const parsedUrl = parse(url);
+                    route = await routeResolve({
+                        url: parsedUrl,
+                        type: 'navigate',
+                    });
+                    if (route) {
+                        route = routeTransform(route);
+                        // warmup route for possible navigation
+                        router.addRoute(route);
+                    }
+                }
+                if (!route) {
+                    log.info({ event: 'prefetch-route-not-found', url });
+                    return;
+                }
+                try {
+                    await pageRegistry.resolve(route);
+                    await Promise.all(prefetchHandlers.map((handler) => handler(route)));
+                    log.info({ event: 'prefetch-route-success', url });
+                }
+                catch (error) {
+                    log.warn({
+                        event: 'prefetch-fail',
+                        url,
+                        error,
+                    });
+                }
+            };
+            return {
+                prefetch: (url) => {
+                    return prefetch(url);
+                },
+            };
+        },
+        deps: {
+            router: ROUTER_TOKEN,
+            routeTransform: routeTransformToken,
+            routeResolve: optional(ROUTE_RESOLVE_TOKEN),
+            logger: LOGGER_TOKEN,
+            pageRegistry: PAGE_REGISTRY_TOKEN,
+            prefetchHandlers: optional(LINK_PREFETCH_HANDLER_TOKEN),
+        },
     }),
 ];
 

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

@@ -2,17 +2,66 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var url = require('@tinkoff/url');
 var core = require('@tramvai/core');
 var tokensRouter = require('@tramvai/tokens-router');
+var tokensCommon = require('@tramvai/tokens-common');
+var tokens = require('../../tokens.js');
 
-// do nothing on server side
-const prefetchManager = {
-    prefetch: async (url) => { },
-};
 const prefetchProviders = [
     core.provide({
         provide: tokensRouter.LINK_PREFETCH_MANAGER_TOKEN,
-        useValue: prefetchManager,
+        useFactory: ({ router, routeTransform, routeResolve, logger, pageRegistry, prefetchHandlers, }) => {
+            const log = logger('link-prefetch-manager');
+            const prefetch = async (url$1) => {
+                log.info({ event: 'prefetch-route-init', url: url$1 });
+                // first, try to find static or resolved dynamic route
+                let route = router.resolve(url$1);
+                // if route not found, try to resolve dynamic route,
+                // logic from `ROUTER_TOKEN` provider factory, without `router.addRoute` method call
+                if (!route && routeResolve) {
+                    const parsedUrl = url.parse(url$1);
+                    route = await routeResolve({
+                        url: parsedUrl,
+                        type: 'navigate',
+                    });
+                    if (route) {
+                        route = routeTransform(route);
+                        // warmup route for possible navigation
+                        router.addRoute(route);
+                    }
+                }
+                if (!route) {
+                    log.info({ event: 'prefetch-route-not-found', url: url$1 });
+                    return;
+                }
+                try {
+                    await pageRegistry.resolve(route);
+                    await Promise.all(prefetchHandlers.map((handler) => handler(route)));
+                    log.info({ event: 'prefetch-route-success', url: url$1 });
+                }
+                catch (error) {
+                    log.warn({
+                        event: 'prefetch-fail',
+                        url: url$1,
+                        error,
+                    });
+                }
+            };
+            return {
+                prefetch: (url) => {
+                    return prefetch(url);
+                },
+            };
+        },
+        deps: {
+            router: tokensRouter.ROUTER_TOKEN,
+            routeTransform: tokens.routeTransformToken,
+            routeResolve: core.optional(tokensRouter.ROUTE_RESOLVE_TOKEN),
+            logger: tokensCommon.LOGGER_TOKEN,
+            pageRegistry: tokensRouter.PAGE_REGISTRY_TOKEN,
+            prefetchHandlers: core.optional(tokensRouter.LINK_PREFETCH_HANDLER_TOKEN),
+        },
     }),
 ];
 

package/lib/modules/tokens.browser.js

@@ -20,8 +20,5 @@ const routeTransformToken = createToken('router finalRouteTransform');
 const routerBundleInfoAdditionalToken = createToken('router bundleInfoAdditional', { scope: Scope.REQUEST });
 const ROUTER_VIEW_TRANSITIONS_ENABLED = createToken('router viewTransitionsEnabled');
 const BACK_NAVIGATION_WITHIN_ROUTE_TYPE = createToken('router backNavigationWithinRouteType');
-const PRERENDER_HOOKS_TOKEN = createToken('tramvai prerender hooks', {
-    scope: Scope.SINGLETON,
-});
 
-export { BACK_NAVIGATION_WITHIN_ROUTE_TYPE, PRERENDER_HOOKS_TOKEN, ROUTER_VIEW_TRANSITIONS_ENABLED, additionalRouterParameters, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken, routerClassToken };
+export { BACK_NAVIGATION_WITHIN_ROUTE_TYPE, ROUTER_VIEW_TRANSITIONS_ENABLED, additionalRouterParameters, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken, routerClassToken };

package/lib/modules/tokens.d.ts

@@ -1,5 +1,4 @@
-import { AsyncParallelTapableHookInstance, AsyncTapableHookInstance } from '@tinkoff/hook-runner';
-import type { NavigationHook, AbstractRouter, NavigationSyncHook, Route, BackNavigationType, NavigationRoute } from '@tinkoff/router';
+import type { NavigationHook, AbstractRouter, NavigationSyncHook, Route, BackNavigationType } from '@tinkoff/router';
 import type { RouteTransform } from '@tramvai/tokens-router';
 export declare const routerClassToken: (new (args_0: import("@tinkoff/router").Options) => AbstractRouter) & {
     __type?: "base token";
@@ -43,13 +42,4 @@ export declare const BACK_NAVIGATION_WITHIN_ROUTE_TYPE: (BackNavigationType.CURR
 }) | (BackNavigationType.PREVIOUS_TYPE & {
     __type?: "base token";
 });
-export type PrerenderHooksToken = {
-    'prerender:routes': AsyncParallelTapableHookInstance<string[]>;
-    'prerender:generate': AsyncTapableHookInstance<NavigationRoute & {
-        prerenderSkip?: boolean;
-    }>;
-};
-export declare const PRERENDER_HOOKS_TOKEN: PrerenderHooksToken & {
-    __type?: "base token";
-};
 //# sourceMappingURL=tokens.d.ts.map

package/lib/modules/tokens.es.js

@@ -20,8 +20,5 @@ const routeTransformToken = createToken('router finalRouteTransform');
 const routerBundleInfoAdditionalToken = createToken('router bundleInfoAdditional', { scope: Scope.REQUEST });
 const ROUTER_VIEW_TRANSITIONS_ENABLED = createToken('router viewTransitionsEnabled');
 const BACK_NAVIGATION_WITHIN_ROUTE_TYPE = createToken('router backNavigationWithinRouteType');
-const PRERENDER_HOOKS_TOKEN = createToken('tramvai prerender hooks', {
-    scope: Scope.SINGLETON,
-});
 
-export { BACK_NAVIGATION_WITHIN_ROUTE_TYPE, PRERENDER_HOOKS_TOKEN, ROUTER_VIEW_TRANSITIONS_ENABLED, additionalRouterParameters, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken, routerClassToken };
+export { BACK_NAVIGATION_WITHIN_ROUTE_TYPE, ROUTER_VIEW_TRANSITIONS_ENABLED, additionalRouterParameters, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken, routerClassToken };

package/lib/modules/tokens.js

@@ -24,12 +24,8 @@ const routeTransformToken = dippy.createToken('router finalRouteTransform');
 const routerBundleInfoAdditionalToken = dippy.createToken('router bundleInfoAdditional', { scope: dippy.Scope.REQUEST });
 const ROUTER_VIEW_TRANSITIONS_ENABLED = dippy.createToken('router viewTransitionsEnabled');
 const BACK_NAVIGATION_WITHIN_ROUTE_TYPE = dippy.createToken('router backNavigationWithinRouteType');
-const PRERENDER_HOOKS_TOKEN = dippy.createToken('tramvai prerender hooks', {
-    scope: dippy.Scope.SINGLETON,
-});
 
 exports.BACK_NAVIGATION_WITHIN_ROUTE_TYPE = BACK_NAVIGATION_WITHIN_ROUTE_TYPE;
-exports.PRERENDER_HOOKS_TOKEN = PRERENDER_HOOKS_TOKEN;
 exports.ROUTER_VIEW_TRANSITIONS_ENABLED = ROUTER_VIEW_TRANSITIONS_ENABLED;
 exports.additionalRouterParameters = additionalRouterParameters;
 exports.afterNavigateHooksToken = afterNavigateHooksToken;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "7.5.1",
+  "version": "7.7.0",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -26,29 +26,28 @@
   },
   "dependencies": {
     "@tinkoff/errors": "0.8.1",
-    "@tinkoff/hook-runner": "0.9.1",
-    "@tinkoff/router": "0.7.19",
+    "@tinkoff/router": "0.7.25",
     "@tinkoff/url": "0.13.1",
-    "@tramvai/experiments": "7.5.1",
-    "@tramvai/react": "7.5.1",
+    "@tramvai/experiments": "7.7.0",
+    "@tramvai/react": "7.7.0",
     "@tramvai/safe-strings": "0.10.1",
-    "@tramvai/tokens-child-app": "7.5.1",
-    "@tramvai/tokens-render": "7.5.1",
-    "@tramvai/tokens-router": "7.5.1",
-    "@tramvai/tokens-server": "7.5.1"
+    "@tramvai/tokens-child-app": "7.7.0",
+    "@tramvai/tokens-render": "7.7.0",
+    "@tramvai/tokens-router": "7.7.0",
+    "@tramvai/tokens-server": "7.7.0"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "0.13.2",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "7.5.1",
-    "@tramvai/core": "7.5.1",
-    "@tramvai/module-log": "7.5.1",
-    "@tramvai/module-server": "7.5.1",
-    "@tramvai/papi": "7.5.1",
-    "@tramvai/state": "7.5.1",
-    "@tramvai/test-helpers": "7.5.1",
-    "@tramvai/test-mocks": "7.5.1",
-    "@tramvai/tokens-common": "7.5.1",
+    "@tramvai/cli": "7.7.0",
+    "@tramvai/core": "7.7.0",
+    "@tramvai/module-log": "7.7.0",
+    "@tramvai/module-server": "7.7.0",
+    "@tramvai/papi": "7.7.0",
+    "@tramvai/state": "7.7.0",
+    "@tramvai/test-helpers": "7.7.0",
+    "@tramvai/test-mocks": "7.7.0",
+    "@tramvai/tokens-common": "7.7.0",
     "react": "*",
     "tslib": "^2.4.0"
   },