Fix case when routes have both '/' and '*'

package.json

@@ -24,7 +24,7 @@
     "mocha": "^2.5.3",
     "ts-node": "^1.7.2",
     "tslint": "^4.0.2",
-    "typescript": "^2.1.4",
+    "typescript": "^2.3.4",
     "uglify-js": "^2.7.5",
     "validate-commit-msg": "^2.8.2"
   },

src/index.ts

@@ -80,8 +80,13 @@ function validate({sourcePath, matchedPath, matchedValue, routes}: ValidationObj
   let path = matchedPath ? validatePath(sourcePath, matchedPath) : null;
   let value = matchedValue;
   if (!path) {
-    path = routes[`*`] ? sourcePath : null;
-    value = path ? routes[`*`] : null;
+    if (sourcePath === `/`) {
+      path = routes[`*`] ? sourcePath : null;
+      value = path ? routes[`/$`] : null;
+    } else {
+      path = routes[`*`] ? sourcePath : null;
+      value = path ? routes[`*`] : null;
+    }
   }
   return {path, value};
 }
@@ -95,6 +100,19 @@ export default function switchPath(
   let matchedValue: string | null = null;
 
   traverseRoutes(routes, function matchPattern(pattern) {
+    if (pattern[pattern.length - 1] === `$`) {
+      const realPattern = pattern.split(`/$`).join(``);
+      if (sourcePath.search(realPattern) === 0 &&
+        betterMatch(pattern, matchedPath) ||
+        sourcePath.search(realPattern + `/`) &&
+        betterMatch(pattern, matchedPath))
+      {
+        matchedPath = realPattern;
+        matchedValue = routes[pattern];
+      }
+      return;
+    }
+
     if (sourcePath.search(pattern) === 0 && betterMatch(pattern, matchedPath)) {
       matchedPath = pattern;
       matchedValue = routes[pattern];
@@ -125,4 +143,4 @@ export default function switchPath(
   });
 
   return validate({sourcePath, matchedPath, matchedValue, routes});
-}
+}

src/types.ts

@@ -5,4 +5,4 @@ export interface RouteDefinitions extends Object {
 export interface SwitchPathReturn {
   path: string | null;
   value: any | null;
-}
+}

test/index.ts

@@ -203,6 +203,38 @@ describe('switchPath basic usage', () => {
     assert.strictEqual(path, '/1736');
     assert.strictEqual(value, 'id is 1736');
   });
+
+  it('should match routes explicitly using `$`', () => {
+    const { path, value } = switchPath('/', {
+      '/$': 123,
+      '/other': 456,
+      '*': 'not found route',
+    });
+
+    assert.strictEqual(path, '/');
+    assert.strictEqual(value, 123);
+  });
+
+  it('should match routes explicitly using `$`, even if they come after a potential match', () => {
+    const { path, value } = switchPath('/other', {
+      '/': 123,
+      '/other/$': 456,
+    });
+
+    assert.strictEqual(path, '/other');
+    assert.strictEqual(value, 456);
+  });
+
+   it('should allow opting out of partial matching for routes using `$`', () => {
+     const {path, value} = switchPath('/random', {
+       '/$': 123,
+       '/other': 456,
+       '*': 'not found route',
+     });
+
+     assert.strictEqual(path, '/random');
+     assert.strictEqual(value, 'not found route');
+   });
 });
 
 describe('switchPath corner cases', () => {