@tramvai/module-router 2.94.19 → 2.94.24

package/lib/index.browser.js

@@ -4,7 +4,7 @@ export { RouterChildAppModule } from './modules/child-app.browser.js';
 export { Provider, useNavigate, useRoute, useRouter, useUrl } from '@tinkoff/router';
 export { Link } from './components/link.browser.js';
 export * from '@tramvai/tokens-router';
-export { generateForRoot } from './modules/utils/forRoot.browser.js';
+export { generateForRoot, routerForRoot } from './modules/utils/forRoot.browser.js';
 export { RouterStore, setCurrentNavigation, setUrlOnRehydrate } from './stores/RouterStore.browser.js';
 export { PageErrorStore, deserializeError, serializeError, setPageErrorEvent } from './stores/PageErrorStore.browser.js';
 export { usePageService } from './hooks/usePageService.browser.js';

package/lib/index.d.ts

@@ -3,7 +3,7 @@ export { RouterChildAppModule } from './modules/child-app';
 export { Provider, useNavigate, useRoute, useRouter, useUrl } from '@tinkoff/router';
 export { Link } from './components/link';
 export * from '@tramvai/tokens-router';
-export { generateForRoot } from './modules/utils/forRoot';
+export { routerForRoot, generateForRoot } from './modules/utils/forRoot';
 export * from './stores/RouterStore';
 export * from './stores/PageErrorStore';
 export * from './hooks/usePageService';

package/lib/index.es.js

@@ -3,7 +3,7 @@ export { RouterChildAppModule } from './modules/child-app.es.js';
 export { Provider, useNavigate, useRoute, useRouter, useUrl } from '@tinkoff/router';
 export { Link } from './components/link.es.js';
 export * from '@tramvai/tokens-router';
-export { generateForRoot } from './modules/utils/forRoot.es.js';
+export { generateForRoot, routerForRoot } from './modules/utils/forRoot.es.js';
 export { RouterStore, setCurrentNavigation, setUrlOnRehydrate } from './stores/RouterStore.es.js';
 export { PageErrorStore, deserializeError, serializeError, setPageErrorEvent } from './stores/PageErrorStore.es.js';
 export { usePageService } from './hooks/usePageService.es.js';

package/lib/index.js

@@ -15,10 +15,7 @@ var tokens = require('./modules/tokens.js');
 
 
 
