@tinkoff/router 0.2.2 → 0.2.4

package/lib/index.browser.js

@@ -70,7 +70,7 @@ const parseParameter = (part) => {
     const [, paramName, regexp, optional] = match;
     const useRegexp = prefix || postfix || regexp;
     return {
-        type: 3 /* parameter */,
+        type: 3 /* PartType.parameter */,
         paramName,
         regexp: useRegexp
             ? new RegExp(`^${prefix}(${regexp || '.+'})${optional ? '?' : ''}${postfix}$`)
@@ -80,15 +80,15 @@ const parseParameter = (part) => {
 };
 const parse = (part) => {
     if (isHistoryFallback(part)) {
-        return { type: 1 /* historyFallback */ };
+        return { type: 1 /* PartType.historyFallback */ };
     }
     if (isWildcard(part)) {
-        return { type: 2 /* wildcard */ };
+        return { type: 2 /* PartType.wildcard */ };
     }
     if (isParameterized(part)) {
         return parseParameter(part);
     }
-    return { type: 0 /* literal */, value: part };
+    return { type: 0 /* PartType.literal */, value: part };
 };
 const makePath = (pathname, params) => {
     const parts = getParts(pathname);
@@ -534,7 +534,7 @@ const supportsHtml5History = typeof window !== 'undefined' && window.history &&
 const wrapHistory = ({ onNavigate }) => {
     if (!supportsHtml5History) {
         const navigate = (data, title, url) => {
-            window.location.href = url;
+            window.location.href = url.toString();
         };
         window.history.pushState = navigate;
         window.history.replaceState = navigate;
@@ -574,7 +574,7 @@ const wrapHistory = ({ onNavigate }) => {
     };
     const browserNavigate = (replace = false) => {
         return (navigateState, title, url) => {
-            onNavigate({ url, replace, navigateState });
+            onNavigate({ url: url.toString(), replace, navigateState });
         };
     };
     window.history.pushState = browserNavigate(false);
@@ -841,15 +841,15 @@ class RouteTree {
         for (let i = 0; i < parts.length; i++) {
             const part = parts[i];
             const parsed = parse(part);
-            if (parsed.type === 1 /* historyFallback */) {
+            if (parsed.type === 1 /* PartType.historyFallback */) {
                 currentTree.historyFallbackRoute = route;
                 return;
             }
-            if (parsed.type === 2 /* wildcard */) {
+            if (parsed.type === 2 /* PartType.wildcard */) {
                 currentTree.wildcardRoute = route;
                 return;
             }
-            if (parsed.type === 3 /* parameter */) {
+            if (parsed.type === 3 /* PartType.parameter */) {
                 const { paramName, regexp, optional } = parsed;
                 // prevent from creating new entries for same route
                 const found = find((par) => par.key === part, currentTree.parameters);
@@ -1138,7 +1138,7 @@ const UrlContext = createContext(null);
 const Provider = ({ router, serverState, children }) => {
     const route = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastRoute(), serverState ? () => serverState.currentRoute : () => router.getLastRoute());
     const url = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastUrl(), serverState ? () => serverState.currentUrl : () => router.getLastUrl());
-    return (jsx(RouterContext.Provider, Object.assign({ value: router }, { children: jsx(RouteContext.Provider, Object.assign({ value: route }, { children: jsx(UrlContext.Provider, Object.assign({ value: url }, { children: children }), void 0) }), void 0) }), void 0));
+    return (jsx(RouterContext.Provider, { value: router, children: jsx(RouteContext.Provider, { value: route, children: jsx(UrlContext.Provider, { value: url, children: children }) }) }));
 };
 Provider.displayName = 'Provider';
 
@@ -1190,7 +1190,7 @@ function Link(props) {
     }
     return (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    jsx("a", Object.assign({}, otherProps, extraProps, { children: children }), void 0));
+    jsx("a", { ...otherProps, ...extraProps, children: children }));
 }
 Link.displayName = 'Link';
 

package/lib/index.es.js

@@ -70,7 +70,7 @@ const parseParameter = (part) => {
     const [, paramName, regexp, optional] = match;
     const useRegexp = prefix || postfix || regexp;
     return {
-        type: 3 /* parameter */,
+        type: 3 /* PartType.parameter */,
         paramName,
         regexp: useRegexp
             ? new RegExp(`^${prefix}(${regexp || '.+'})${optional ? '?' : ''}${postfix}$`)
@@ -80,15 +80,15 @@ const parseParameter = (part) => {
 };
 const parse = (part) => {
     if (isHistoryFallback(part)) {
-        return { type: 1 /* historyFallback */ };
+        return { type: 1 /* PartType.historyFallback */ };
     }
     if (isWildcard(part)) {
-        return { type: 2 /* wildcard */ };
+        return { type: 2 /* PartType.wildcard */ };
     }
     if (isParameterized(part)) {
         return parseParameter(part);
     }
-    return { type: 0 /* literal */, value: part };
+    return { type: 0 /* PartType.literal */, value: part };
 };
 const makePath = (pathname, params) => {
     const parts = getParts(pathname);
@@ -567,15 +567,15 @@ class RouteTree {
         for (let i = 0; i < parts.length; i++) {
             const part = parts[i];
             const parsed = parse(part);
-            if (parsed.type === 1 /* historyFallback */) {
+            if (parsed.type === 1 /* PartType.historyFallback */) {
                 currentTree.historyFallbackRoute = route;
                 return;
             }
-            if (parsed.type === 2 /* wildcard */) {
+            if (parsed.type === 2 /* PartType.wildcard */) {
                 currentTree.wildcardRoute = route;
                 return;
             }
-            if (parsed.type === 3 /* parameter */) {
+            if (parsed.type === 3 /* PartType.parameter */) {
                 const { paramName, regexp, optional } = parsed;
                 // prevent from creating new entries for same route
                 const found = find((par) => par.key === part, currentTree.parameters);
@@ -764,7 +764,7 @@ const supportsHtml5History = typeof window !== 'undefined' && window.history &&
 const wrapHistory = ({ onNavigate }) => {
     if (!supportsHtml5History) {
         const navigate = (data, title, url) => {
-            window.location.href = url;
+            window.location.href = url.toString();
         };
         window.history.pushState = navigate;
         window.history.replaceState = navigate;
@@ -804,7 +804,7 @@ const wrapHistory = ({ onNavigate }) => {
     };
     const browserNavigate = (replace = false) => {
         return (navigateState, title, url) => {
-            onNavigate({ url, replace, navigateState });
+            onNavigate({ url: url.toString(), replace, navigateState });
         };
     };
     window.history.pushState = browserNavigate(false);
@@ -1066,7 +1066,7 @@ const UrlContext = createContext(null);
 const Provider = ({ router, serverState, children }) => {
     const route = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastRoute(), serverState ? () => serverState.currentRoute : () => router.getLastRoute());
     const url = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastUrl(), serverState ? () => serverState.currentUrl : () => router.getLastUrl());
-    return (jsx(RouterContext.Provider, Object.assign({ value: router }, { children: jsx(RouteContext.Provider, Object.assign({ value: route }, { children: jsx(UrlContext.Provider, Object.assign({ value: url }, { children: children }), void 0) }), void 0) }), void 0));
+    return (jsx(RouterContext.Provider, { value: router, children: jsx(RouteContext.Provider, { value: route, children: jsx(UrlContext.Provider, { value: url, children: children }) }) }));
 };
 Provider.displayName = 'Provider';
 
@@ -1118,7 +1118,7 @@ function Link(props) {
     }
     return (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    jsx("a", Object.assign({}, otherProps, extraProps, { children: children }), void 0));
+    jsx("a", { ...otherProps, ...extraProps, children: children }));
 }
 Link.displayName = 'Link';
 

package/lib/index.js

@@ -85,7 +85,7 @@ const parseParameter = (part) => {
     const [, paramName, regexp, optional] = match;
     const useRegexp = prefix || postfix || regexp;
     return {
-        type: 3 /* parameter */,
+        type: 3 /* PartType.parameter */,
         paramName,
         regexp: useRegexp
             ? new RegExp(`^${prefix}(${regexp || '.+'})${optional ? '?' : ''}${postfix}$`)
@@ -95,15 +95,15 @@ const parseParameter = (part) => {
 };
 const parse = (part) => {
     if (isHistoryFallback(part)) {
-        return { type: 1 /* historyFallback */ };
+        return { type: 1 /* PartType.historyFallback */ };
     }
     if (isWildcard(part)) {
-        return { type: 2 /* wildcard */ };
+        return { type: 2 /* PartType.wildcard */ };
     }
     if (isParameterized(part)) {
         return parseParameter(part);
     }
-    return { type: 0 /* literal */, value: part };
+    return { type: 0 /* PartType.literal */, value: part };
 };
 const makePath = (pathname, params) => {
     const parts = getParts(pathname);
@@ -582,15 +582,15 @@ class RouteTree {
         for (let i = 0; i < parts.length; i++) {
             const part = parts[i];
             const parsed = parse(part);
-            if (parsed.type === 1 /* historyFallback */) {
+            if (parsed.type === 1 /* PartType.historyFallback */) {
                 currentTree.historyFallbackRoute = route;
                 return;
             }
-            if (parsed.type === 2 /* wildcard */) {
+            if (parsed.type === 2 /* PartType.wildcard */) {
                 currentTree.wildcardRoute = route;
                 return;
             }
-            if (parsed.type === 3 /* parameter */) {
+            if (parsed.type === 3 /* PartType.parameter */) {
                 const { paramName, regexp, optional } = parsed;
                 // prevent from creating new entries for same route
                 const found = find__default["default"]((par) => par.key === part, currentTree.parameters);
@@ -779,7 +779,7 @@ const supportsHtml5History = typeof window !== 'undefined' && window.history &&
 const wrapHistory = ({ onNavigate }) => {
     if (!supportsHtml5History) {
         const navigate = (data, title, url) => {
-            window.location.href = url;
+            window.location.href = url.toString();
         };
         window.history.pushState = navigate;
         window.history.replaceState = navigate;
@@ -819,7 +819,7 @@ const wrapHistory = ({ onNavigate }) => {
     };
     const browserNavigate = (replace = false) => {
         return (navigateState, title, url) => {
-            onNavigate({ url, replace, navigateState });
+            onNavigate({ url: url.toString(), replace, navigateState });
         };
     };
     window.history.pushState = browserNavigate(false);
@@ -1081,7 +1081,7 @@ const UrlContext = react.createContext(null);
 const Provider = ({ router, serverState, children }) => {
     const route = shim.useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastRoute(), serverState ? () => serverState.currentRoute : () => router.getLastRoute());
     const url = shim.useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastUrl(), serverState ? () => serverState.currentUrl : () => router.getLastUrl());
-    return (jsxRuntime.jsx(RouterContext.Provider, Object.assign({ value: router }, { children: jsxRuntime.jsx(RouteContext.Provider, Object.assign({ value: route }, { children: jsxRuntime.jsx(UrlContext.Provider, Object.assign({ value: url }, { children: children }), void 0) }), void 0) }), void 0));
+    return (jsxRuntime.jsx(RouterContext.Provider, { value: router, children: jsxRuntime.jsx(RouteContext.Provider, { value: route, children: jsxRuntime.jsx(UrlContext.Provider, { value: url, children: children }) }) }));
 };
 Provider.displayName = 'Provider';
 
@@ -1133,7 +1133,7 @@ function Link(props) {
     }
     return (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    jsxRuntime.jsx("a", Object.assign({}, otherProps, extraProps, { children: children }), void 0));
+    jsxRuntime.jsx("a", { ...otherProps, ...extraProps, children: children }));
 }
 Link.displayName = 'Link';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/router",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "router",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -22,14 +22,14 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/react-hooks": "0.1.2",
-    "@tinkoff/url": "0.8.2",
+    "@tinkoff/react-hooks": "0.1.4",
+    "@tinkoff/url": "0.8.4",
     "@tinkoff/utils": "^2.1.2",
     "use-sync-external-store": "^1.2.0"
   },
   "peerDependencies": {
     "react": ">=16.14.0",
-    "tslib": "^2.0.3"
+    "tslib": "^2.4.0"
   },
   "sideEffects": false,
   "devDependencies": {