@tramvai/module-router 2.73.1 → 2.75.0

package/lib/hooks/usePrefetch.browser.browser.js

@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
 import { useDi } from '@tramvai/react';
 import { LINK_PREFETCH_MANAGER_TOKEN } from '@tramvai/tokens-router';
-import { requestIdleCallback, cancelIdleCallback } from '../utils/requestIdleCallback.browser.js';
 import { optional } from '@tinkoff/dippy';
+import { requestIdleCallback, cancelIdleCallback } from '../utils/requestIdleCallback.browser.js';
 
 const isUserNetworkConditionsSuitableForPrefetch = () => {
     var _a;

package/lib/index.browser.js

@@ -6,4 +6,5 @@ export { Link } from './components/link.browser.js';
 export * from '@tramvai/tokens-router';
 export { generateForRoot } 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

@@ -5,6 +5,7 @@ export { Link } from './components/link';
 export * from '@tramvai/tokens-router';
 export { generateForRoot } from './modules/utils/forRoot';
 export * from './stores/RouterStore';
+export * from './stores/PageErrorStore';
 export * from './hooks/usePageService';
 type RouteConfig = {
     [key: string]: any;

package/lib/index.es.js

@@ -5,4 +5,5 @@ export { Link } from './components/link.es.js';
 export * from '@tramvai/tokens-router';
 export { generateForRoot } 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

@@ -9,6 +9,7 @@ var link = require('./components/link.js');
 var tokensRouter = require('@tramvai/tokens-router');
 var forRoot = require('./modules/utils/forRoot.js');
 var RouterStore = require('./stores/RouterStore.js');
+var PageErrorStore = require('./stores/PageErrorStore.js');
 var usePageService = require('./hooks/usePageService.js');
 
 
@@ -47,6 +48,10 @@ exports.generateForRoot = forRoot.generateForRoot;
 exports.RouterStore = RouterStore.RouterStore;
 exports.setCurrentNavigation = RouterStore.setCurrentNavigation;
 exports.setUrlOnRehydrate = RouterStore.setUrlOnRehydrate;
+exports.PageErrorStore = PageErrorStore.PageErrorStore;
+exports.deserializeError = PageErrorStore.deserializeError;
+exports.serializeError = PageErrorStore.serializeError;
+exports.setPageErrorEvent = PageErrorStore.setPageErrorEvent;
 exports.usePageService = usePageService.usePageService;
 Object.keys(tokensRouter).forEach(function (k) {
 	if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {

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

@@ -1,5 +1,27 @@
+import { STORE_TOKEN } from '@tramvai/tokens-common';
+import { BlockError, makeErrorSilent } from '@tinkoff/errors';
+import { setPageErrorEvent } from '../../../stores/PageErrorStore.browser.js';
+import { additionalRouterParameters } from '../../tokens.browser.js';
 import { prefetchProviders } from './prefetch.browser.js';
 
-const clientTokens = [...prefetchProviders];
+const clientTokens = [
+    ...prefetchProviders,
+    {
+        provide: additionalRouterParameters,
+        useFactory: ({ store }) => {
+            return {
+                onBlock: async (navigation) => {
+                    var _a;
+                    let error = new BlockError({ message: `Url ${(_a = navigation.to) === null || _a === void 0 ? void 0 : _a.actualPath} is blocked` });
+                    error = makeErrorSilent(error);
+                    store.dispatch(setPageErrorEvent(error));
+                },
+            };
+        },
+        deps: {
+            store: STORE_TOKEN,
+        },
+    },
+];
 
 export { clientTokens };

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

@@ -1,6 +1,17 @@
-export declare const clientTokens: (import("@tinkoff/dippy").Provider<unknown, Set<string>> | import("@tinkoff/dippy").Provider<unknown, {
+import type { Navigation } from '@tinkoff/router';
+export declare const clientTokens: (import("@tinkoff/dippy/lib/Provider").ValueProvider<Set<string>> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithDeps<unknown, Set<string>> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithoutDeps<Set<string>> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithDeps<unknown, Set<string>> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithoutDeps<Set<string>> | import("@tinkoff/dippy/lib/Provider").ValueProvider<{
     add(run: () => Promise<void>): Promise<void>;
-}> | import("@tinkoff/dippy").Provider<{
+}> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithDeps<unknown, {
+    add(run: () => Promise<void>): Promise<void>;
+}> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithoutDeps<{
+    add(run: () => Promise<void>): Promise<void>;
+}> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithDeps<unknown, {
+    add(run: () => Promise<void>): Promise<void>;
+}> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithoutDeps<{
+    add(run: () => Promise<void>): Promise<void>;
+}> | import("@tinkoff/dippy/lib/Provider").ValueProvider<{
+    prefetch: (url: string) => Promise<void>;
+}> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithDeps<{
     router: import("@tinkoff/router").AbstractRouter & {
         __type?: "base token";
     };
@@ -19,10 +30,10 @@ export declare const clientTokens: (import("@tinkoff/dippy").Provider<unknown, S
     bundleManager: import("@tramvai/tokens-common").BundleManager & {
         __type?: "base token";
     };
-    logger: import("@tinkoff/logger").Logger & ((configOrName: string | {
+    logger: import("@tramvai/tokens-common").Logger & ((configOrName: string | {
         [key: string]: any;
         name: string;
-    }) => import("@tinkoff/logger").Logger) & {
+    }) => import("@tramvai/tokens-common").Logger) & {
         __type?: "base token";
     };
     prefetchedLinksCache: Set<string> & {
@@ -35,4 +46,57 @@ export declare const clientTokens: (import("@tinkoff/dippy").Provider<unknown, S
     };
 }, {
     prefetch: (url: string) => Promise<void>;
-}>)[];
+}> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithoutDeps<{
+    prefetch: (url: string) => Promise<void>;
+}> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithDeps<{
+    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: boolean;
+    };
+    componentRegistry: import("@tramvai/tokens-common").ComponentRegistry & {
+        __type?: "base token";
+    };
+    bundleManager: import("@tramvai/tokens-common").BundleManager & {
+        __type?: "base token";
+    };
+    logger: import("@tramvai/tokens-common").Logger & ((configOrName: string | {
+        [key: string]: any;
+        name: string;
+    }) => import("@tramvai/tokens-common").Logger) & {
+        __type?: "base token";
+    };
+    prefetchedLinksCache: Set<string> & {
+        __type?: "base token";
+    };
+    prefetchedLinksQueue: {
+        add(run: () => Promise<void>): Promise<void>;
+    } & {
+        __type?: "base token";
+    };
+}, {
+    prefetch: (url: string) => Promise<void>;
+}> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithoutDeps<{
+    prefetch: (url: string) => Promise<void>;
+}> | {
+    provide: Record<string, any> & {
+        __type?: "base token";
+    };
+    useFactory: ({ store }: {
+        store: any;
+    }) => {
+        onBlock: (navigation: Navigation) => Promise<void>;
+    };
+    deps: {
+        store: import("@tramvai/tokens-common").Store<Record<string, any>> & {
+            __type?: "base token";
+        };
+    };
+})[];

package/lib/stores/PageErrorStore.browser.js

@@ -0,0 +1,19 @@
+import { createEvent, createReducer } from '@tramvai/state';
+
+function serializeError(error) {
+    return {
+        ...error,
+        message: error.message,
+        stack: error.stack,
+    };
+}
+function deserializeError(serializedError) {
+    const error = new Error(serializedError.message);
+    Object.assign(error, serializedError);
+    return error;
+}
+const setPageErrorEvent = createEvent('setPageError');
+const initialState = null;
+const PageErrorStore = createReducer('pageError', initialState).on(setPageErrorEvent, (state, error) => error && serializeError(error));
+
+export { PageErrorStore, deserializeError, serializeError, setPageErrorEvent };

package/lib/stores/PageErrorStore.d.ts

@@ -0,0 +1,14 @@
+type AnyError = Error & {
+    [key: string]: any;
+};
+export interface SerializedError {
+    message: string;
+    stack?: string;
+    [key: string]: any;
+}
+export declare function serializeError(error: AnyError): SerializedError;
+export declare function deserializeError(serializedError: SerializedError): AnyError;
+export type IPageErrorStore = SerializedError | null;
+export declare const setPageErrorEvent: import("@tramvai/types-actions-state-context").EventCreator1<AnyError, AnyError>;
+export declare const PageErrorStore: import("@tramvai/state").Reducer<SerializedError, "pageError">;
+export {};

package/lib/stores/PageErrorStore.es.js

@@ -0,0 +1,19 @@
+import { createEvent, createReducer } from '@tramvai/state';
+
+function serializeError(error) {
+    return {
+        ...error,
+        message: error.message,
+        stack: error.stack,
+    };
+}
+function deserializeError(serializedError) {
+    const error = new Error(serializedError.message);
+    Object.assign(error, serializedError);
+    return error;
+}
+const setPageErrorEvent = createEvent('setPageError');
+const initialState = null;
+const PageErrorStore = createReducer('pageError', initialState).on(setPageErrorEvent, (state, error) => error && serializeError(error));
+
+export { PageErrorStore, deserializeError, serializeError, setPageErrorEvent };

package/lib/stores/PageErrorStore.js

@@ -0,0 +1,26 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var state = require('@tramvai/state');
+
+function serializeError(error) {
+    return {
+        ...error,
+        message: error.message,
+        stack: error.stack,
+    };
+}
+function deserializeError(serializedError) {
+    const error = new Error(serializedError.message);
+    Object.assign(error, serializedError);
+    return error;
+}
+const setPageErrorEvent = state.createEvent('setPageError');
+const initialState = null;
+const PageErrorStore = state.createReducer('pageError', initialState).on(setPageErrorEvent, (state, error) => error && serializeError(error));
+
+exports.PageErrorStore = PageErrorStore;
+exports.deserializeError = deserializeError;
+exports.serializeError = serializeError;
+exports.setPageErrorEvent = setPageErrorEvent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "2.73.1",
+  "version": "2.75.0",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -25,27 +25,27 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@tinkoff/errors": "0.3.6",
-    "@tinkoff/router": "0.2.9",
+    "@tinkoff/errors": "0.3.7",
+    "@tinkoff/router": "0.2.10",
     "@tinkoff/url": "0.8.5",
-    "@tramvai/react": "2.73.1",
-    "@tramvai/tokens-child-app": "2.73.1",
-    "@tramvai/tokens-render": "2.73.1",
-    "@tramvai/tokens-router": "2.73.1",
-    "@tramvai/tokens-server": "2.73.1",
-    "@tramvai/experiments": "2.73.1"
+    "@tramvai/react": "2.75.0",
+    "@tramvai/tokens-child-app": "2.75.0",
+    "@tramvai/tokens-render": "2.75.0",
+    "@tramvai/tokens-router": "2.75.0",
+    "@tramvai/tokens-server": "2.75.0",
+    "@tramvai/experiments": "2.75.0"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.73.1",
-    "@tramvai/core": "2.73.1",
-    "@tramvai/module-log": "2.73.1",
-    "@tramvai/module-server": "2.73.1",
-    "@tramvai/papi": "2.73.1",
-    "@tramvai/state": "2.73.1",
-    "@tramvai/test-helpers": "2.73.1",
-    "@tramvai/test-mocks": "2.73.1",
-    "@tramvai/tokens-common": "2.73.1",
+    "@tramvai/cli": "2.75.0",
+    "@tramvai/core": "2.75.0",
+    "@tramvai/module-log": "2.75.0",
+    "@tramvai/module-server": "2.75.0",
+    "@tramvai/papi": "2.75.0",
+    "@tramvai/state": "2.75.0",
+    "@tramvai/test-helpers": "2.75.0",
+    "@tramvai/test-mocks": "2.75.0",
+    "@tramvai/tokens-common": "2.75.0",
     "@tinkoff/dippy": "0.8.13",
     "react": "*",
     "tslib": "^2.4.0"