Export isSameRouteMatch from react-resource-router/utils

src/common/utils/index.ts

@@ -8,4 +8,4 @@ export {
   warmupMatchRouteCache,
 } from './match-route';
 export { findRouterContext, createRouterContext } from './router-context';
-export { isSameRoute } from './is-same-route';
+export { isSameRouteMatch } from './is-same-route';

src/common/utils/is-same-route/index.ts

@@ -11,7 +11,7 @@ const isShallowEqual = (o1: ObjectToCompare, o2: ObjectToCompare) => {
   return objKeys1.every(key => o1[key] === o2[key]);
 };
 
-export const isSameRoute = ({
+export const isSameRouteMatch = ({
   prevContextMatch,
   nextContextMatch,
 }: {

src/common/utils/is-same-route/test.ts

@@ -1,4 +1,4 @@
-import { isSameRoute } from './index';
+import { isSameRouteMatch } from './index';
 
 describe('isSameRoute', () => {
   it('should be true', () => {
@@ -17,7 +17,9 @@ describe('isSameRoute', () => {
       url: '',
       query: {},
     };
-    expect(isSameRoute({ prevContextMatch, nextContextMatch })).toBeTruthy();
+    expect(
+      isSameRouteMatch({ prevContextMatch, nextContextMatch })
+    ).toBeTruthy();
   });
 
   it('should be false, as "query" is different', () => {
@@ -38,7 +40,9 @@ describe('isSameRoute', () => {
         a: '1',
       },
     };
-    expect(isSameRoute({ prevContextMatch, nextContextMatch })).toBeFalsy();
+    expect(
+      isSameRouteMatch({ prevContextMatch, nextContextMatch })
+    ).toBeFalsy();
   });
 
   it('should be false, as "params" are different', () => {
@@ -59,7 +63,9 @@ describe('isSameRoute', () => {
       url: '',
       query: {},
     };
-    expect(isSameRoute({ prevContextMatch, nextContextMatch })).toBeFalsy();
+    expect(
+      isSameRouteMatch({ prevContextMatch, nextContextMatch })
+    ).toBeFalsy();
   });
 
   it('should be false, as "path" is different', () => {
@@ -78,7 +84,9 @@ describe('isSameRoute', () => {
       url: '',
       query: {},
     };
-    expect(isSameRoute({ prevContextMatch, nextContextMatch })).toBeFalsy();
+    expect(
+      isSameRouteMatch({ prevContextMatch, nextContextMatch })
+    ).toBeFalsy();
   });
 
   it('should return true, even though "query" props are in different order', () => {
@@ -103,7 +111,9 @@ describe('isSameRoute', () => {
         a: '1',
       },
     };
-    expect(isSameRoute({ prevContextMatch, nextContextMatch })).toBeTruthy();
+    expect(
+      isSameRouteMatch({ prevContextMatch, nextContextMatch })
+    ).toBeTruthy();
   });
 
   it('should return true, even though "params" props are in different order', () => {
@@ -128,6 +138,8 @@ describe('isSameRoute', () => {
       url: '',
       query: {},
     };
-    expect(isSameRoute({ prevContextMatch, nextContextMatch })).toBeTruthy();
+    expect(
+      isSameRouteMatch({ prevContextMatch, nextContextMatch })
+    ).toBeTruthy();
   });
 });

src/controllers/router-store/utils/index.ts

@@ -1,7 +1,7 @@
 import URL, { qs } from 'url-parse';
 
 import { Href, Location, Query, RouterContext } from '../../../common/types';
-import { isSameRoute } from '../../../common/utils';
+import { isSameRouteMatch } from '../../../common/utils';
 
 const stripTrailingSlash = (path: string) =>
   path.charAt(path.length - 1) === '/' ? path.slice(0, -1) : path;
@@ -75,7 +75,7 @@ export const shouldReload = ({
   prevContext: RouterContext;
   pluginId: string;
 }) => {
-  const sameRoute = isSameRoute({
+  const sameRoute = isSameRouteMatch({
     prevContextMatch: prevContext.match,
     nextContextMatch: context.match,
   });

src/controllers/router-store/utils/test.ts

@@ -1,4 +1,4 @@
-import { isSameRoute } from '../../../common/utils';
+import { isSameRouteMatch } from '../../../common/utils';
 import { mockRouteContext } from '../../../mocks';
 
 import {
@@ -179,7 +179,7 @@ describe('sanitizePath()', () => {
 
 describe('shouldReload()', () => {
   beforeEach(() => {
-    (isSameRoute as any).mockReturnValue(false);
+    (isSameRouteMatch as any).mockReturnValue(false);
   });
   it('should return defaultValue when routes are not the same', () => {
     const context = {
@@ -246,7 +246,7 @@ describe('shouldReload()', () => {
   });
 
   it("should return defaultValue=false as route haven't changed", () => {
-    (isSameRoute as any).mockReturnValue(true);
+    (isSameRouteMatch as any).mockReturnValue(true);
     const context = {
       ...mockRouteContext,
     };
@@ -264,7 +264,7 @@ describe('shouldReload()', () => {
   });
 
   it('should return defaultValue=true for resources-plugin', () => {
-    (isSameRoute as any).mockReturnValue(true);
+    (isSameRouteMatch as any).mockReturnValue(true);
     const context = {
       ...mockRouteContext,
     };

src/utils.ts

@@ -4,6 +4,7 @@ export {
   findRouterContext,
   matchRoute,
   matchInvariantRoute,
+  isSameRouteMatch,
 } from './common/utils';
 
 export { shouldReloadWhenRouteMatchChanges } from './common/utils/should-reload-when-route-match-changes';