@tinkoff/router 0.5.27 → 0.5.47

package/lib/components/react/providers/default.browser.js

@@ -8,8 +8,8 @@ const DefaultProvider = ({ router, children, serverState, }) => {
     const lastRoute = useMemo(() => router.getCurrentRoute(), [router]);
     const lastUrl = useMemo(() => router.getCurrentUrl(), [router]);
     const subscription = useCallback((cb) => router.registerSyncHook('change', cb), [router]);
-    const route = useSyncExternalStore(subscription, () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; }, serverState ? () => serverState.route : () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; });
-    const url = useSyncExternalStore(subscription, () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; }, serverState ? () => serverState.url : () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; });
+    const route = useSyncExternalStore(subscription, () => router.getLastRoute?.() ?? lastRoute, serverState ? () => serverState.route : () => router.getLastRoute?.() ?? lastRoute);
+    const url = useSyncExternalStore(subscription, () => router.getLastUrl?.() ?? lastUrl, serverState ? () => serverState.url : () => router.getLastUrl?.() ?? lastUrl);
     return (jsx(RouterContext.Provider, { value: router, children: jsx(RouteContext.Provider, { value: route, children: jsx(UrlContext.Provider, { value: url, children: children }) }) }));
 };
 DefaultProvider.displayName = 'TinkoffRouterProvider';

package/lib/components/react/providers/default.es.js

@@ -8,8 +8,8 @@ const DefaultProvider = ({ router, children, serverState, }) => {
     const lastRoute = useMemo(() => router.getCurrentRoute(), [router]);
     const lastUrl = useMemo(() => router.getCurrentUrl(), [router]);
     const subscription = useCallback((cb) => router.registerSyncHook('change', cb), [router]);
-    const route = useSyncExternalStore(subscription, () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; }, serverState ? () => serverState.route : () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; });
-    const url = useSyncExternalStore(subscription, () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; }, serverState ? () => serverState.url : () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; });
+    const route = useSyncExternalStore(subscription, () => router.getLastRoute?.() ?? lastRoute, serverState ? () => serverState.route : () => router.getLastRoute?.() ?? lastRoute);
+    const url = useSyncExternalStore(subscription, () => router.getLastUrl?.() ?? lastUrl, serverState ? () => serverState.url : () => router.getLastUrl?.() ?? lastUrl);
     return (jsx(RouterContext.Provider, { value: router, children: jsx(RouteContext.Provider, { value: route, children: jsx(UrlContext.Provider, { value: url, children: children }) }) }));
 };
 DefaultProvider.displayName = 'TinkoffRouterProvider';

package/lib/components/react/providers/default.js

@@ -12,8 +12,8 @@ const DefaultProvider = ({ router, children, serverState, }) => {
     const lastRoute = react.useMemo(() => router.getCurrentRoute(), [router]);
     const lastUrl = react.useMemo(() => router.getCurrentUrl(), [router]);
     const subscription = react.useCallback((cb) => router.registerSyncHook('change', cb), [router]);
-    const route = shim.useSyncExternalStore(subscription, () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; }, serverState ? () => serverState.route : () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; });
-    const url = shim.useSyncExternalStore(subscription, () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; }, serverState ? () => serverState.url : () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; });
+    const route = shim.useSyncExternalStore(subscription, () => router.getLastRoute?.() ?? lastRoute, serverState ? () => serverState.route : () => router.getLastRoute?.() ?? lastRoute);
+    const url = shim.useSyncExternalStore(subscription, () => router.getLastUrl?.() ?? lastUrl, serverState ? () => serverState.url : () => router.getLastUrl?.() ?? lastUrl);
     return (jsxRuntime.jsx(context.RouterContext.Provider, { value: router, children: jsxRuntime.jsx(context.RouteContext.Provider, { value: route, children: jsxRuntime.jsx(context.UrlContext.Provider, { value: url, children: children }) }) }));
 };
 DefaultProvider.displayName = 'TinkoffRouterProvider';

package/lib/components/react/providers/transitions.browser.js

