@tramvai/module-router 2.7.1 → 2.20.0

package/README.md

@@ -238,7 +238,7 @@ const providers = [
 In this case, it is best to use the [PAGE_SERVICE_TOKEN](#page_service_token)
 
 ```ts
-import { provide, createAction } from '@tramvai/core';
+import { provide, declareAction } from '@tramvai/core';
 import { PAGE_SERVICE_TOKEN } from '@tramvai/module-router';
 
 const provider = provide({
@@ -253,11 +253,11 @@ const provider = provide({
   },
 });
 
-const action = createAction({
+const action = declareAction({
   name: 'action',
-  fn: (_, __, { pageService }) => {
-    if (pageService.getConfig().pageComponent === 'pageComponent') {
-      return page.updateCurrentRoute({ query: { test: 'true' } });
+  fn() {
+    if (this.deps.pageService.getConfig().pageComponent === 'pageComponent') {
+      return this.deps.pageService.updateCurrentRoute({ query: { test: 'true' } });
     }
   },
   deps: {

package/lib/modules/fileSystemPages.d.ts

@@ -1,3 +1,3 @@
 export declare const providers: import("@tramvai/core").Provider<{
-    logger: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<import("@tramvai/tokens-common").LoggerFactory>;
-}, import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<import("@tinkoff/router").Route | import("@tinkoff/router").Route[]>>[];
+    logger: import("@tinkoff/dippy").BaseTokenInterface<import("@tramvai/tokens-common").LoggerFactory>;
+}, import("@tinkoff/dippy").MultiTokenInterface<import("@tinkoff/router").Route | import("@tinkoff/router").Route[]>>[];

package/lib/modules/server.d.ts

@@ -1,6 +1,6 @@
 export declare class NoSpaRouterModule {
     static forRoot: (routes: import("@tinkoff/router").Route[], options?: {
-        spaActionsMode?: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<"before" | "after">;
+        spaActionsMode?: import("@tinkoff/dippy").BaseTokenInterface<"before" | "after">;
     }) => {
         mainModule: typeof NoSpaRouterModule;
         providers: import("@tramvai/core").Provider<any, any>[];

package/lib/modules/tokens.d.ts

@@ -1,11 +1,11 @@
 import type { NavigationHook, AbstractRouter, NavigationSyncHook, Route } from '@tinkoff/router';
-export declare const routerClassToken: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<AbstractRouter>;
-export declare const additionalRouterParameters: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Record<string, any>>;
-export declare const onChangeHooksToken: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<NavigationSyncHook>;
-export declare const beforeResolveHooksToken: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<NavigationHook>;
-export declare const beforeNavigateHooksToken: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<NavigationHook>;
-export declare const afterNavigateHooksToken: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<NavigationHook>;
-export declare const beforeUpdateCurrentHooksToken: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<NavigationHook>;
-export declare const afterUpdateCurrentHooksToken: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<NavigationHook>;
-export declare const routeTransformToken: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<import("@tramvai/tokens-router").RouteTransform>>;
-export declare const routerBundleInfoAdditionalToken: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<() => Promise<Route[]>>;
+export declare const routerClassToken: import("@tinkoff/dippy").BaseTokenInterface<AbstractRouter>;
+export declare const additionalRouterParameters: import("@tinkoff/dippy").BaseTokenInterface<Record<string, any>>;
+export declare const onChangeHooksToken: import("@tinkoff/dippy").MultiTokenInterface<NavigationSyncHook>;
+export declare const beforeResolveHooksToken: import("@tinkoff/dippy").MultiTokenInterface<NavigationHook>;
+export declare const beforeNavigateHooksToken: import("@tinkoff/dippy").MultiTokenInterface<NavigationHook>;
+export declare const afterNavigateHooksToken: import("@tinkoff/dippy").MultiTokenInterface<NavigationHook>;
+export declare const beforeUpdateCurrentHooksToken: import("@tinkoff/dippy").MultiTokenInterface<NavigationHook>;
+export declare const afterUpdateCurrentHooksToken: import("@tinkoff/dippy").MultiTokenInterface<NavigationHook>;
+export declare const routeTransformToken: import("@tinkoff/dippy").BaseTokenInterface<import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/tokens-router").RouteTransform>>;
+export declare const routerBundleInfoAdditionalToken: import("@tinkoff/dippy").BaseTokenInterface<() => Promise<Route[]>>;

package/lib/services/page.d.ts

@@ -1,6 +1,6 @@
 import type { Url } from '@tinkoff/url';
 import type { NavigationRoute, NavigateOptions, UpdateCurrentRouteOptions, HistoryOptions } from '@tinkoff/router';
-import type { Component } from '@tramvai/tokens-common';
+import type { TramvaiComponent } from '@tramvai/react';
 import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 declare type PageServiceInterface = typeof PAGE_SERVICE_TOKEN;
 export declare class PageService implements PageServiceInterface {
@@ -20,9 +20,9 @@ export declare class PageService implements PageServiceInterface {
     back(options?: HistoryOptions): Promise<void>;
     forward(): Promise<void>;
     go(to: number, options?: HistoryOptions): Promise<void>;
-    addComponent(name: string, component: Component): void;
-    getComponent(name: string): Component | undefined;
-    resolveComponentFromConfig(property: 'page' | 'layout' | 'header' | 'footer' | 'errorBoundary'): Component;
+    addComponent(name: string, component: TramvaiComponent): void;
+    getComponent(name: string): TramvaiComponent | undefined;
+    resolveComponentFromConfig(property: 'page' | 'layout' | 'header' | 'footer' | 'errorBoundary'): TramvaiComponent;
     private getComponentsGroupName;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "2.7.1",
+  "version": "2.20.0",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -22,27 +22,27 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/errors": "0.2.22",
-    "@tinkoff/router": "0.2.0",
-    "@tinkoff/url": "0.7.39",
-    "@tramvai/tokens-child-app": "2.7.1",
-    "@tramvai/tokens-render": "2.7.1",
-    "@tramvai/tokens-router": "2.7.1",
-    "@tramvai/tokens-server": "2.7.1",
-    "@tramvai/experiments": "2.7.1"
+    "@tinkoff/errors": "0.3.2",
+    "@tinkoff/router": "0.2.2",
+    "@tinkoff/url": "0.8.2",
+    "@tramvai/tokens-child-app": "2.20.0",
+    "@tramvai/tokens-render": "2.20.0",
+    "@tramvai/tokens-router": "2.20.0",
+    "@tramvai/tokens-server": "2.20.0",
+    "@tramvai/experiments": "2.20.0"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.7.1",
-    "@tramvai/core": "2.7.1",
-    "@tramvai/module-log": "2.7.1",
-    "@tramvai/module-server": "2.7.1",
-    "@tramvai/papi": "2.7.1",
-    "@tramvai/state": "2.7.1",
-    "@tramvai/test-helpers": "2.7.1",
-    "@tramvai/test-mocks": "2.7.1",
-    "@tramvai/tokens-common": "2.7.1",
-    "@tinkoff/dippy": "0.7.44",
+    "@tramvai/cli": "2.20.0",
+    "@tramvai/core": "2.20.0",
+    "@tramvai/module-log": "2.20.0",
+    "@tramvai/module-server": "2.20.0",
+    "@tramvai/papi": "2.20.0",
+    "@tramvai/state": "2.20.0",
+    "@tramvai/test-helpers": "2.20.0",
+    "@tramvai/test-mocks": "2.20.0",
+    "@tramvai/tokens-common": "2.20.0",
+    "@tinkoff/dippy": "0.8.2",
     "react": "*",
     "tslib": "^2.0.3"
   },