@tinkoff/router 0.2.17 → 0.2.19

package/lib/components/react/context.d.ts

@@ -4,3 +4,4 @@ import type { NavigationRoute } from '../../types';
 export declare const RouterContext: import("react").Context<AbstractRouter>;
 export declare const RouteContext: import("react").Context<NavigationRoute>;
 export declare const UrlContext: import("react").Context<Url>;
+//# sourceMappingURL=context.d.ts.map

package/lib/components/react/index.d.ts

@@ -3,3 +3,4 @@ export { useRouter } from './useRouter';
 export { useRoute } from './useRoute';
 export { useUrl } from './useUrl';
 export { useNavigate } from './useNavigate';
+//# sourceMappingURL=index.d.ts.map

package/lib/components/react/provider.d.ts

@@ -10,3 +10,4 @@ export declare const Provider: FunctionComponent<{
     };
     children?: ReactNode;
 }>;
+//# sourceMappingURL=provider.d.ts.map

package/lib/components/react/useNavigate.d.ts

@@ -5,3 +5,4 @@ interface UseNavigate {
 }
 export declare const useNavigate: UseNavigate;
 export {};
+//# sourceMappingURL=useNavigate.d.ts.map

package/lib/components/react/useRoute.d.ts

@@ -1 +1,2 @@
 export declare const useRoute: () => import("../..").NavigationRoute;
+//# sourceMappingURL=useRoute.d.ts.map

package/lib/components/react/useRouter.d.ts

@@ -1 +1,2 @@
 export declare const useRouter: () => import("../..").AbstractRouter;
+//# sourceMappingURL=useRouter.d.ts.map

package/lib/components/react/useUrl.d.ts

@@ -1 +1,2 @@
 export declare const useUrl: () => import("@tinkoff/url").Url;
+//# sourceMappingURL=useUrl.d.ts.map

package/lib/history/base.d.ts

@@ -16,3 +16,4 @@ export declare abstract class History {
     listen(listener: Listener): void;
     setTree(tree: RouteTree): void;
 }
+//# sourceMappingURL=base.d.ts.map

package/lib/history/client.browser.js

@@ -10,16 +10,31 @@ const generateKey = (navigation) => {
         return `${to.name}_${to.path}`;
     }
 };
+const generatePreviousNavigateState = (navigation) => {
+    const state = {};
+    if (navigation.from) {
+        state.previousRoute = navigation.from;
+    }
+    if (navigation.fromUrl) {
+        state.previousUrl = navigation.fromUrl;
+    }
+    return state;
+};
 const generateState = (navigation, currentState) => {
     const key = generateKey(navigation);
+    const previousNavigateState = generatePreviousNavigateState(navigation);
     let { type } = navigation;
     if (navigation.replace && currentState) {
         type = currentState.type === type ? type : 'navigate';
     }
+    const navigateState = {
+        ...previousNavigateState,
+        ...navigation.navigateState,
+    };
     return {
         key,
         type,
-        navigateState: navigation.navigateState,
+        navigateState,
     };
 };
 class ClientHistory extends History {

package/lib/history/client.d.ts

@@ -20,3 +20,4 @@ export declare class ClientHistory extends History {
     go(to: number, options?: HistoryOptions): Promise<void>;
 }
 export {};
+//# sourceMappingURL=client.d.ts.map

package/lib/history/client.es.js

@@ -10,16 +10,31 @@ const generateKey = (navigation) => {
         return `${to.name}_${to.path}`;
     }
 };
+const generatePreviousNavigateState = (navigation) => {
+    const state = {};
+    if (navigation.from) {
+        state.previousRoute = navigation.from;
+    }
+    if (navigation.fromUrl) {
+        state.previousUrl = navigation.fromUrl;
+    }
+    return state;
+};
 const generateState = (navigation, currentState) => {
     const key = generateKey(navigation);
+    const previousNavigateState = generatePreviousNavigateState(navigation);
     let { type } = navigation;
     if (navigation.replace && currentState) {
         type = currentState.type === type ? type : 'navigate';
     }
+    const navigateState = {
+        ...previousNavigateState,
+        ...navigation.navigateState,
+    };
     return {
         key,
         type,
-        navigateState: navigation.navigateState,
+        navigateState,
     };
 };
 class ClientHistory extends History {

package/lib/history/client.js

@@ -14,16 +14,31 @@ const generateKey = (navigation) => {
         return `${to.name}_${to.path}`;
     }
 };