@@ -17,13 +17,10 @@ const startReactTransition = typeof startTransition === 'function' && process.en
     };
 const TransitionsProvider = ({ router, children, }) => {
     // fallback to outdated router implementation
-    const [state, setState] = useState(() => {
-        var _a, _b;
-        return ({
-            route: (_a = router.getLastRoute()) !== null && _a !== void 0 ? _a : router.getCurrentRoute(),
-            url: (_b = router.getLastUrl()) !== null && _b !== void 0 ? _b : router.getCurrentUrl(),
-        });
-    });
+    const [state, setState] = useState(() => ({
+        route: router.getLastRoute() ?? router.getCurrentRoute(),
+        url: router.getLastUrl() ?? router.getCurrentUrl(),
+    }));
     // Router state that will be applied to the DOM.
     const [pendingState, setPendingState] = useState(null);
     // View transition state for context.

package/lib/components/react/providers/transitions.es.js

@@ -17,13 +17,10 @@ const startReactTransition = typeof startTransition === 'function' && process.en
     };
 const TransitionsProvider = ({ router, children, }) => {
     // fallback to outdated router implementation
-    const [state, setState] = useState(() => {
-        var _a, _b;
-        return ({
-            route: (_a = router.getLastRoute()) !== null && _a !== void 0 ? _a : router.getCurrentRoute(),
-            url: (_b = router.getLastUrl()) !== null && _b !== void 0 ? _b : router.getCurrentUrl(),
-        });
-    });
+    const [state, setState] = useState(() => ({
+        route: router.getLastRoute() ?? router.getCurrentRoute(),
+        url: router.getLastUrl() ?? router.getCurrentUrl(),
+    }));
     // Router state that will be applied to the DOM.
     const [pendingState, setPendingState] = useState(null);
     // View transition state for context.

package/lib/components/react/providers/transitions.js

@@ -21,13 +21,10 @@ const startReactTransition = typeof startTransition === 'function' && process.en
     };
 const TransitionsProvider = ({ router, children, }) => {
     // fallback to outdated router implementation
-    const [state, setState] = react.useState(() => {
-        var _a, _b;
-        return ({
-            route: (_a = router.getLastRoute()) !== null && _a !== void 0 ? _a : router.getCurrentRoute(),
-            url: (_b = router.getLastUrl()) !== null && _b !== void 0 ? _b : router.getCurrentUrl(),
-        });
-    });
+    const [state, setState] = react.useState(() => ({
+        route: router.getLastRoute() ?? router.getCurrentRoute(),
+        url: router.getLastUrl() ?? router.getCurrentUrl(),
+    }));
     // Router state that will be applied to the DOM.
     const [pendingState, setPendingState] = react.useState(null);
     // View transition state for context.

package/lib/components/react/useNavigate.browser.js

@@ -9,7 +9,7 @@ const useNavigate = (rootOptions) => {
     const router = useRouter();
     const rootOpts = useShallowEqual(convertToNavigateOptions(rootOptions));
     return useCallback((specificOptions) => {
-        const opts = rootOpts !== null && rootOpts !== void 0 ? rootOpts : convertToNavigateOptions(specificOptions);
+        const opts = rootOpts ?? convertToNavigateOptions(specificOptions);
         return router.navigate(opts);
     }, [rootOpts, router]);
 };

package/lib/components/react/useNavigate.es.js

@@ -9,7 +9,7 @@ const useNavigate = (rootOptions) => {
     const router = useRouter();
     const rootOpts = useShallowEqual(convertToNavigateOptions(rootOptions));
     return useCallback((specificOptions) => {
-        const opts = rootOpts !== null && rootOpts !== void 0 ? rootOpts : convertToNavigateOptions(specificOptions);
+        const opts = rootOpts ?? convertToNavigateOptions(specificOptions);
         return router.navigate(opts);
     }, [rootOpts, router]);
 };

package/lib/components/react/useNavigate.js

@@ -13,7 +13,7 @@ const useNavigate = (rootOptions) => {
     const router = useRouter.useRouter();
     const rootOpts = reactHooks.useShallowEqual(convertToNavigateOptions(rootOptions));
     return react.useCallback((specificOptions) => {
-        const opts = rootOpts !== null && rootOpts !== void 0 ? rootOpts : convertToNavigateOptions(specificOptions);
+        const opts = rootOpts ?? convertToNavigateOptions(specificOptions);
         return router.navigate(opts);
     }, [rootOpts, router]);
 };

package/lib/history/client.browser.js

@@ -13,8 +13,8 @@ const generateKey = (navigation) => {
 const generatePreviousNavigateState = (navigation, currentState) => {
     const state = {};
     if (navigation.replace) {
-        const previousRoute = currentState === null || currentState === void 0 ? void 0 : currentState.navigateState.previousRoute;
-        const previousUrl = currentState === null || currentState === void 0 ? void 0 : currentState.navigateState.previousUrl;
+        const previousRoute = currentState?.navigateState.previousRoute;
+        const previousUrl = currentState?.navigateState.previousUrl;
         if (previousRoute) {
             state.previousRoute = previousRoute;
         }
@@ -64,14 +64,12 @@ class ClientHistory extends History {
         });
     }
     init(navigation) {
-        var _a;
-        this.currentState = isHistoryState((_a = window.history) === null || _a === void 0 ? void 0 : _a.state)
+        this.currentState = isHistoryState(window.history?.state)
             ? window.history.state
             : generateState(navigation);
         this.currentIndex = this.currentState.index;
         this.historyWrapper.init(this.currentState);
         this.historyWrapper.subscribe(async ({ path, state }) => {
-            var _a, _b;
             try {
                 let navigationType;
                 let navigateState;
@@ -98,10 +96,10 @@ class ClientHistory extends History {
                     url: path,
                     navigateState,
                 });
-                (_a = this.goPromiseResolve) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.goPromiseResolve?.();
             }
             catch (err) {
-                (_b = this.goPromiseReject) === null || _b === void 0 ? void 0 : _b.call(this, err);
+                this.goPromiseReject?.(err);
             }
         });
     }
@@ -118,9 +116,8 @@ class ClientHistory extends History {
         });
     }
     go(to, options) {
-        var _a;
         if (this.currentIndex < 1) {
-            if (options === null || options === void 0 ? void 0 : options.historyFallback) {
+            if (options?.historyFallback) {
                 return this.listener({
                     url: options.historyFallback,
                     type: 'navigate',
@@ -128,7 +125,7 @@ class ClientHistory extends History {
                     replace: options.replace,
                 });
             }
-            const historyFallbackRoute = (_a = this.tree) === null || _a === void 0 ? void 0 : _a.getHistoryFallback(window.location.pathname);
+            const historyFallbackRoute = this.tree?.getHistoryFallback(window.location.pathname);
             if (historyFallbackRoute) {
                 return this.listener({
                     url: historyFallbackRoute.actualPath,

package/lib/history/client.es.js

@@ -13,8 +13,8 @@ const generateKey = (navigation) => {
 const generatePreviousNavigateState = (navigation, currentState) => {
     const state = {};
     if (navigation.replace) {
-        const previousRoute = currentState === null || currentState === void 0 ? void 0 : currentState.navigateState.previousRoute;
-        const previousUrl = currentState === null || currentState === void 0 ? void 0 : currentState.navigateState.previousUrl;
+        const previousRoute = currentState?.navigateState.previousRoute;
+        const previousUrl = currentState?.navigateState.previousUrl;
         if (previousRoute) {
             state.previousRoute = previousRoute;
         }
@@ -64,14 +64,12 @@ class ClientHistory extends History {
         });
     }
     init(navigation) {
-        var _a;
-        this.currentState = isHistoryState((_a = window.history) === null || _a === void 0 ? void 0 : _a.state)
+        this.currentState = isHistoryState(window.history?.state)
             ? window.history.state
             : generateState(navigation);
         this.currentIndex = this.currentState.index;
         this.historyWrapper.init(this.currentState);
         this.historyWrapper.subscribe(async ({ path, state }) => {
-            var _a, _b;
             try {
                 let navigationType;
                 let navigateState;
@@ -98,10 +96,10 @@ class ClientHistory extends History {
                     url: path,
                     navigateState,
                 });
-                (_a = this.goPromiseResolve) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.goPromiseResolve?.();
             }
             catch (err) {
-                (_b = this.goPromiseReject) === null || _b === void 0 ? void 0 : _b.call(this, err);
+                this.goPromiseReject?.(err);
             }
         });
     }
@@ -118,9 +116,8 @@ class ClientHistory extends History {
         });
     }
     go(to, options) {
-        var _a;
         if (this.currentIndex < 1) {
-            if (options === null || options === void 0 ? void 0 : options.historyFallback) {
+            if (options?.historyFallback) {
                 return this.listener({
                     url: options.historyFallback,
                     type: 'navigate',
@@ -128,7 +125,7 @@ class ClientHistory extends History {
                     replace: options.replace,
                 });
             }
-            const historyFallbackRoute = (_a = this.tree) === null || _a === void 0 ? void 0 : _a.getHistoryFallback(window.location.pathname);
+            const historyFallbackRoute = this.tree?.getHistoryFallback(window.location.pathname);
             if (historyFallbackRoute) {
                 return this.listener({
                     url: historyFallbackRoute.actualPath,

package/lib/history/client.js

@@ -17,8 +17,8 @@ const generateKey = (navigation) => {
 const generatePreviousNavigateState = (navigation, currentState) => {
     const state = {};
     if (navigation.replace) {
-        const previousRoute = currentState === null || currentState === void 0 ? void 0 : currentState.navigateState.previousRoute;
-        const previousUrl = currentState === null || currentState === void 0 ? void 0 : currentState.navigateState.previousUrl;
+        const previousRoute = currentState?.navigateState.previousRoute;
+        const previousUrl = currentState?.navigateState.previousUrl;
         if (previousRoute) {
             state.previousRoute = previousRoute;
         }
@@ -68,14 +68,12 @@ class ClientHistory extends base.History {
         });
     }
     init(navigation) {
-        var _a;
-        this.currentState = isHistoryState((_a = window.history) === null || _a === void 0 ? void 0 : _a.state)
+        this.currentState = isHistoryState(window.history?.state)
             ? window.history.state
             : generateState(navigation);
         this.currentIndex = this.currentState.index;
         this.historyWrapper.init(this.currentState);
         this.historyWrapper.subscribe(async ({ path, state }) => {
-            var _a, _b;
             try {
                 let navigationType;
                 let navigateState;
@@ -102,10 +100,10 @@ class ClientHistory extends base.History {
                     url: path,
                     navigateState,
                 });
-                (_a = this.goPromiseResolve) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.goPromiseResolve?.();
             }
             catch (err) {
-                (_b = this.goPromiseReject) === null || _b === void 0 ? void 0 : _b.call(this, err);
+                this.goPromiseReject?.(err);
             }
         });
     }
@@ -122,9 +120,8 @@ class ClientHistory extends base.History {
         });
     }
     go(to, options) {
-        var _a;
         if (this.currentIndex < 1) {
-            if (options === null || options === void 0 ? void 0 : options.historyFallback) {
+            if (options?.historyFallback) {
                 return this.listener({
                     url: options.historyFallback,
                     type: 'navigate',
@@ -132,7 +129,7 @@ class ClientHistory extends base.History {
                     replace: options.replace,
                 });
             }
-            const historyFallbackRoute = (_a = this.tree) === null || _a === void 0 ? void 0 : _a.getHistoryFallback(window.location.pathname);
+            const historyFallbackRoute = this.tree?.getHistoryFallback(window.location.pathname);
             if (historyFallbackRoute) {
                 return this.listener({
                     url: historyFallbackRoute.actualPath,

package/lib/router/abstract.browser.js

@@ -12,10 +12,10 @@ class AbstractRouter {
         this.strictTrailingSlash = true;
         this.viewTransitionsEnabled = false;
         this.mergeSlashes = false;
-        this.trailingSlash = trailingSlash !== null && trailingSlash !== void 0 ? trailingSlash : false;
+        this.trailingSlash = trailingSlash ?? false;
         this.strictTrailingSlash = typeof trailingSlash === 'undefined';
-        this.mergeSlashes = mergeSlashes !== null && mergeSlashes !== void 0 ? mergeSlashes : false;
-        this.viewTransitionsEnabled = enableViewTransitions !== null && enableViewTransitions !== void 0 ? enableViewTransitions : false;
+        this.mergeSlashes = mergeSlashes ?? false;
+        this.viewTransitionsEnabled = enableViewTransitions ?? false;
         this.hooks = new Map([
             ['beforeResolve', new Set(beforeResolve)],
             ['beforeNavigate', new Set(beforeNavigate)],
@@ -39,23 +39,19 @@ class AbstractRouter {
         this.started = true;
     }
     getCurrentRoute() {
-        var _a, _b, _c;
         // when something will try to get currentRoute while navigating, it will get route which router currently navigating
         // in case some handler supposed to load data of route or similar
-        return (_b = (_a = this.currentNavigation) === null || _a === void 0 ? void 0 : _a.to) !== null && _b !== void 0 ? _b : (_c = this.lastNavigation) === null || _c === void 0 ? void 0 : _c.to;
+        return this.currentNavigation?.to ?? this.lastNavigation?.to;
     }
     getCurrentUrl() {
-        var _a, _b, _c;
         // same as getCurrentRoute
-        return (_b = (_a = this.currentNavigation) === null || _a === void 0 ? void 0 : _a.url) !== null && _b !== void 0 ? _b : (_c = this.lastNavigation) === null || _c === void 0 ? void 0 : _c.url;
+        return this.currentNavigation?.url ?? this.lastNavigation?.url;
     }
     getLastRoute() {
-        var _a;
-        return (_a = this.lastNavigation) === null || _a === void 0 ? void 0 : _a.to;
+        return this.lastNavigation?.to;
     }
     getLastUrl() {
-        var _a;
-        return (_a = this.lastNavigation) === null || _a === void 0 ? void 0 : _a.url;
+        return this.lastNavigation?.url;
     }
     commitNavigation(navigation) {
         logger.debug({
@@ -74,8 +70,7 @@ class AbstractRouter {
         return this.internalUpdateCurrentRoute(updateRouteOptions, {});
     }
     async internalUpdateCurrentRoute(updateRouteOptions, { history }) {
-        var _a;
-        const prevNavigation = (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
+        const prevNavigation = this.currentNavigation ?? this.lastNavigation;
         if (!prevNavigation) {
             throw new Error('updateCurrentRoute should only be called after navigate to some route');
         }
@@ -109,16 +104,15 @@ class AbstractRouter {
         return this.internalNavigate(makeNavigateOptions(navigateOptions), {});
     }
     async internalNavigate(navigateOptions, { history, redirect }) {
-        var _a;
         const { url, replace, params, navigateState, code, viewTransition } = navigateOptions;
         const prevNavigation = redirect
             ? this.lastNavigation
-            : (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
+            : this.currentNavigation ?? this.lastNavigation;
         if (!url && !prevNavigation) {
             throw new Error('Navigate url should be specified and cannot be omitted for first navigation');
         }
         const resolvedUrl = this.resolveUrl(navigateOptions);
-        const { to: from, url: fromUrl } = prevNavigation !== null && prevNavigation !== void 0 ? prevNavigation : {};
+        const { to: from, url: fromUrl } = prevNavigation ?? {};
         const redirectFrom = redirect ? this.currentNavigation.to : undefined;
         let navigation = {
             type: 'navigate',
@@ -199,17 +193,15 @@ class AbstractRouter {
         throw new Error('Not implemented');
     }
     addRoute(route) {
-        var _a;
-        (_a = this.tree) === null || _a === void 0 ? void 0 : _a.addRoute(route);
+        this.tree?.addRoute(route);
     }
     async redirect(navigation, target) {
-        var _a;
         logger.debug({
             event: 'redirect',
             navigation,
             target,
         });
-        return (_a = this.onRedirect) === null || _a === void 0 ? void 0 : _a.call(this, {
+        return this.onRedirect?.({
             ...navigation,
             from: navigation.to,
             fromUrl: navigation.url,
@@ -218,12 +210,11 @@ class AbstractRouter {
         });
     }
     async notfound(navigation) {
-        var _a;
         logger.debug({
             event: 'not-found',
             navigation,
         });
-        return (_a = this.onNotFound) === null || _a === void 0 ? void 0 : _a.call(this, navigation);
+        return this.onNotFound?.(navigation);
     }
     async block(navigation) {
         logger.debug({
@@ -248,10 +239,9 @@ class AbstractRouter {
         return normalized;
     }
     resolveUrl({ url, query = {}, params, preserveQuery, hash }) {
-        var _a;
         const currentRoute = this.getCurrentRoute();
         const currentUrl = this.getCurrentUrl();
-        const resultUrl = url ? rawResolveUrl((_a = currentUrl === null || currentUrl === void 0 ? void 0 : currentUrl.href) !== null && _a !== void 0 ? _a : '', url) : rawParse(currentUrl.href);
+        const resultUrl = url ? rawResolveUrl(currentUrl?.href ?? '', url) : rawParse(currentUrl.href);
         let { pathname } = resultUrl;
         if (params) {
             if (url) {
@@ -271,15 +261,14 @@ class AbstractRouter {
                 ...(preserveQuery ? this.getCurrentUrl().query : {}),
                 ...query,
             },
-            hash: hash !== null && hash !== void 0 ? hash : resultUrl.hash,
+            hash: hash ?? resultUrl.hash,
         }));
     }
     resolveRoute({ url, params, navigateState }, { wildcard } = {}) {
-        var _a, _b;
-        let route = url ? (_a = this.tree) === null || _a === void 0 ? void 0 : _a.getRoute(url.pathname) : this.getCurrentRoute();
+        let route = url ? this.tree?.getRoute(url.pathname) : this.getCurrentRoute();
         if (wildcard && !route && url) {
             // if ordinary route not found look for a wildcard route
-            route = (_b = this.tree) === null || _b === void 0 ? void 0 : _b.getWildcard(url.pathname);
+            route = this.tree?.getWildcard(url.pathname);
         }
         if (!route) {
             return;

package/lib/router/abstract.es.js

@@ -12,10 +12,10 @@ class AbstractRouter {
         this.strictTrailingSlash = true;
         this.viewTransitionsEnabled = false;
         this.mergeSlashes = false;
-        this.trailingSlash = trailingSlash !== null && trailingSlash !== void 0 ? trailingSlash : false;
+        this.trailingSlash = trailingSlash ?? false;
         this.strictTrailingSlash = typeof trailingSlash === 'undefined';
-        this.mergeSlashes = mergeSlashes !== null && mergeSlashes !== void 0 ? mergeSlashes : false;
-        this.viewTransitionsEnabled = enableViewTransitions !== null && enableViewTransitions !== void 0 ? enableViewTransitions : false;
+        this.mergeSlashes = mergeSlashes ?? false;
+        this.viewTransitionsEnabled = enableViewTransitions ?? false;
         this.hooks = new Map([
             ['beforeResolve', new Set(beforeResolve)],
             ['beforeNavigate', new Set(beforeNavigate)],
@@ -39,23 +39,19 @@ class AbstractRouter {
         this.started = true;
     }
     getCurrentRoute() {
-        var _a, _b, _c;
         // when something will try to get currentRoute while navigating, it will get route which router currently navigating
         // in case some handler supposed to load data of route or similar
-        return (_b = (_a = this.currentNavigation) === null || _a === void 0 ? void 0 : _a.to) !== null && _b !== void 0 ? _b : (_c = this.lastNavigation) === null || _c === void 0 ? void 0 : _c.to;
+        return this.currentNavigation?.to ?? this.lastNavigation?.to;
     }
     getCurrentUrl() {
-        var _a, _b, _c;
         // same as getCurrentRoute
-        return (_b = (_a = this.currentNavigation) === null || _a === void 0 ? void 0 : _a.url) !== null && _b !== void 0 ? _b : (_c = this.lastNavigation) === null || _c === void 0 ? void 0 : _c.url;
+        return this.currentNavigation?.url ?? this.lastNavigation?.url;
     }
     getLastRoute() {
-        var _a;
-        return (_a = this.lastNavigation) === null || _a === void 0 ? void 0 : _a.to;
+        return this.lastNavigation?.to;
     }
     getLastUrl() {
-        var _a;
-        return (_a = this.lastNavigation) === null || _a === void 0 ? void 0 : _a.url;
+        return this.lastNavigation?.url;
     }
     commitNavigation(navigation) {
         logger.debug({
@@ -74,8 +70,7 @@ class AbstractRouter {
         return this.internalUpdateCurrentRoute(updateRouteOptions, {});
     }
     async internalUpdateCurrentRoute(updateRouteOptions, { history }) {
-        var _a;
-        const prevNavigation = (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
+        const prevNavigation = this.currentNavigation ?? this.lastNavigation;
         if (!prevNavigation) {
             throw new Error('updateCurrentRoute should only be called after navigate to some route');
         }
@@ -109,16 +104,15 @@ class AbstractRouter {
         return this.internalNavigate(makeNavigateOptions(navigateOptions), {});
     }
     async internalNavigate(navigateOptions, { history, redirect }) {
-        var _a;
         const { url, replace, params, navigateState, code, viewTransition } = navigateOptions;
         const prevNavigation = redirect
             ? this.lastNavigation
-            : (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
+            : this.currentNavigation ?? this.lastNavigation;
         if (!url && !prevNavigation) {
             throw new Error('Navigate url should be specified and cannot be omitted for first navigation');
         }
         const resolvedUrl = this.resolveUrl(navigateOptions);
-        const { to: from, url: fromUrl } = prevNavigation !== null && prevNavigation !== void 0 ? prevNavigation : {};
+        const { to: from, url: fromUrl } = prevNavigation ?? {};
         const redirectFrom = redirect ? this.currentNavigation.to : undefined;
         let navigation = {
             type: 'navigate',
@@ -199,17 +193,15 @@ class AbstractRouter {
         throw new Error('Not implemented');
     }
     addRoute(route) {
-        var _a;
-        (_a = this.tree) === null || _a === void 0 ? void 0 : _a.addRoute(route);
+        this.tree?.addRoute(route);
     }
     async redirect(navigation, target) {
-        var _a;
         logger.debug({
             event: 'redirect',
             navigation,
             target,
         });
-        return (_a = this.onRedirect) === null || _a === void 0 ? void 0 : _a.call(this, {
+        return this.onRedirect?.({
             ...navigation,
             from: navigation.to,
             fromUrl: navigation.url,
@@ -218,12 +210,11 @@ class AbstractRouter {
         });
     }
     async notfound(navigation) {
-        var _a;
         logger.debug({
             event: 'not-found',
             navigation,
         });
-        return (_a = this.onNotFound) === null || _a === void 0 ? void 0 : _a.call(this, navigation);
+        return this.onNotFound?.(navigation);
     }
     async block(navigation) {
         logger.debug({
@@ -248,10 +239,9 @@ class AbstractRouter {
         return normalized;
     }
     resolveUrl({ url, query = {}, params, preserveQuery, hash }) {
-        var _a;
         const currentRoute = this.getCurrentRoute();
         const currentUrl = this.getCurrentUrl();
-        const resultUrl = url ? rawResolveUrl((_a = currentUrl === null || currentUrl === void 0 ? void 0 : currentUrl.href) !== null && _a !== void 0 ? _a : '', url) : rawParse(currentUrl.href);
+        const resultUrl = url ? rawResolveUrl(currentUrl?.href ?? '', url) : rawParse(currentUrl.href);
         let { pathname } = resultUrl;
         if (params) {
             if (url) {
@@ -271,15 +261,14 @@ class AbstractRouter {
                 ...(preserveQuery ? this.getCurrentUrl().query : {}),
                 ...query,
             },
-            hash: hash !== null && hash !== void 0 ? hash : resultUrl.hash,
+            hash: hash ?? resultUrl.hash,
         }));
     }
     resolveRoute({ url, params, navigateState }, { wildcard } = {}) {
-        var _a, _b;
-        let route = url ? (_a = this.tree) === null || _a === void 0 ? void 0 : _a.getRoute(url.pathname) : this.getCurrentRoute();
+        let route = url ? this.tree?.getRoute(url.pathname) : this.getCurrentRoute();
         if (wildcard && !route && url) {
             // if ordinary route not found look for a wildcard route
-            route = (_b = this.tree) === null || _b === void 0 ? void 0 : _b.getWildcard(url.pathname);
+            route = this.tree?.getWildcard(url.pathname);
         }
         if (!route) {
             return;

package/lib/router/abstract.js

@@ -21,10 +21,10 @@ class AbstractRouter {
         this.strictTrailingSlash = true;
         this.viewTransitionsEnabled = false;
         this.mergeSlashes = false;
-        this.trailingSlash = trailingSlash !== null && trailingSlash !== void 0 ? trailingSlash : false;
+        this.trailingSlash = trailingSlash ?? false;
         this.strictTrailingSlash = typeof trailingSlash === 'undefined';
-        this.mergeSlashes = mergeSlashes !== null && mergeSlashes !== void 0 ? mergeSlashes : false;
-        this.viewTransitionsEnabled = enableViewTransitions !== null && enableViewTransitions !== void 0 ? enableViewTransitions : false;
+        this.mergeSlashes = mergeSlashes ?? false;
+        this.viewTransitionsEnabled = enableViewTransitions ?? false;
         this.hooks = new Map([
             ['beforeResolve', new Set(beforeResolve)],
             ['beforeNavigate', new Set(beforeNavigate)],
@@ -48,23 +48,19 @@ class AbstractRouter {
         this.started = true;
     }
     getCurrentRoute() {
-        var _a, _b, _c;
         // when something will try to get currentRoute while navigating, it will get route which router currently navigating
         // in case some handler supposed to load data of route or similar
-        return (_b = (_a = this.currentNavigation) === null || _a === void 0 ? void 0 : _a.to) !== null && _b !== void 0 ? _b : (_c = this.lastNavigation) === null || _c === void 0 ? void 0 : _c.to;
+        return this.currentNavigation?.to ?? this.lastNavigation?.to;
     }
     getCurrentUrl() {
-        var _a, _b, _c;
         // same as getCurrentRoute
-        return (_b = (_a = this.currentNavigation) === null || _a === void 0 ? void 0 : _a.url) !== null && _b !== void 0 ? _b : (_c = this.lastNavigation) === null || _c === void 0 ? void 0 : _c.url;
+        return this.currentNavigation?.url ?? this.lastNavigation?.url;
     }
     getLastRoute() {
-        var _a;
-        return (_a = this.lastNavigation) === null || _a === void 0 ? void 0 : _a.to;
+        return this.lastNavigation?.to;
     }
     getLastUrl() {
-        var _a;
-        return (_a = this.lastNavigation) === null || _a === void 0 ? void 0 : _a.url;
+        return this.lastNavigation?.url;
     }
     commitNavigation(navigation) {
         logger.logger.debug({
@@ -83,8 +79,7 @@ class AbstractRouter {
         return this.internalUpdateCurrentRoute(updateRouteOptions, {});
     }
     async internalUpdateCurrentRoute(updateRouteOptions, { history }) {
-        var _a;
-        const prevNavigation = (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
+        const prevNavigation = this.currentNavigation ?? this.lastNavigation;
         if (!prevNavigation) {
             throw new Error('updateCurrentRoute should only be called after navigate to some route');
         }
@@ -118,16 +113,15 @@ class AbstractRouter {
         return this.internalNavigate(utils.makeNavigateOptions(navigateOptions), {});
     }
     async internalNavigate(navigateOptions, { history, redirect }) {
-        var _a;
         const { url, replace, params, navigateState, code, viewTransition } = navigateOptions;
         const prevNavigation = redirect
             ? this.lastNavigation
-            : (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
+            : this.currentNavigation ?? this.lastNavigation;
         if (!url && !prevNavigation) {
             throw new Error('Navigate url should be specified and cannot be omitted for first navigation');
         }
         const resolvedUrl = this.resolveUrl(navigateOptions);
-        const { to: from, url: fromUrl } = prevNavigation !== null && prevNavigation !== void 0 ? prevNavigation : {};
+        const { to: from, url: fromUrl } = prevNavigation ?? {};
         const redirectFrom = redirect ? this.currentNavigation.to : undefined;
         let navigation = {
             type: 'navigate',
@@ -208,17 +202,15 @@ class AbstractRouter {
         throw new Error('Not implemented');
     }
     addRoute(route) {
-        var _a;
-        (_a = this.tree) === null || _a === void 0 ? void 0 : _a.addRoute(route);
+        this.tree?.addRoute(route);
     }
     async redirect(navigation, target) {
-        var _a;
         logger.logger.debug({
             event: 'redirect',
             navigation,
             target,
         });
-        return (_a = this.onRedirect) === null || _a === void 0 ? void 0 : _a.call(this, {
+        return this.onRedirect?.({
             ...navigation,
             from: navigation.to,
             fromUrl: navigation.url,
@@ -227,12 +219,11 @@ class AbstractRouter {
         });
     }
     async notfound(navigation) {
-        var _a;
         logger.logger.debug({
             event: 'not-found',
             navigation,
         });
-        return (_a = this.onNotFound) === null || _a === void 0 ? void 0 : _a.call(this, navigation);
+        return this.onNotFound?.(navigation);
     }
     async block(navigation) {
         logger.logger.debug({
@@ -257,10 +248,9 @@ class AbstractRouter {
         return normalized;
     }
     resolveUrl({ url: url$1, query = {}, params, preserveQuery, hash }) {
-        var _a;
         const currentRoute = this.getCurrentRoute();
         const currentUrl = this.getCurrentUrl();
-        const resultUrl = url$1 ? url.rawResolveUrl((_a = currentUrl === null || currentUrl === void 0 ? void 0 : currentUrl.href) !== null && _a !== void 0 ? _a : '', url$1) : url.rawParse(currentUrl.href);
+        const resultUrl = url$1 ? url.rawResolveUrl(currentUrl?.href ?? '', url$1) : url.rawParse(currentUrl.href);
         let { pathname } = resultUrl;
         if (params) {
             if (url$1) {
@@ -280,15 +270,14 @@ class AbstractRouter {
                 ...(preserveQuery ? this.getCurrentUrl().query : {}),
                 ...query,
             },
-            hash: hash !== null && hash !== void 0 ? hash : resultUrl.hash,
+            hash: hash ?? resultUrl.hash,
         }));
     }
     resolveRoute({ url, params, navigateState }, { wildcard } = {}) {
-        var _a, _b;
-        let route = url ? (_a = this.tree) === null || _a === void 0 ? void 0 : _a.getRoute(url.pathname) : this.getCurrentRoute();
+        let route = url ? this.tree?.getRoute(url.pathname) : this.getCurrentRoute();
         if (wildcard && !route && url) {
             // if ordinary route not found look for a wildcard route
-            route = (_b = this.tree) === null || _b === void 0 ? void 0 : _b.getWildcard(url.pathname);
+            route = this.tree?.getWildcard(url.pathname);
         }
         if (!route) {
             return;

package/lib/router/browser.browser.js

@@ -112,10 +112,9 @@ class Router extends ClientRouter {
     async resolveIfDelayFound(task) {
         let delayResolve;
         const timer = setInterval(() => {
-            var _a;
             if (this.delayedNavigation) {
                 if (this.delayedNavigation.type === 'navigate' ||
-                    this.delayedNavigation.type === ((_a = this.currentNavigation) === null || _a === void 0 ? void 0 : _a.type)) {
+                    this.delayedNavigation.type === this.currentNavigation?.type) {
                     logger.info({
                         event: 'delay-navigation-found',
                         navigation: this.delayedNavigation,
@@ -160,11 +159,9 @@ class Router extends ClientRouter {
         };
         return flatten(navigation)
             .then(() => {
-            var _a;
-            (_a = this.delayedResolve) === null || _a === void 0 ? void 0 : _a.call(this);
+            this.delayedResolve?.();
         }, (err) => {
-            var _a;
-            (_a = this.delayedReject) === null || _a === void 0 ? void 0 : _a.call(this, err);
+            this.delayedReject?.(err);
         })
             .finally(() => {
             this.delayedPromise = null;
@@ -173,11 +170,10 @@ class Router extends ClientRouter {
         });
     }
     shouldApplyViewTransition(navigation) {
-        var _a, _b;
         const from = navigation.from.actualPath;
         const to = navigation.to.redirect !== undefined
-            ? (_a = this.resolve(navigation.to.redirect)) === null || _a === void 0 ? void 0 : _a.actualPath
-            : (_b = navigation.to) === null || _b === void 0 ? void 0 : _b.actualPath;
+            ? this.resolve(navigation.to.redirect)?.actualPath
+            : navigation.to?.actualPath;
         // If View Transition enabled to current navigation, save it
         if (navigation.viewTransition) {
             const toPaths = this.appliedViewTransitions.get(from);

package/lib/router/client.browser.js

@@ -11,7 +11,6 @@ class ClientRouter extends AbstractRouter {
         this.fullRehydrationInProcess = null;
         this.history = new ClientHistory();
         this.history.listen(async ({ type, url, navigateState, replace, history }) => {
-            var _a;
             const currentUrl = this.getCurrentUrl();
             const { pathname, query } = this.resolveUrl({ url });
             const isSameUrlNavigation = (currentUrl ? currentUrl.pathname : window.location.pathname) === pathname;
@@ -34,9 +33,9 @@ class ClientRouter extends AbstractRouter {
                 return;
             }
             if (type === 'updateCurrentRoute' || (!type && isSameUrlNavigation)) {
-                const route = (_a = this.tree) === null || _a === void 0 ? void 0 : _a.getRoute(pathname);
+                const route = this.tree?.getRoute(pathname);
                 await this.internalUpdateCurrentRoute({
-                    params: route === null || route === void 0 ? void 0 : route.params,
+                    params: route?.params,
                     query,
                     replace,
                     navigateState,
@@ -67,7 +66,7 @@ class ClientRouter extends AbstractRouter {
         if (this.fullRehydrationInProcess) {
             await this.runHooks('beforeResolve', this.currentNavigation);
             const to = this.resolveRoute({ url }, { wildcard: true });
-            const redirect = to === null || to === void 0 ? void 0 : to.redirect;
+            const redirect = to?.redirect;
             this.currentNavigation.to = to;
             if (redirect) {
                 return this.redirect(this.currentNavigation, makeNavigateOptions(redirect));
@@ -103,10 +102,9 @@ class ClientRouter extends AbstractRouter {
         return super.resolveRoute(...options);
     }
     async notfound(navigation) {
-        var _a, _b;
         await super.notfound(navigation);
         // in case we didn't find any matched route just force hard page navigation
-        const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
+        const prevUrl = navigation.fromUrl?.href ?? window.location.href;
         const nextUrl = navigation.url.href;
         const isNoSpaNavigation = navigation.from && !navigation.to;
         // prevent redirect cycle on the same page,

package/lib/router/client.es.js

@@ -11,7 +11,6 @@ class ClientRouter extends AbstractRouter {
         this.fullRehydrationInProcess = null;
         this.history = new ClientHistory();
         this.history.listen(async ({ type, url, navigateState, replace, history }) => {
-            var _a;
             const currentUrl = this.getCurrentUrl();
             const { pathname, query } = this.resolveUrl({ url });
             const isSameUrlNavigation = (currentUrl ? currentUrl.pathname : window.location.pathname) === pathname;
@@ -34,9 +33,9 @@ class ClientRouter extends AbstractRouter {
                 return;
             }
             if (type === 'updateCurrentRoute' || (!type && isSameUrlNavigation)) {
-                const route = (_a = this.tree) === null || _a === void 0 ? void 0 : _a.getRoute(pathname);
+                const route = this.tree?.getRoute(pathname);
                 await this.internalUpdateCurrentRoute({
-                    params: route === null || route === void 0 ? void 0 : route.params,
+                    params: route?.params,
                     query,
                     replace,
                     navigateState,
@@ -67,7 +66,7 @@ class ClientRouter extends AbstractRouter {
         if (this.fullRehydrationInProcess) {
             await this.runHooks('beforeResolve', this.currentNavigation);
             const to = this.resolveRoute({ url }, { wildcard: true });
-            const redirect = to === null || to === void 0 ? void 0 : to.redirect;
+            const redirect = to?.redirect;
             this.currentNavigation.to = to;
             if (redirect) {
                 return this.redirect(this.currentNavigation, makeNavigateOptions(redirect));
@@ -103,10 +102,9 @@ class ClientRouter extends AbstractRouter {
         return super.resolveRoute(...options);
     }
     async notfound(navigation) {
-        var _a, _b;
         await super.notfound(navigation);
         // in case we didn't find any matched route just force hard page navigation
-        const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
+        const prevUrl = navigation.fromUrl?.href ?? window.location.href;
         const nextUrl = navigation.url.href;
         const isNoSpaNavigation = navigation.from && !navigation.to;
         // prevent redirect cycle on the same page,

package/lib/router/client.js

@@ -15,7 +15,6 @@ class ClientRouter extends abstract.AbstractRouter {
         this.fullRehydrationInProcess = null;
         this.history = new client.ClientHistory();
         this.history.listen(async ({ type, url, navigateState, replace, history }) => {
-            var _a;
             const currentUrl = this.getCurrentUrl();
             const { pathname, query } = this.resolveUrl({ url });
             const isSameUrlNavigation = (currentUrl ? currentUrl.pathname : window.location.pathname) === pathname;
@@ -38,9 +37,9 @@ class ClientRouter extends abstract.AbstractRouter {
                 return;
             }
             if (type === 'updateCurrentRoute' || (!type && isSameUrlNavigation)) {
-                const route = (_a = this.tree) === null || _a === void 0 ? void 0 : _a.getRoute(pathname);
+                const route = this.tree?.getRoute(pathname);
                 await this.internalUpdateCurrentRoute({
-                    params: route === null || route === void 0 ? void 0 : route.params,
+                    params: route?.params,
                     query,
                     replace,
                     navigateState,
@@ -71,7 +70,7 @@ class ClientRouter extends abstract.AbstractRouter {
         if (this.fullRehydrationInProcess) {
             await this.runHooks('beforeResolve', this.currentNavigation);
             const to = this.resolveRoute({ url: url$1 }, { wildcard: true });
-            const redirect = to === null || to === void 0 ? void 0 : to.redirect;
+            const redirect = to?.redirect;
             this.currentNavigation.to = to;
             if (redirect) {
                 return this.redirect(this.currentNavigation, utils.makeNavigateOptions(redirect));
@@ -107,10 +106,9 @@ class ClientRouter extends abstract.AbstractRouter {
         return super.resolveRoute(...options);
     }
     async notfound(navigation) {
-        var _a, _b;
         await super.notfound(navigation);
         // in case we didn't find any matched route just force hard page navigation
-        const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
+        const prevUrl = navigation.fromUrl?.href ?? window.location.href;
         const nextUrl = navigation.url.href;
         const isNoSpaNavigation = navigation.from && !navigation.to;
         // prevent redirect cycle on the same page,

package/lib/router/server.es.js

@@ -6,11 +6,10 @@ import { logger } from '../logger.es.js';
 
 class Router extends AbstractRouter {
     constructor(options) {
-        var _a;
         super(options);
         this.blocked = false;
         this.tree = new RouteTree(options.routes);
-        this.defaultRedirectCode = (_a = options.defaultRedirectCode) !== null && _a !== void 0 ? _a : 308;
+        this.defaultRedirectCode = options.defaultRedirectCode ?? 308;
         this.history = new ServerHistory();
     }
     async dehydrate() {

package/lib/router/server.js

@@ -10,11 +10,10 @@ var logger = require('../logger.js');
 
 class Router extends abstract.AbstractRouter {
     constructor(options) {
-        var _a;
         super(options);
         this.blocked = false;
         this.tree = new tree.RouteTree(options.routes);
-        this.defaultRedirectCode = (_a = options.defaultRedirectCode) !== null && _a !== void 0 ? _a : 308;
+        this.defaultRedirectCode = options.defaultRedirectCode ?? 308;
         this.history = new server.ServerHistory();
     }
     async dehydrate() {

package/lib/tree/tree.browser.js

@@ -15,7 +15,7 @@ const createNavigationRoute = (route, pathname, params) => {
     return {
         ...route,
         actualPath: pathname,
-        params: params !== null && params !== void 0 ? params : {},
+        params: params ?? {},
     };
 };
 class RouteTree {
@@ -131,8 +131,8 @@ class RouteTree {
             for (let i = parameters.length - 1; i >= 0; i--) {
                 const param = parameters[i];
                 const { paramName, tree, regexp } = param;
-                const match = regexp === null || regexp === void 0 ? void 0 : regexp.exec(part);
-                const paramValue = regexp ? match === null || match === void 0 ? void 0 : match[1] : part;
+                const match = regexp?.exec(part);
+                const paramValue = regexp ? match?.[1] : part;
                 if (paramValue) {
                     queue.push([tree, index + 1, { ...params, [paramName]: paramValue }]);
                 }

package/lib/tree/tree.es.js

@@ -15,7 +15,7 @@ const createNavigationRoute = (route, pathname, params) => {
     return {
         ...route,
         actualPath: pathname,
-        params: params !== null && params !== void 0 ? params : {},
+        params: params ?? {},
     };
 };
 class RouteTree {
@@ -131,8 +131,8 @@ class RouteTree {
             for (let i = parameters.length - 1; i >= 0; i--) {
                 const param = parameters[i];
                 const { paramName, tree, regexp } = param;
-                const match = regexp === null || regexp === void 0 ? void 0 : regexp.exec(part);
-                const paramValue = regexp ? match === null || match === void 0 ? void 0 : match[1] : part;
+                const match = regexp?.exec(part);
+                const paramValue = regexp ? match?.[1] : part;
                 if (paramValue) {
                     queue.push([tree, index + 1, { ...params, [paramName]: paramValue }]);
                 }

package/lib/tree/tree.js

@@ -25,7 +25,7 @@ const createNavigationRoute = (route, pathname, params) => {
     return {
         ...route,
         actualPath: pathname,
-        params: params !== null && params !== void 0 ? params : {},
+        params: params ?? {},
     };
 };
 class RouteTree {
@@ -141,8 +141,8 @@ class RouteTree {
             for (let i = parameters.length - 1; i >= 0; i--) {
                 const param = parameters[i];
                 const { paramName, tree, regexp } = param;
-                const match = regexp === null || regexp === void 0 ? void 0 : regexp.exec(part);
-                const paramValue = regexp ? match === null || match === void 0 ? void 0 : match[1] : part;
+                const match = regexp?.exec(part);
+                const paramValue = regexp ? match?.[1] : part;
                 if (paramValue) {
                     queue.push([tree, index + 1, { ...params, [paramName]: paramValue }]);
                 }

package/lib/tree/utils.browser.js

@@ -46,7 +46,6 @@ const parse = (part) => {
 const makePath = (pathname, params) => {
     const parts = getParts(pathname);
     const result = map((part) => {
-        var _a;
         if (isHistoryFallback(part) || isWildcard(part)) {
             throw new Error(`Pathname should be only a string with dynamic parameters, not a special string, got ${pathname}`);
         }
@@ -57,7 +56,7 @@ const makePath = (pathname, params) => {
                 throw new Error('parameters should satisfy pattern "prefix:paramName(regexp)\\?:postfix"');
             }
             const [, paramName, regexp, optional] = match;
-            const value = (_a = params[paramName]) === null || _a === void 0 ? void 0 : _a.toString();
+            const value = params[paramName]?.toString();
             if (optional && !value) {
                 return '';
             }

package/lib/tree/utils.es.js

@@ -46,7 +46,6 @@ const parse = (part) => {
 const makePath = (pathname, params) => {
     const parts = getParts(pathname);
     const result = map((part) => {
-        var _a;
         if (isHistoryFallback(part) || isWildcard(part)) {
             throw new Error(`Pathname should be only a string with dynamic parameters, not a special string, got ${pathname}`);
         }
@@ -57,7 +56,7 @@ const makePath = (pathname, params) => {
                 throw new Error('parameters should satisfy pattern "prefix:paramName(regexp)\\?:postfix"');
             }
             const [, paramName, regexp, optional] = match;
-            const value = (_a = params[paramName]) === null || _a === void 0 ? void 0 : _a.toString();
+            const value = params[paramName]?.toString();
             if (optional && !value) {
                 return '';
             }

package/lib/tree/utils.js

@@ -54,7 +54,6 @@ const parse = (part) => {
 const makePath = (pathname, params) => {
     const parts = getParts(pathname);
     const result = map__default["default"]((part) => {
-        var _a;
         if (isHistoryFallback(part) || isWildcard(part)) {
             throw new Error(`Pathname should be only a string with dynamic parameters, not a special string, got ${pathname}`);
         }
@@ -65,7 +64,7 @@ const makePath = (pathname, params) => {
                 throw new Error('parameters should satisfy pattern "prefix:paramName(regexp)\\?:postfix"');
             }
             const [, paramName, regexp, optional] = match;
-            const value = (_a = params[paramName]) === null || _a === void 0 ? void 0 : _a.toString();
+            const value = params[paramName]?.toString();
             if (optional && !value) {
                 return '';
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/router",
-  "version": "0.5.27",
+  "version": "0.5.47",
   "description": "router",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,7 +27,7 @@
     "use-sync-external-store": "^1.2.0"
   },
   "peerDependencies": {
-    "@tramvai/core": "5.10.0",
+    "@tramvai/core": "5.14.10",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"
   },