-Object.defineProperty(exports, 'NoSpaRouterModule', {
-	enumerable: true,
-	get: function () { return server.NoSpaRouterModule; }
-});
+exports.NoSpaRouterModule = server.NoSpaRouterModule;
 exports.SpaRouterModule = server.SpaRouterModule;
 Object.defineProperty(exports, 'RouterChildAppModule', {
 	enumerable: true,
@@ -46,6 +43,7 @@ Object.defineProperty(exports, 'useUrl', {
 });
 exports.Link = link.Link;
 exports.generateForRoot = forRoot.generateForRoot;
+exports.routerForRoot = forRoot.routerForRoot;
 exports.RouterStore = RouterStore.RouterStore;
 exports.setCurrentNavigation = RouterStore.setCurrentNavigation;
 exports.setUrlOnRehydrate = RouterStore.setUrlOnRehydrate;

package/lib/modules/common.browser.js

@@ -1,5 +1,5 @@
 import flatten from '@tinkoff/utils/array/flatten';
-import { commandLineListTokens, provide } from '@tramvai/core';
+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';
@@ -16,9 +16,9 @@ const providers = [
     ...commonHooks,
     ...commonTokens,
     ...providers$1,
-    {
+    provide({
         provide: ROUTER_TOKEN,
-        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, }) => {
+        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters }) => {
             const router = new RouterClass({
                 ...additionalParameters,
                 trailingSlash: true,
@@ -57,8 +57,8 @@ const providers = [
                 optional: true,
             },
         },
-    },
-    {
+    }),
+    provide({
         provide: commandLineListTokens.customerStart,
         multi: true,
         useFactory: ({ router, guards, onChange, beforeResolve, beforeNavigate, afterNavigate, beforeUpdateCurrent, afterUpdateCurrent, }) => {
@@ -103,8 +103,8 @@ const providers = [
                 optional: true,
             },
         },
-    },
-    {
+    }),
+    provide({
         provide: commandLineListTokens.init,
         multi: true,
         useFactory: ({ logger }) => {
@@ -115,14 +115,14 @@ const providers = [
         deps: {
             logger: LOGGER_TOKEN,
         },
-    },
-    {
+    }),
+    provide({
         provide: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
         // TODO: пока делаем after т.к. на это рассчитывает большинство приложений и у нас пока нет механизма контроля выполнения экшенов, чтобы
         // избежать случаев зависания перехода из-за долгих экшенов
         // рассмотреть возможность замены после доработок экшенов
         useValue: 'after',
-    },
+    }),
     provide({
         provide: PAGE_SERVICE_TOKEN,
         useClass: PageService,
@@ -131,11 +131,11 @@ const providers = [
             componentRegistry: COMPONENT_REGISTRY_TOKEN,
         },
     }),
-    {
+    provide({
         provide: COMBINE_REDUCERS,
         multi: true,
         useValue: RouterStore,
-    },
+    }),
 ];
 
 export { providers };

package/lib/modules/common.es.js

@@ -1,5 +1,5 @@
 import flatten from '@tinkoff/utils/array/flatten';
-import { commandLineListTokens, provide } from '@tramvai/core';
+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';
@@ -16,9 +16,9 @@ const providers = [
     ...commonHooks,
     ...commonTokens,
     ...providers$1,
-    {
+    provide({
         provide: ROUTER_TOKEN,
-        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, }) => {
+        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters }) => {
             const router = new RouterClass({
                 ...additionalParameters,
                 trailingSlash: true,
@@ -57,8 +57,8 @@ const providers = [
                 optional: true,
             },
         },
-    },
-    {
+    }),
+    provide({
         provide: commandLineListTokens.customerStart,
         multi: true,
         useFactory: ({ router, guards, onChange, beforeResolve, beforeNavigate, afterNavigate, beforeUpdateCurrent, afterUpdateCurrent, }) => {
@@ -103,8 +103,8 @@ const providers = [
                 optional: true,
             },
         },
-    },
-    {
+    }),
+    provide({
         provide: commandLineListTokens.init,
         multi: true,
         useFactory: ({ logger }) => {
@@ -115,14 +115,14 @@ const providers = [
         deps: {
             logger: LOGGER_TOKEN,
         },
-    },
-    {
+    }),
+    provide({
         provide: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
         // TODO: пока делаем after т.к. на это рассчитывает большинство приложений и у нас пока нет механизма контроля выполнения экшенов, чтобы
         // избежать случаев зависания перехода из-за долгих экшенов
         // рассмотреть возможность замены после доработок экшенов
         useValue: 'after',
-    },
+    }),
     provide({
         provide: PAGE_SERVICE_TOKEN,
         useClass: PageService,
@@ -131,11 +131,11 @@ const providers = [
             componentRegistry: COMPONENT_REGISTRY_TOKEN,
         },
     }),
-    {
+    provide({
         provide: COMBINE_REDUCERS,
         multi: true,
         useValue: RouterStore,
-    },
+    }),
 ];
 
 export { providers };

package/lib/modules/common.js

@@ -24,9 +24,9 @@ const providers = [
     ...index$1.commonHooks,
     ...index$2.commonTokens,
     ...fileSystemPages.providers,
-    {
+    core.provide({
         provide: tokensRouter.ROUTER_TOKEN,
-        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, }) => {
+        useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters }) => {
             const router = new RouterClass({
                 ...additionalParameters,
                 trailingSlash: true,
@@ -65,8 +65,8 @@ const providers = [
                 optional: true,
             },
         },
-    },
-    {
+    }),
+    core.provide({
         provide: core.commandLineListTokens.customerStart,
         multi: true,
         useFactory: ({ router, guards, onChange, beforeResolve, beforeNavigate, afterNavigate, beforeUpdateCurrent, afterUpdateCurrent, }) => {
@@ -111,8 +111,8 @@ const providers = [
                 optional: true,
             },
         },
-    },
-    {
+    }),
+    core.provide({
         provide: core.commandLineListTokens.init,
         multi: true,
         useFactory: ({ logger }) => {
@@ -123,14 +123,14 @@ const providers = [
         deps: {
             logger: tokensCommon.LOGGER_TOKEN,
         },
-    },
-    {
+    }),
+    core.provide({
         provide: tokensRouter.ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
         // TODO: пока делаем after т.к. на это рассчитывает большинство приложений и у нас пока нет механизма контроля выполнения экшенов, чтобы
         // избежать случаев зависания перехода из-за долгих экшенов
         // рассмотреть возможность замены после доработок экшенов
         useValue: 'after',
-    },
+    }),
     core.provide({
         provide: tokensRouter.PAGE_SERVICE_TOKEN,
         useClass: page.PageService,
@@ -139,11 +139,11 @@ const providers = [
             componentRegistry: tokensCommon.COMPONENT_REGISTRY_TOKEN,
         },
     }),
-    {
+    core.provide({
         provide: tokensCommon.COMBINE_REDUCERS,
         multi: true,
         useValue: RouterStore.RouterStore,
-    },
+    }),
 ];
 
 exports.providers = providers;

package/lib/modules/no-spa.browser.js

@@ -1,21 +1,26 @@
-import { Module } from '@tramvai/core';
+import { declareModule, provide } from '@tramvai/core';
 import { NoSpaRouter } from '@tinkoff/router';
+import { ROUTER_MODE_TOKEN } from '@tramvai/tokens-router';
 import { providers } from './clientCommon.browser.js';
-import { generateForRoot } from './utils/forRoot.browser.js';
+import { routerForRoot } from './utils/forRoot.browser.js';
 import { routerClassToken } from './tokens.browser.js';
 
-var _a;
-const NoSpaRouterModule = /* @__PURE__ */ Module({
+const NoSpaRouterModule = /* @__PURE__ */ declareModule({
+    name: 'NoSpaRouterModule',
     providers: [
         ...providers,
-        {
+        provide({
             provide: routerClassToken,
             useValue: NoSpaRouter,
-        },
+        }),
+        provide({
+            provide: ROUTER_MODE_TOKEN,
+            useValue: 'no-spa',
+        }),
     ],
-})((_a = class NoSpaRouterModule {
+    extend: {
+        forRoot: routerForRoot,
     },
-    _a.forRoot = generateForRoot(_a),
-    _a));
+});
 
 export { NoSpaRouterModule };

package/lib/modules/no-spa.d.ts

@@ -1,4 +1,9 @@
-export declare const NoSpaRouterModule: import("@tramvai/core").ModuleType<{
-    new (): {};
-    forRoot: any;
-}>;
+export declare const NoSpaRouterModule: import("@tinkoff/dippy/lib/modules/module.h").ModuleClass & Partial<import("@tinkoff/dippy/lib/modules/module.h").ModuleSecretParameters> & {
+    forRoot: (routes: import("@tinkoff/router").Route[], options?: {
+        spaActionsMode?: ("before" & {
+            __type?: "base token";
+        }) | ("after" & {
+            __type?: "base token";
+        });
+    }) => import("@tramvai/core").ModuleType<import("@tinkoff/dippy/lib/modules/module.h").ModuleClass>;
+};

package/lib/modules/server.d.ts

@@ -1,13 +1,18 @@
-export declare class NoSpaRouterModule {
-    static forRoot: (routes: import("@tinkoff/router").Route[], options?: {
+export declare const NoSpaRouterModule: import("@tinkoff/dippy/lib/modules/module.h").ModuleClass & Partial<import("@tinkoff/dippy/lib/modules/module.h").ModuleSecretParameters> & {
+    forRoot: (routes: import("@tinkoff/router").Route[], options?: {
         spaActionsMode?: ("before" & {
             __type?: "base token";
         }) | ("after" & {
             __type?: "base token";
         });
-    }) => {
-        mainModule: typeof NoSpaRouterModule;
-        providers: import("@tramvai/core").Provider<any, any>[];
-    };
-}
-export declare const SpaRouterModule: typeof NoSpaRouterModule;
+    }) => import("@tramvai/core").ModuleType<import("@tinkoff/dippy/lib/modules/module.h").ModuleClass>;
+};
+export declare const SpaRouterModule: import("@tinkoff/dippy/lib/modules/module.h").ModuleClass & Partial<import("@tinkoff/dippy/lib/modules/module.h").ModuleSecretParameters> & {
+    forRoot: (routes: import("@tinkoff/router").Route[], options?: {
+        spaActionsMode?: ("before" & {
+            __type?: "base token";
+        }) | ("after" & {
+            __type?: "base token";
+        });
+    }) => import("@tramvai/core").ModuleType<import("@tinkoff/dippy/lib/modules/module.h").ModuleClass>;
+};

package/lib/modules/server.es.js

@@ -1,59 +1,72 @@
-import { __decorate } from 'tslib';
-import { Module, commandLineListTokens } from '@tramvai/core';
+import { declareModule, provide, commandLineListTokens } from '@tramvai/core';
 import { Router } from '@tinkoff/router';
 import { REQUEST_MANAGER_TOKEN, STORE_TOKEN, ACTION_REGISTRY_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
-import { ROUTER_TOKEN } from '@tramvai/tokens-router';
+import { ROUTER_TOKEN, ROUTER_MODE_TOKEN } from '@tramvai/tokens-router';
 import { providers } from './common.es.js';
 import { routerClassToken } from './tokens.es.js';
 import { serverGuards } from './guards/server/index.es.js';
 import { runActionsFactory } from './hooks/runActions.es.js';
 import { serverHooks } from './hooks/server/index.es.js';
 import { serverTokens } from './tokens/server/index.es.js';
-import { generateForRoot } from './utils/forRoot.es.js';
+import { routerForRoot } from './utils/forRoot.es.js';
 
-var NoSpaRouterModule_1;
-let NoSpaRouterModule = NoSpaRouterModule_1 = class NoSpaRouterModule {
-};
-NoSpaRouterModule.forRoot = generateForRoot(NoSpaRouterModule_1);
-NoSpaRouterModule = NoSpaRouterModule_1 = __decorate([
-    Module({
-        providers: [
-            ...providers,
-            ...serverGuards,
-            ...serverHooks,
-            ...serverTokens,
-            {
-                provide: routerClassToken,
-                useValue: Router,
+const NoSpaRouterModule = declareModule({
+    name: 'NoSpaRouterModule',
+    providers: [
+        ...providers,
+        ...serverGuards,
+        ...serverHooks,
+        ...serverTokens,
+        provide({
+            provide: routerClassToken,
+            useValue: Router,
+        }),
+        provide({
+            provide: commandLineListTokens.resolveUserDeps,
+            multi: true,
+            useFactory: ({ router, requestManager }) => {
+                return function routerInit() {
+                    return router.navigate(requestManager.getUrl());
+                };
             },
-            {
-                provide: commandLineListTokens.resolveUserDeps,
-                multi: true,
-                useFactory: ({ router, requestManager }) => {
-                    return function routerInit() {
-                        return router.navigate(requestManager.getUrl());
-                    };
-                },
-                deps: {
-                    router: ROUTER_TOKEN,
-                    requestManager: REQUEST_MANAGER_TOKEN,
-                },
+            deps: {
+                router: ROUTER_TOKEN,
+                requestManager: REQUEST_MANAGER_TOKEN,
             },
-            {
-                // запускаем экшены отдельно от самого роутинга, чтобы распараллелить задачи
-                provide: commandLineListTokens.resolvePageDeps,
-                multi: true,
-                useFactory: runActionsFactory,
-                deps: {
-                    store: STORE_TOKEN,
-                    router: ROUTER_TOKEN,
-                    actionRegistry: ACTION_REGISTRY_TOKEN,
-                    actionPageRunner: ACTION_PAGE_RUNNER_TOKEN,
-                },
+        }),
+        provide({
+            // запускаем экшены отдельно от самого роутинга, чтобы распараллелить задачи
+            provide: commandLineListTokens.resolvePageDeps,
+            multi: true,
+            useFactory: runActionsFactory,
+            deps: {
+                store: STORE_TOKEN,
+                router: ROUTER_TOKEN,
+                actionRegistry: ACTION_REGISTRY_TOKEN,
+                actionPageRunner: ACTION_PAGE_RUNNER_TOKEN,
             },
-        ],
-    })
-], NoSpaRouterModule);
-const SpaRouterModule = NoSpaRouterModule;
+        }),
+        provide({
+            provide: ROUTER_MODE_TOKEN,
+            useValue: 'no-spa',
+        }),
+    ],
+    extend: {
+        forRoot: routerForRoot,
+    },
+});
+const SpaRouterModule = declareModule({
+    name: 'SpaRouterModule',
+    imports: [NoSpaRouterModule],
+    providers: [
+        provide({
+            provide: ROUTER_MODE_TOKEN,
+            useValue: 'spa',
+        }),
+    ],
+    extend: {
+        forRoot: routerForRoot,
+    },
+});
 
 export { NoSpaRouterModule, SpaRouterModule };

package/lib/modules/server.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var core = require('@tramvai/core');
 var router = require('@tinkoff/router');
 var tokensCommon = require('@tramvai/tokens-common');
@@ -15,49 +14,64 @@ var index$1 = require('./hooks/server/index.js');
 var index$2 = require('./tokens/server/index.js');
 var forRoot = require('./utils/forRoot.js');
 
-var NoSpaRouterModule_1;
-exports.NoSpaRouterModule = NoSpaRouterModule_1 = class NoSpaRouterModule {
-};
-exports.NoSpaRouterModule.forRoot = forRoot.generateForRoot(NoSpaRouterModule_1);
-exports.NoSpaRouterModule = NoSpaRouterModule_1 = tslib.__decorate([
-    core.Module({
-        providers: [
-            ...common.providers,
-            ...index.serverGuards,
-            ...index$1.serverHooks,
-            ...index$2.serverTokens,
-            {
-                provide: tokens.routerClassToken,
-                useValue: router.Router,
+const NoSpaRouterModule = core.declareModule({
+    name: 'NoSpaRouterModule',
+    providers: [
+        ...common.providers,
+        ...index.serverGuards,
+        ...index$1.serverHooks,
+        ...index$2.serverTokens,
+        core.provide({
+            provide: tokens.routerClassToken,
+            useValue: router.Router,
+        }),
+        core.provide({
+            provide: core.commandLineListTokens.resolveUserDeps,
+            multi: true,
+            useFactory: ({ router, requestManager }) => {
+                return function routerInit() {
+                    return router.navigate(requestManager.getUrl());
+                };
             },
-            {
-                provide: core.commandLineListTokens.resolveUserDeps,
-                multi: true,
-                useFactory: ({ router, requestManager }) => {
-                    return function routerInit() {
-                        return router.navigate(requestManager.getUrl());
-                    };
-                },
-                deps: {
-                    router: tokensRouter.ROUTER_TOKEN,
-                    requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
-                },
+            deps: {
+                router: tokensRouter.ROUTER_TOKEN,
+                requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
             },
-            {
-                // запускаем экшены отдельно от самого роутинга, чтобы распараллелить задачи
-                provide: core.commandLineListTokens.resolvePageDeps,
-                multi: true,
-                useFactory: runActions.runActionsFactory,
-                deps: {
-                    store: tokensCommon.STORE_TOKEN,
-                    router: tokensRouter.ROUTER_TOKEN,
-                    actionRegistry: tokensCommon.ACTION_REGISTRY_TOKEN,
-                    actionPageRunner: tokensCommon.ACTION_PAGE_RUNNER_TOKEN,
-                },
+        }),
+        core.provide({
+            // запускаем экшены отдельно от самого роутинга, чтобы распараллелить задачи
+            provide: core.commandLineListTokens.resolvePageDeps,
+            multi: true,
+            useFactory: runActions.runActionsFactory,
+            deps: {
+                store: tokensCommon.STORE_TOKEN,
+                router: tokensRouter.ROUTER_TOKEN,
+                actionRegistry: tokensCommon.ACTION_REGISTRY_TOKEN,
+                actionPageRunner: tokensCommon.ACTION_PAGE_RUNNER_TOKEN,
             },
-        ],
-    })
-], exports.NoSpaRouterModule);
-const SpaRouterModule = exports.NoSpaRouterModule;
+        }),
+        core.provide({
+            provide: tokensRouter.ROUTER_MODE_TOKEN,
+            useValue: 'no-spa',
+        }),
+    ],
+    extend: {
+        forRoot: forRoot.routerForRoot,
+    },
+});
+const SpaRouterModule = core.declareModule({
+    name: 'SpaRouterModule',
+    imports: [NoSpaRouterModule],
+    providers: [
+        core.provide({
+            provide: tokensRouter.ROUTER_MODE_TOKEN,
+            useValue: 'spa',
+        }),
+    ],
+    extend: {
+        forRoot: forRoot.routerForRoot,
+    },
+});
 
+exports.NoSpaRouterModule = NoSpaRouterModule;
 exports.SpaRouterModule = SpaRouterModule;

package/lib/modules/spa.browser.js

@@ -1,23 +1,28 @@
-import { Module } from '@tramvai/core';
+import { declareModule, provide } from '@tramvai/core';
 import { Router } from '@tinkoff/router';
+import { ROUTER_MODE_TOKEN } from '@tramvai/tokens-router';
 import { providers } from './clientCommon.browser.js';
 import { routerClassToken } from './tokens.browser.js';
 import { spaHooks } from './hooks/spa/index.browser.js';
-import { generateForRoot } from './utils/forRoot.browser.js';
+import { routerForRoot } from './utils/forRoot.browser.js';
 
-var _a;
-const SpaRouterModule = /* @__PURE__ */ Module({
+const SpaRouterModule = /* @__PURE__ */ declareModule({
+    name: 'SpaRouterModule',
     providers: [
         ...providers,
         ...spaHooks,
-        {
+        provide({
             provide: routerClassToken,
             useValue: Router,
-        },
+        }),
+        provide({
+            provide: ROUTER_MODE_TOKEN,
+            useValue: 'spa',
+        }),
     ],
-})((_a = class SpaRouterModule {
+    extend: {
+        forRoot: routerForRoot,
     },
-    _a.forRoot = generateForRoot(_a),
-    _a));
+});
 
 export { SpaRouterModule };

package/lib/modules/spa.d.ts

@@ -1,4 +1,9 @@
-export declare const SpaRouterModule: import("@tramvai/core").ModuleType<{
-    new (): {};
-    forRoot: any;
-}>;
+export declare const SpaRouterModule: import("@tinkoff/dippy/lib/modules/module.h").ModuleClass & Partial<import("@tinkoff/dippy/lib/modules/module.h").ModuleSecretParameters> & {
+    forRoot: (routes: import("@tinkoff/router").Route[], options?: {
+        spaActionsMode?: ("before" & {
+            __type?: "base token";
+        }) | ("after" & {
+            __type?: "base token";
+        });
+    }) => import("@tramvai/core").ModuleType<import("@tinkoff/dippy/lib/modules/module.h").ModuleClass>;
+};

package/lib/modules/tokens.d.ts

@@ -1,6 +1,6 @@
 import type { NavigationHook, AbstractRouter, NavigationSyncHook, Route } from '@tinkoff/router';
 import type { RouteTransform } from '@tramvai/tokens-router';
-export declare const routerClassToken: AbstractRouter & {
+export declare const routerClassToken: (new (args_0: import("@tinkoff/router").Options) => AbstractRouter) & {
     __type?: "base token";
 };
 export declare const additionalRouterParameters: Record<string, any> & {

package/lib/modules/utils/forRoot.browser.js

@@ -1,22 +1,26 @@
 import { ROUTES_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
 
+const routerForRoot = (routes, options = {}) => {
+    return [
+        {
+            provide: ROUTES_TOKEN,
+            multi: true,
+            useValue: routes,
+        },
+        options.spaActionsMode && {
+            provide: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
+            useValue: options.spaActionsMode,
+        },
+    ].filter(Boolean);
+};
+// @TODO: tramvai@3 remove in next major release
 const generateForRoot = (mainModule) => {
     return (routes, options = {}) => {
         return {
             mainModule,
-            providers: [
-                {
-                    provide: ROUTES_TOKEN,
-                    multi: true,
-                    useValue: routes,
-                },
-                options.spaActionsMode && {
-                    provide: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
-                    useValue: options.spaActionsMode,
-                },
-            ].filter(Boolean),
+            providers: routerForRoot(routes, options),
         };
     };
 };
 
-export { generateForRoot };
+export { generateForRoot, routerForRoot };

package/lib/modules/utils/forRoot.d.ts

@@ -1,6 +1,9 @@
 import type { Provider } from '@tinkoff/dippy';
 import type { Route } from '@tinkoff/router';
 import { ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
+export declare const routerForRoot: (routes: Route[], options?: {
+    spaActionsMode?: typeof ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN;
+}) => Provider[];
 type ForRoot<T = any> = (routes: Route[], options?: {
     spaActionsMode?: typeof ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN;
 }) => {

package/lib/modules/utils/forRoot.es.js

@@ -1,22 +1,26 @@
 import { ROUTES_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
 
+const routerForRoot = (routes, options = {}) => {
+    return [
+        {
+            provide: ROUTES_TOKEN,
+            multi: true,
+            useValue: routes,
+        },
+        options.spaActionsMode && {
+            provide: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
+            useValue: options.spaActionsMode,
+        },
+    ].filter(Boolean);
+};
+// @TODO: tramvai@3 remove in next major release
 const generateForRoot = (mainModule) => {
     return (routes, options = {}) => {
         return {
             mainModule,
-            providers: [
-                {
-                    provide: ROUTES_TOKEN,
-                    multi: true,
-                    useValue: routes,
-                },
-                options.spaActionsMode && {
-                    provide: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
-                    useValue: options.spaActionsMode,
-                },
-            ].filter(Boolean),
+            providers: routerForRoot(routes, options),
         };
     };
 };
 
-export { generateForRoot };
+export { generateForRoot, routerForRoot };

package/lib/modules/utils/forRoot.js

@@ -4,23 +4,28 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tokensRouter = require('@tramvai/tokens-router');
 
+const routerForRoot = (routes, options = {}) => {
+    return [
+        {
+            provide: tokensRouter.ROUTES_TOKEN,
+            multi: true,
+            useValue: routes,
+        },
+        options.spaActionsMode && {
+            provide: tokensRouter.ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
+            useValue: options.spaActionsMode,
+        },
+    ].filter(Boolean);
+};
+// @TODO: tramvai@3 remove in next major release
 const generateForRoot = (mainModule) => {
     return (routes, options = {}) => {
         return {
             mainModule,
-            providers: [
-                {
-                    provide: tokensRouter.ROUTES_TOKEN,
-                    multi: true,
-                    useValue: routes,
-                },
-                options.spaActionsMode && {
-                    provide: tokensRouter.ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
-                    useValue: options.spaActionsMode,
-                },
-            ].filter(Boolean),
+            providers: routerForRoot(routes, options),
         };
     };
 };
 
 exports.generateForRoot = generateForRoot;
+exports.routerForRoot = routerForRoot;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "2.94.19",
+  "version": "2.94.24",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -28,24 +28,24 @@
     "@tinkoff/errors": "0.3.8",
     "@tinkoff/router": "0.2.14",
     "@tinkoff/url": "0.8.6",
-    "@tramvai/react": "2.94.19",
-    "@tramvai/tokens-child-app": "2.94.19",
-    "@tramvai/tokens-render": "2.94.19",
-    "@tramvai/tokens-router": "2.94.19",
-    "@tramvai/tokens-server": "2.94.19",
-    "@tramvai/experiments": "2.94.19"
+    "@tramvai/react": "2.94.24",
+    "@tramvai/tokens-child-app": "2.94.24",
+    "@tramvai/tokens-render": "2.94.24",
+    "@tramvai/tokens-router": "2.94.24",
+    "@tramvai/tokens-server": "2.94.24",
+    "@tramvai/experiments": "2.94.24"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.94.19",
-    "@tramvai/core": "2.94.19",
-    "@tramvai/module-log": "2.94.19",
-    "@tramvai/module-server": "2.94.19",
-    "@tramvai/papi": "2.94.19",
-    "@tramvai/state": "2.94.19",
-    "@tramvai/test-helpers": "2.94.19",
-    "@tramvai/test-mocks": "2.94.19",
-    "@tramvai/tokens-common": "2.94.19",
+    "@tramvai/cli": "2.94.24",
+    "@tramvai/core": "2.94.24",
+    "@tramvai/module-log": "2.94.24",
+    "@tramvai/module-server": "2.94.24",
+    "@tramvai/papi": "2.94.24",
+    "@tramvai/state": "2.94.24",
+    "@tramvai/test-helpers": "2.94.24",
+    "@tramvai/test-mocks": "2.94.24",
+    "@tramvai/tokens-common": "2.94.24",
     "@tinkoff/dippy": "0.8.15",
     "react": "*",
     "tslib": "^2.4.0"