+const generatePreviousNavigateState = (navigation) => {
+    const state = {};
+    if (navigation.from) {
+        state.previousRoute = navigation.from;
+    }
+    if (navigation.fromUrl) {
+        state.previousUrl = navigation.fromUrl;
+    }
+    return state;
+};
 const generateState = (navigation, currentState) => {
     const key = generateKey(navigation);
+    const previousNavigateState = generatePreviousNavigateState(navigation);
     let { type } = navigation;
     if (navigation.replace && currentState) {
         type = currentState.type === type ? type : 'navigate';
     }
+    const navigateState = {
+        ...previousNavigateState,
+        ...navigation.navigateState,
+    };
     return {
         key,
         type,
-        navigateState: navigation.navigateState,
+        navigateState,
     };
 };
 class ClientHistory extends base.History {

package/lib/history/server.d.ts

@@ -3,3 +3,4 @@ export declare class ServerHistory extends History {
     save(): void;
     go(): Promise<void>;
 }
+//# sourceMappingURL=server.d.ts.map

package/lib/history/wrapper.d.ts

@@ -22,3 +22,4 @@ export declare const wrapHistory: <T>({ onNavigate }: {
     onNavigate: NavigateHandler;
 }) => Wrapper<T>;
 export {};
+//# sourceMappingURL=wrapper.d.ts.map

package/lib/index.d.ts

@@ -7,3 +7,4 @@ export * from './logger';
 export * from './components/react';
 export * from './tree/tree';
 export * from './tree/utils';
+//# sourceMappingURL=index.d.ts.map

package/lib/logger.d.ts

@@ -11,3 +11,4 @@ export interface Logger {
 }
 export declare let logger: Logger;
 export declare const setLogger: (newLogger: Logger) => void;
+//# sourceMappingURL=logger.d.ts.map

package/lib/router/abstract.browser.js

@@ -26,6 +26,7 @@ class AbstractRouter {
         this.onRedirect = onRedirect;
         this.onNotFound = onNotFound;
         this.onBlock = onBlock;
+        this.currentUuid = 0;
     }
     // start is using as marker that any preparation for proper work has done in the app
     // and now router can manage any navigations
@@ -88,6 +89,7 @@ class AbstractRouter {
             history,
             navigateState,
             code: updateRouteOptions.code,
+            key: this.uuid(),
         };
         logger.debug({
             event: 'update-current-route',
@@ -127,6 +129,7 @@ class AbstractRouter {
             code,
             redirect,
             redirectFrom,
+            key: this.uuid(),
         };
         await this.runHooks('beforeResolve', navigation);
         const to = this.resolveRoute({ url: resolvedUrl, params, navigateState }, { wildcard: true });
@@ -390,6 +393,9 @@ class AbstractRouter {
     registerHook(hookName, hook) {
         return registerHook(this.hooks.get(hookName), hook);
     }
+    uuid() {
+        return this.currentUuid++;
+    }
 }
 
 export { AbstractRouter };

package/lib/router/abstract.d.ts

@@ -34,6 +34,7 @@ export declare abstract class AbstractRouter {
     protected guards: Set<NavigationGuard>;
     protected hooks: Map<HookName, Set<NavigationHook>>;
     protected syncHooks: Map<SyncHookName, Set<NavigationSyncHook>>;
+    private currentUuid;
     constructor({ trailingSlash, mergeSlashes, beforeResolve, beforeNavigate, afterNavigate, beforeUpdateCurrent, afterUpdateCurrent, guards, onChange, onRedirect, onNotFound, onBlock, }: Options);
     protected onRedirect?: NavigationHook;
     protected onNotFound?: NavigationHook;
@@ -77,5 +78,7 @@ export declare abstract class AbstractRouter {
     registerSyncHook(hookName: SyncHookName, hook: NavigationSyncHook): () => void;
     protected runHooks(hookName: HookName, navigation: Navigation): Promise<void>;
     registerHook(hookName: HookName, hook: NavigationHook): () => void;
+    private uuid;
 }
 export {};
+//# sourceMappingURL=abstract.d.ts.map

package/lib/router/abstract.es.js

@@ -26,6 +26,7 @@ class AbstractRouter {
         this.onRedirect = onRedirect;
         this.onNotFound = onNotFound;
         this.onBlock = onBlock;
+        this.currentUuid = 0;
     }
     // start is using as marker that any preparation for proper work has done in the app
     // and now router can manage any navigations
@@ -88,6 +89,7 @@ class AbstractRouter {
             history,
             navigateState,
             code: updateRouteOptions.code,
+            key: this.uuid(),
         };
         logger.debug({
             event: 'update-current-route',
@@ -127,6 +129,7 @@ class AbstractRouter {
             code,
             redirect,
             redirectFrom,
+            key: this.uuid(),
         };
         await this.runHooks('beforeResolve', navigation);
         const to = this.resolveRoute({ url: resolvedUrl, params, navigateState }, { wildcard: true });
@@ -390,6 +393,9 @@ class AbstractRouter {
     registerHook(hookName, hook) {
         return registerHook(this.hooks.get(hookName), hook);
     }
+    uuid() {
+        return this.currentUuid++;
+    }
 }
 
 export { AbstractRouter };

package/lib/router/abstract.js

@@ -35,6 +35,7 @@ class AbstractRouter {
         this.onRedirect = onRedirect;
         this.onNotFound = onNotFound;
         this.onBlock = onBlock;
+        this.currentUuid = 0;
     }
     // start is using as marker that any preparation for proper work has done in the app
     // and now router can manage any navigations
@@ -97,6 +98,7 @@ class AbstractRouter {
             history,
             navigateState,
             code: updateRouteOptions.code,
+            key: this.uuid(),
         };
         logger.logger.debug({
             event: 'update-current-route',
@@ -136,6 +138,7 @@ class AbstractRouter {
             code,
             redirect,
             redirectFrom,
+            key: this.uuid(),
         };
         await this.runHooks('beforeResolve', navigation);
         const to = this.resolveRoute({ url: resolvedUrl, params, navigateState }, { wildcard: true });
@@ -399,6 +402,9 @@ class AbstractRouter {
     registerHook(hookName, hook) {
         return utils.registerHook(this.hooks.get(hookName), hook);
     }
+    uuid() {
+        return this.currentUuid++;
+    }
 }
 
 exports.AbstractRouter = AbstractRouter;

package/lib/router/browser.d.ts

@@ -17,3 +17,4 @@ export declare class Router extends ClientRouter {
     private resolveIfDelayFound;
     private flattenDelayedNavigation;
 }
+//# sourceMappingURL=browser.d.ts.map

package/lib/router/client.d.ts

@@ -10,3 +10,4 @@ export declare abstract class ClientRouter extends AbstractRouter {
     protected block(navigation: Navigation): Promise<void>;
     protected redirect(navigation: Navigation, target: NavigateOptions): Promise<void>;
 }
+//# sourceMappingURL=client.d.ts.map

package/lib/router/clientNoSpa.d.ts

@@ -4,3 +4,4 @@ export declare class NoSpaRouter extends ClientRouter {
     protected run(navigation: Navigation): Promise<void>;
     protected runHooks(): Promise<void>;
 }
+//# sourceMappingURL=clientNoSpa.d.ts.map

package/lib/router/server.d.ts

@@ -16,3 +16,4 @@ export declare class Router extends AbstractRouter {
     protected runHooks(hookName: HookName, navigation: Navigation): Promise<void>;
     protected runGuards(navigation: Navigation): Promise<void>;
 }
+//# sourceMappingURL=server.d.ts.map

package/lib/tree/constants.d.ts

@@ -3,3 +3,4 @@ export declare const WILDCARD_REGEXP: RegExp;
 export declare const HISTORY_FALLBACK_REGEXP: RegExp;
 export declare const PARAM_MATCH_REGEXP: RegExp;
 export declare const PARAM_PARSER_REGEXP: RegExp;
+//# sourceMappingURL=constants.d.ts.map

package/lib/tree/tree.d.ts

@@ -17,3 +17,4 @@ export declare class RouteTree {
     };
     private findRoute;
 }
+//# sourceMappingURL=tree.d.ts.map

package/lib/tree/types.d.ts

@@ -18,3 +18,4 @@ export type ParsedPath = {
 } | {
     type: PartType.wildcard;
 } | Parameter;
+//# sourceMappingURL=types.d.ts.map

package/lib/tree/utils.d.ts

@@ -6,3 +6,4 @@ export declare const isWildcard: (part: string) => boolean;
 export declare const isParameterized: (part: string) => boolean;
 export declare const parse: (part: string) => ParsedPath;
 export declare const makePath: (pathname: string, params: Params) => string;
+//# sourceMappingURL=utils.d.ts.map

package/lib/types.d.ts

@@ -45,9 +45,15 @@ export interface Navigation {
     code?: number;
     redirect?: boolean;
     redirectFrom?: NavigationRoute;
+    /**
+     * Helps to separate commandLineRunner launches on navigation processes.
+     * Defines internally within the router
+     */
+    key?: number;
 }
 export type NavigationGuard = (navigation: Navigation) => Promise<void | NavigateOptions | string | boolean>;
 export type NavigationHook = (navigation: Navigation) => Promise<void>;
 export type NavigationSyncHook = (navigation: Navigation) => void;
 export type HookName = 'beforeResolve' | 'beforeNavigate' | 'afterNavigate' | 'beforeUpdateCurrent' | 'afterUpdateCurrent';
 export type SyncHookName = 'change';
+//# sourceMappingURL=types.d.ts.map

package/lib/utils.d.ts

@@ -6,3 +6,4 @@ export declare const normalizeManySlashes: (hrefOrPath: string) => string;
 export declare const isSameHost: import("@tinkoff/utils/typings/types").Func<true> | ((url: Url | URL) => boolean);
 export declare const makeNavigateOptions: (options: string | NavigateOptions) => NavigateOptions;
 export declare const registerHook: <T extends NavigationHook | NavigationSyncHook | NavigationGuard>(hooksSet: Set<T>, hook: T) => () => void;
+//# sourceMappingURL=utils.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/router",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "description": "router",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",