@tramvai/module-router 6.68.6 → 6.77.2

package/lib/index.browser.js

@@ -8,5 +8,5 @@ export { generateForRoot, routerForRoot } from './modules/utils/forRoot.browser.
 export { RouterStore, setCurrentNavigation, setUrlOnRehydrate } from './stores/RouterStore.browser.js';
 export { PageErrorStore, setPageErrorEvent } from './stores/PageErrorStore.browser.js';
 export { usePageService } from './hooks/usePageService.browser.js';
-export { ROUTER_VIEW_TRANSITIONS_ENABLED, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken } from './modules/tokens.browser.js';
+export { PRERENDER_HOOKS_TOKEN, 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

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

package/lib/index.es.js

@@ -7,5 +7,5 @@ export { generateForRoot, routerForRoot } from './modules/utils/forRoot.es.js';
 export { RouterStore, setCurrentNavigation, setUrlOnRehydrate } from './stores/RouterStore.es.js';
 export { PageErrorStore, setPageErrorEvent } from './stores/PageErrorStore.es.js';
 export { usePageService } from './hooks/usePageService.es.js';
-export { ROUTER_VIEW_TRANSITIONS_ENABLED, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken } from './modules/tokens.es.js';
+export { PRERENDER_HOOKS_TOKEN, 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

@@ -55,6 +55,7 @@ exports.setUrlOnRehydrate = RouterStore.setUrlOnRehydrate;
 exports.PageErrorStore = PageErrorStore.PageErrorStore;
 exports.setPageErrorEvent = PageErrorStore.setPageErrorEvent;
 exports.usePageService = usePageService.usePageService;
+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/common.browser.js

@@ -4,7 +4,7 @@ import { setLogger } from '@tinkoff/router';
 import { LOGGER_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
 import { ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_PLUGIN, ROUTER_GUARD_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
 import { RENDER_SLOTS, ResourceType, ResourceSlot } from '@tramvai/tokens-render';
-import { ROUTER_VIEW_TRANSITIONS_ENABLED, routerClassToken, additionalRouterParameters, routeTransformToken, onChangeHooksToken, beforeResolveHooksToken, beforeNavigateHooksToken, afterNavigateHooksToken, beforeUpdateCurrentHooksToken, afterUpdateCurrentHooksToken } from './tokens.browser.js';
+import { ROUTER_VIEW_TRANSITIONS_ENABLED, routerClassToken, additionalRouterParameters, routeTransformToken, BACK_NAVIGATION_WITHIN_ROUTE_TYPE, 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';
@@ -22,12 +22,13 @@ const providers = [
     }),
     provide({
         provide: ROUTER_TOKEN,
-        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, plugins, viewTransitionsEnabled, }) => {
+        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, plugins, viewTransitionsEnabled, backNavigationWithinRouteType, }) => {
             const router = new RouterClass({
                 ...additionalParameters,
                 trailingSlash: true,
                 mergeSlashes: true,
                 enableViewTransitions: process.env.__TRAMVAI_VIEW_TRANSITIONS === 'true' && viewTransitionsEnabled,
+                backNavigationWithinRouteType,
                 routes: flatten(routes ?? []).map(routeTransform),
                 plugins,
             });
@@ -63,6 +64,10 @@ const providers = [
             },
             plugins: optional(ROUTER_PLUGIN),
             viewTransitionsEnabled: ROUTER_VIEW_TRANSITIONS_ENABLED,
+            backNavigationWithinRouteType: {
+                token: BACK_NAVIGATION_WITHIN_ROUTE_TYPE,
+                optional: true,
+            },
         },
     }),
     provide({

package/lib/modules/common.es.js

@@ -4,7 +4,7 @@ import { setLogger } from '@tinkoff/router';
 import { LOGGER_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
 import { ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_PLUGIN, ROUTER_GUARD_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
 import { RENDER_SLOTS, ResourceType, ResourceSlot } from '@tramvai/tokens-render';
-import { ROUTER_VIEW_TRANSITIONS_ENABLED, routerClassToken, additionalRouterParameters, routeTransformToken, onChangeHooksToken, beforeResolveHooksToken, beforeNavigateHooksToken, afterNavigateHooksToken, beforeUpdateCurrentHooksToken, afterUpdateCurrentHooksToken } from './tokens.es.js';
+import { ROUTER_VIEW_TRANSITIONS_ENABLED, routerClassToken, additionalRouterParameters, routeTransformToken, BACK_NAVIGATION_WITHIN_ROUTE_TYPE, 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';
@@ -22,12 +22,13 @@ const providers = [
     }),
     provide({
         provide: ROUTER_TOKEN,
-        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, plugins, viewTransitionsEnabled, }) => {
+        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, plugins, viewTransitionsEnabled, backNavigationWithinRouteType, }) => {
             const router = new RouterClass({
                 ...additionalParameters,
                 trailingSlash: true,
                 mergeSlashes: true,
                 enableViewTransitions: process.env.__TRAMVAI_VIEW_TRANSITIONS === 'true' && viewTransitionsEnabled,
+                backNavigationWithinRouteType,
                 routes: flatten(routes ?? []).map(routeTransform),
                 plugins,
             });
@@ -63,6 +64,10 @@ const providers = [
             },
             plugins: optional(ROUTER_PLUGIN),
             viewTransitionsEnabled: ROUTER_VIEW_TRANSITIONS_ENABLED,
+            backNavigationWithinRouteType: {
+                token: BACK_NAVIGATION_WITHIN_ROUTE_TYPE,
+                optional: true,
+            },
         },
     }),
     provide({

package/lib/modules/common.js

@@ -30,12 +30,13 @@ const providers = [
     }),
     core.provide({
         provide: tokensRouter.ROUTER_TOKEN,
-        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, plugins, viewTransitionsEnabled, }) => {
+        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, plugins, viewTransitionsEnabled, backNavigationWithinRouteType, }) => {
             const router = new RouterClass({
                 ...additionalParameters,
                 trailingSlash: true,
                 mergeSlashes: true,
                 enableViewTransitions: process.env.__TRAMVAI_VIEW_TRANSITIONS === 'true' && viewTransitionsEnabled,
+                backNavigationWithinRouteType,
                 routes: flatten__default["default"](routes ?? []).map(routeTransform),
                 plugins,
             });
@@ -71,6 +72,10 @@ const providers = [
             },
             plugins: core.optional(tokensRouter.ROUTER_PLUGIN),
             viewTransitionsEnabled: tokens.ROUTER_VIEW_TRANSITIONS_ENABLED,
+            backNavigationWithinRouteType: {
+                token: tokens.BACK_NAVIGATION_WITHIN_ROUTE_TYPE,
+                optional: true,
+            },
         },
     }),
     core.provide({

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

@@ -1,2 +1,15 @@
+import { ROUTES_TOKEN } from '@tramvai/tokens-router';
+import { Route } from '@tinkoff/router';
+import { ExtractDependencyType } from '@tinkoff/dippy';
+import { routeTransformToken } from '../../tokens';
+import { routerBundleInfoAdditionalToken } from '../../tokens';
+export declare const deduplicateArray: <T>(list: T[]) => T[];
+export declare const resolveRoutes: ({ getAdditionalRoutes, routes, routeTransform, }: {
+    routes: ExtractDependencyType<typeof ROUTES_TOKEN>;
+    routeTransform: ExtractDependencyType<typeof routeTransformToken>;
+    getAdditionalRoutes?: ExtractDependencyType<typeof routerBundleInfoAdditionalToken>;
+}) => Promise<Route[]>;
+export declare const bundleInfoExtendedPapi: import("@tramvai/papi").Papi;
 export declare const bundleInfoPapi: import("@tramvai/papi").Papi;
+export declare const prerenderRoutesPapi: import("@tramvai/papi").Papi;
 //# sourceMappingURL=bundleInfo.d.ts.map

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

@@ -3,23 +3,49 @@ import prop from '@tinkoff/utils/object/prop';
 import { createPapiMethod } from '@tramvai/papi';
 import { ROUTES_TOKEN } from '@tramvai/tokens-router';
 import { isWildcard, isHistoryFallback } from '@tinkoff/router';
-import { routeTransformToken, routerBundleInfoAdditionalToken } from '../../tokens.es.js';
+import { routeTransformToken, routerBundleInfoAdditionalToken, PRERENDER_HOOKS_TOKEN } from '../../tokens.es.js';
 
 const deduplicateArray = (list) => {
     return Array.from(new Set(list));
 };
+const resolveRoutes = async ({ getAdditionalRoutes, routes, routeTransform, }) => {
+    const loadAdditional = getAdditionalRoutes ?? (() => []);
+    const additionalRoutes = (await loadAdditional()) ?? [];
+    return flatten(routes || [])
+        .concat(additionalRoutes)
+        .map(routeTransform)
+        .filter((route) => !isWildcard(route.path) && !isHistoryFallback(route.path));
+};
+const bundleInfoExtendedPapi = createPapiMethod({
+    method: 'get',
+    path: '/bundleInfoExtended',
+    async handler() {
+        const routesList = await resolveRoutes(this.deps);
+        return routesList.sort((a, b) => {
+            if (a.path < b.path) {
+                return -1;
+            }
+            if (a.path > b.path) {
+                return 1;
+            }
+            return 0;
+        });
+    },
+    deps: {
+        routes: {
+            token: ROUTES_TOKEN,
+            optional: true,
+        },
+        routeTransform: routeTransformToken,
+        getAdditionalRoutes: { token: routerBundleInfoAdditionalToken, optional: true },
+    },
+});
 const bundleInfoPapi = createPapiMethod({
     method: 'get',
     path: '/bundleInfo',
     async handler() {
-        const { getAdditionalRoutes, routes, routeTransform } = this.deps;
-        const loadAdditional = getAdditionalRoutes ?? (() => []);
-        return deduplicateArray(flatten(routes || [])
-            .concat((await loadAdditional()) ?? [])
-            .map(routeTransform)
-            .map(prop('path'))
-            .filter((path) => !isWildcard(path) && !isHistoryFallback(path))
-            .sort());
+        const routesList = await resolveRoutes(this.deps);
+        return deduplicateArray(routesList.map(prop('path'))).sort();
     },
     deps: {
         routes: {
@@ -28,7 +54,20 @@ const bundleInfoPapi = createPapiMethod({
         },
         routeTransform: routeTransformToken,
         getAdditionalRoutes: { token: routerBundleInfoAdditionalToken, optional: true },
+        hooks: PRERENDER_HOOKS_TOKEN,
+    },
+});
+const prerenderRoutesPapi = createPapiMethod({
+    method: 'get',
+    path: '/prerenderRoutes',
+    async handler() {
+        const routesList = [];
+        await this.deps.hooks['prerender:routes'].callPromise(routesList);
+        return routesList;
+    },
+    deps: {
+        hooks: PRERENDER_HOOKS_TOKEN,
     },
 });
 
-export { bundleInfoPapi };
+export { bundleInfoExtendedPapi, bundleInfoPapi, deduplicateArray, prerenderRoutesPapi, resolveRoutes };

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

@@ -17,18 +17,44 @@ var prop__default = /*#__PURE__*/_interopDefaultLegacy(prop);
 const deduplicateArray = (list) => {
     return Array.from(new Set(list));
 };
+const resolveRoutes = async ({ getAdditionalRoutes, routes, routeTransform, }) => {
+    const loadAdditional = getAdditionalRoutes ?? (() => []);
+    const additionalRoutes = (await loadAdditional()) ?? [];
+    return flatten__default["default"](routes || [])
+        .concat(additionalRoutes)
+        .map(routeTransform)
+        .filter((route) => !router.isWildcard(route.path) && !router.isHistoryFallback(route.path));
+};
+const bundleInfoExtendedPapi = papi.createPapiMethod({
+    method: 'get',
+    path: '/bundleInfoExtended',
+    async handler() {
+        const routesList = await resolveRoutes(this.deps);
+        return routesList.sort((a, b) => {
+            if (a.path < b.path) {
+                return -1;
+            }
+            if (a.path > b.path) {
+                return 1;
+            }
+            return 0;
+        });
+    },
+    deps: {
+        routes: {
+            token: tokensRouter.ROUTES_TOKEN,
+            optional: true,
+        },
+        routeTransform: tokens.routeTransformToken,
+        getAdditionalRoutes: { token: tokens.routerBundleInfoAdditionalToken, optional: true },
+    },
+});
 const bundleInfoPapi = papi.createPapiMethod({
     method: 'get',
     path: '/bundleInfo',
     async handler() {
-        const { getAdditionalRoutes, routes, routeTransform } = this.deps;
-        const loadAdditional = getAdditionalRoutes ?? (() => []);
-        return deduplicateArray(flatten__default["default"](routes || [])
-            .concat((await loadAdditional()) ?? [])
-            .map(routeTransform)
-            .map(prop__default["default"]('path'))
-            .filter((path) => !router.isWildcard(path) && !router.isHistoryFallback(path))
-            .sort());
+        const routesList = await resolveRoutes(this.deps);
+        return deduplicateArray(routesList.map(prop__default["default"]('path'))).sort();
     },
     deps: {
         routes: {
@@ -37,7 +63,24 @@ const bundleInfoPapi = papi.createPapiMethod({
         },
         routeTransform: tokens.routeTransformToken,
         getAdditionalRoutes: { token: tokens.routerBundleInfoAdditionalToken, optional: true },
+        hooks: tokens.PRERENDER_HOOKS_TOKEN,
+    },
+});
+const prerenderRoutesPapi = papi.createPapiMethod({
+    method: 'get',
+    path: '/prerenderRoutes',
+    async handler() {
+        const routesList = [];
+        await this.deps.hooks['prerender:routes'].callPromise(routesList);
+        return routesList;
+    },
+    deps: {
+        hooks: tokens.PRERENDER_HOOKS_TOKEN,
     },
 });
 
+exports.bundleInfoExtendedPapi = bundleInfoExtendedPapi;
 exports.bundleInfoPapi = bundleInfoPapi;
+exports.deduplicateArray = deduplicateArray;
+exports.prerenderRoutesPapi = prerenderRoutesPapi;
+exports.resolveRoutes = resolveRoutes;

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

@@ -1,3 +1,8 @@
-import { type Provider } from '@tramvai/core';
+import { DI_TOKEN, ExtractDependencyType, type Provider } from '@tramvai/core';
+declare module '@tramvai/tokens-common' {
+    interface AsyncLocalStorageState {
+        tramvaiRequestDi?: ExtractDependencyType<typeof DI_TOKEN>;
+    }
+}
 export declare const serverTokens: Provider[];
 //# sourceMappingURL=index.d.ts.map

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

@@ -1,11 +1,15 @@
-import { Scope } from '@tramvai/core';
-import { REQUEST_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN } from '@tramvai/tokens-common';
+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 { additionalRouterParameters } from '../../tokens.es.js';
+import { 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 { routerOptions } from './routerOptions.es.js';
-import { bundleInfoPapi } from './bundleInfo.es.js';
+import { bundleInfoPapi, bundleInfoExtendedPapi, prerenderRoutesPapi, resolveRoutes, deduplicateArray } from './bundleInfo.es.js';
 import { prefetchProviders } from './prefetch.es.js';
 
+const DYNAMIC_PAGE_REGEX = /\/:.+\//g;
 const serverTokens = [
     {
         provide: additionalRouterParameters,
@@ -21,6 +25,79 @@ const serverTokens = [
         multi: true,
         useValue: bundleInfoPapi,
     },
+    {
+        provide: SERVER_MODULE_PAPI_PUBLIC_ROUTE,
+        scope: Scope.SINGLETON,
+        multi: true,
+        useValue: bundleInfoExtendedPapi,
+    },
+    {
+        provide: SERVER_MODULE_PAPI_PUBLIC_ROUTE,
+        scope: Scope.SINGLETON,
+        multi: true,
+        useValue: prerenderRoutesPapi,
+    },
+    provide({
+        provide: PRERENDER_HOOKS_TOKEN,
+        scope: Scope.SINGLETON,
+        useFactory: ({ hooksFactory }) => ({
+            'prerender:routes': hooksFactory.createAsyncParallel('prerender:routes'),
+            'prerender:generate': hooksFactory.createAsync('prerender:generate'),
+        }),
+        deps: {
+            hooksFactory: TAPABLE_HOOK_FACTORY_TOKEN,
+        },
+    }),
+    provide({
+        provide: commandLineListTokens.init,
+        useFactory: ({ hooks, storage }) => {
+            return function registerPrerenderRoutesHook() {
+                hooks['prerender:routes'].tapPromise('RouterPrerenderPlugin', async (_, routes) => {
+                    const di = storage.getStore()?.tramvaiRequestDi;
+                    if (di) {
+                        // we need to resolve request scope provider from child di container,
+                        // `tramvaiRequestDi` will be available in papi handlers
+                        const paths = await resolveRoutes({
+                            routes: di.get(optional(ROUTES_TOKEN)),
+                            getAdditionalRoutes: di.get(optional(routerBundleInfoAdditionalToken)),
+                            routeTransform: di.get(routeTransformToken),
+                        });
+                        routes.push(...deduplicateArray(paths.map(prop('path')).filter((path) => !DYNAMIC_PAGE_REGEX.test(path))).sort());
+                    }
+                });
+            };
+        },
+        deps: {
+            hooks: PRERENDER_HOOKS_TOKEN,
+            storage: ASYNC_LOCAL_STORAGE_TOKEN,
+        },
+    }),
+    provide({
+        provide: commandLineListTokens.resolvePageDeps,
+        useFactory: ({ router, requestManager, responseManager, hooks }) => {
+            return async function callPrerenderGenerateHook() {
+                if (requestManager.getHeader('x-tramvai-prerender') === 'true') {
+                    const route = { ...router.getCurrentRoute(), prerenderSkip: false };
+                    await hooks['prerender:generate'].callPromise(route);
+                    if (route.prerenderSkip) {
+                        responseManager.setHeader('x-tramvai-prerender-skip', 'true');
+                        const error = new HttpError({
+                            url: requestManager.getUrl(),
+                            message: `Prerendering for route "${route.path}" was skipped`,
+                        });
+                        makeErrorSilent(error);
+                        throw error;
+                    }
+                }
+            };
+        },
+        deps: {
+            router: ROUTER_TOKEN,
+            requestManager: REQUEST_MANAGER_TOKEN,
+            responseManager: RESPONSE_MANAGER_TOKEN,
+            hooks: PRERENDER_HOOKS_TOKEN,
+        },
+    }),
     ...prefetchProviders,
 ];
 

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

@@ -2,14 +2,22 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var prop = require('@tinkoff/utils/object/prop');
 var core = require('@tramvai/core');
 var tokensCommon = require('@tramvai/tokens-common');
 var tokensServer = require('@tramvai/tokens-server');
+var tokensRouter = require('@tramvai/tokens-router');
+var errors = require('@tinkoff/errors');
 var tokens = require('../../tokens.js');
 var routerOptions = require('./routerOptions.js');
 var bundleInfo = require('./bundleInfo.js');
 var prefetch = require('./prefetch.js');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var prop__default = /*#__PURE__*/_interopDefaultLegacy(prop);
+
+const DYNAMIC_PAGE_REGEX = /\/:.+\//g;
 const serverTokens = [
     {
         provide: tokens.additionalRouterParameters,
@@ -25,6 +33,79 @@ const serverTokens = [
         multi: true,
         useValue: bundleInfo.bundleInfoPapi,
     },
+    {
+        provide: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE,
+        scope: core.Scope.SINGLETON,
+        multi: true,
+        useValue: bundleInfo.bundleInfoExtendedPapi,
+    },
+    {
+        provide: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE,
+        scope: core.Scope.SINGLETON,
+        multi: true,
+        useValue: bundleInfo.prerenderRoutesPapi,
+    },
+    core.provide({
+        provide: tokens.PRERENDER_HOOKS_TOKEN,
+        scope: core.Scope.SINGLETON,
+        useFactory: ({ hooksFactory }) => ({
+            'prerender:routes': hooksFactory.createAsyncParallel('prerender:routes'),
+            'prerender:generate': hooksFactory.createAsync('prerender:generate'),
+        }),
+        deps: {
+            hooksFactory: core.TAPABLE_HOOK_FACTORY_TOKEN,
+        },
+    }),
+    core.provide({
+        provide: core.commandLineListTokens.init,
+        useFactory: ({ hooks, storage }) => {
+            return function registerPrerenderRoutesHook() {
+                hooks['prerender:routes'].tapPromise('RouterPrerenderPlugin', async (_, routes) => {
+                    const di = storage.getStore()?.tramvaiRequestDi;
+                    if (di) {
+                        // we need to resolve request scope provider from child di container,
+                        // `tramvaiRequestDi` will be available in papi handlers
+                        const paths = await bundleInfo.resolveRoutes({
+                            routes: di.get(core.optional(tokensRouter.ROUTES_TOKEN)),
+                            getAdditionalRoutes: di.get(core.optional(tokens.routerBundleInfoAdditionalToken)),
+                            routeTransform: di.get(tokens.routeTransformToken),
+                        });
+                        routes.push(...bundleInfo.deduplicateArray(paths.map(prop__default["default"]('path')).filter((path) => !DYNAMIC_PAGE_REGEX.test(path))).sort());
+                    }
+                });
+            };
+        },
+        deps: {
+            hooks: tokens.PRERENDER_HOOKS_TOKEN,
+            storage: tokensCommon.ASYNC_LOCAL_STORAGE_TOKEN,
+        },
+    }),
+    core.provide({
+        provide: core.commandLineListTokens.resolvePageDeps,
+        useFactory: ({ router, requestManager, responseManager, hooks }) => {
+            return async function callPrerenderGenerateHook() {
+                if (requestManager.getHeader('x-tramvai-prerender') === 'true') {
+                    const route = { ...router.getCurrentRoute(), prerenderSkip: false };
+                    await hooks['prerender:generate'].callPromise(route);
+                    if (route.prerenderSkip) {
+                        responseManager.setHeader('x-tramvai-prerender-skip', 'true');
+                        const error = new errors.HttpError({
+                            url: requestManager.getUrl(),
+                            message: `Prerendering for route "${route.path}" was skipped`,
+                        });
+                        errors.makeErrorSilent(error);
+                        throw error;
+                    }
+                }
+            };
+        },
+        deps: {
+            router: tokensRouter.ROUTER_TOKEN,
+            requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
+            responseManager: tokensCommon.RESPONSE_MANAGER_TOKEN,
+            hooks: tokens.PRERENDER_HOOKS_TOKEN,
+        },
+    }),
     ...prefetch.prefetchProviders,
 ];
 

package/lib/modules/tokens.browser.js

@@ -1,4 +1,4 @@
-import { createToken } from '@tinkoff/dippy';
+import { createToken, Scope } from '@tinkoff/dippy';
 
 const routerClassToken = createToken('router routerClassToken');
 const additionalRouterParameters = createToken('router additionalParameters');
@@ -17,7 +17,11 @@ const afterNavigateHooksToken = createToken('router afterNavigateHooks', {
 const beforeUpdateCurrentHooksToken = createToken('router beforeUpdateCurrentHooks', { multi: true });
 const afterUpdateCurrentHooksToken = createToken('router afterUpdateCurrentHooks', { multi: true });
 const routeTransformToken = createToken('router finalRouteTransform');
-const routerBundleInfoAdditionalToken = createToken('router bundleInfoAdditional');
+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 { ROUTER_VIEW_TRANSITIONS_ENABLED, additionalRouterParameters, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken, routerClassToken };
+export { BACK_NAVIGATION_WITHIN_ROUTE_TYPE, PRERENDER_HOOKS_TOKEN, ROUTER_VIEW_TRANSITIONS_ENABLED, additionalRouterParameters, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken, routerClassToken };

package/lib/modules/tokens.d.ts

@@ -1,4 +1,5 @@
-import type { NavigationHook, AbstractRouter, NavigationSyncHook, Route } from '@tinkoff/router';
+import { AsyncParallelTapableHookInstance, AsyncTapableHookInstance } from '@tinkoff/hook-runner';
+import type { NavigationHook, AbstractRouter, NavigationSyncHook, Route, BackNavigationType, NavigationRoute } 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";
@@ -35,4 +36,20 @@ export declare const ROUTER_VIEW_TRANSITIONS_ENABLED: (false & {
 }) | (true & {
     __type?: "base token";
 });
+export declare const BACK_NAVIGATION_WITHIN_ROUTE_TYPE: (BackNavigationType.CURRENT_TYPE & {
+    __type?: "base token";
+}) | (BackNavigationType.PREFER_UPDATE & {
+    __type?: "base token";
+}) | (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

@@ -1,4 +1,4 @@
-import { createToken } from '@tinkoff/dippy';
+import { createToken, Scope } from '@tinkoff/dippy';
 
 const routerClassToken = createToken('router routerClassToken');
 const additionalRouterParameters = createToken('router additionalParameters');
@@ -17,7 +17,11 @@ const afterNavigateHooksToken = createToken('router afterNavigateHooks', {
 const beforeUpdateCurrentHooksToken = createToken('router beforeUpdateCurrentHooks', { multi: true });
 const afterUpdateCurrentHooksToken = createToken('router afterUpdateCurrentHooks', { multi: true });
 const routeTransformToken = createToken('router finalRouteTransform');
-const routerBundleInfoAdditionalToken = createToken('router bundleInfoAdditional');
+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 { ROUTER_VIEW_TRANSITIONS_ENABLED, additionalRouterParameters, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken, routerClassToken };
+export { BACK_NAVIGATION_WITHIN_ROUTE_TYPE, PRERENDER_HOOKS_TOKEN, ROUTER_VIEW_TRANSITIONS_ENABLED, additionalRouterParameters, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken, routerClassToken };

package/lib/modules/tokens.js

@@ -21,9 +21,15 @@ const afterNavigateHooksToken = dippy.createToken('router afterNavigateHooks', {
 const beforeUpdateCurrentHooksToken = dippy.createToken('router beforeUpdateCurrentHooks', { multi: true });
 const afterUpdateCurrentHooksToken = dippy.createToken('router afterUpdateCurrentHooks', { multi: true });
 const routeTransformToken = dippy.createToken('router finalRouteTransform');
-const routerBundleInfoAdditionalToken = dippy.createToken('router bundleInfoAdditional');
+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": "6.68.6",
+  "version": "6.77.2",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -25,29 +25,30 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@tinkoff/errors": "0.7.1",
-    "@tinkoff/router": "0.6.124",
-    "@tinkoff/url": "0.12.1",
-    "@tramvai/experiments": "6.68.6",
-    "@tramvai/react": "6.68.6",
-    "@tramvai/safe-strings": "0.9.0",
-    "@tramvai/tokens-child-app": "6.68.6",
-    "@tramvai/tokens-render": "6.68.6",
-    "@tramvai/tokens-router": "6.68.6",
-    "@tramvai/tokens-server": "6.68.6"
+    "@tinkoff/errors": "0.7.2",
+    "@tinkoff/hook-runner": "0.8.2",
+    "@tinkoff/router": "0.6.152",
+    "@tinkoff/url": "0.12.2",
+    "@tramvai/experiments": "6.77.2",
+    "@tramvai/react": "6.77.2",
+    "@tramvai/safe-strings": "0.9.1",
+    "@tramvai/tokens-child-app": "6.77.2",
+    "@tramvai/tokens-render": "6.77.2",
+    "@tramvai/tokens-router": "6.77.2",
+    "@tramvai/tokens-server": "6.77.2"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.12.3",
+    "@tinkoff/dippy": "0.12.6",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "6.68.6",
-    "@tramvai/core": "6.68.6",
-    "@tramvai/module-log": "6.68.6",
-    "@tramvai/module-server": "6.68.6",
-    "@tramvai/papi": "6.68.6",
-    "@tramvai/state": "6.68.6",
-    "@tramvai/test-helpers": "6.68.6",
-    "@tramvai/test-mocks": "6.68.6",
-    "@tramvai/tokens-common": "6.68.6",
+    "@tramvai/cli": "6.77.2",
+    "@tramvai/core": "6.77.2",
+    "@tramvai/module-log": "6.77.2",
+    "@tramvai/module-server": "6.77.2",
+    "@tramvai/papi": "6.77.2",
+    "@tramvai/state": "6.77.2",
+    "@tramvai/test-helpers": "6.77.2",
+    "@tramvai/test-mocks": "6.77.2",
+    "@tramvai/tokens-common": "6.77.2",
     "react": "*",
     "tslib": "^2.4.0"
   },