Throw an error if no route is found (#62)

CHANGELOG.md

@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 
 ### [v2.0.0] - [unreleased]
 
+- Throws an error if no route found ([#62](/~https://github.com/kriasoft/universal-router/pull/62))
 - Remove obsolete `context.end()` method ([#60](/~https://github.com/kriasoft/universal-router/pull/60))
 - Remove obsolete `match` alias for `resolve` function ([#59](/~https://github.com/kriasoft/universal-router/pull/59))
 - Do not throw an error for malformed URI params ([#54](/~https://github.com/kriasoft/universal-router/pull/54))

docs/api.md

@@ -29,11 +29,11 @@ resolve(routes, { path: '/one' })
   // => Page One
 ```
 
-..where `action` is just a regular function that may, or may not, return any arbitrary data
+Where `action` is just a regular function that may, or may not, return any arbitrary data
 — a string, a React component, anything!
 
 
-### Nested Routes
+## Nested Routes
 
 Each route may have an optional `children: [ ... ]` property containing the list of child routes:
 
@@ -67,7 +67,7 @@ resolve(routes, { path: '/admin/users/john' })
 ```
 
 
-### URL Parameters
+## URL Parameters
 
 **Named route parameters** are captured and added to `context.params`.
 
@@ -104,7 +104,7 @@ and works the same way as the routing solutions in many popular JavaScript frame
 Also check out online [router tester](http://forbeslindesay.github.io/express-route-tester/).
 
 
-### Context
+## Context
 
 In addition to a URL path string, any arbitrary data can be passed to the router's `resolve()` method,
 that becomes available inside action methods.
@@ -125,7 +125,7 @@ resolve(routes, { path: '/hello', user: 'admin' })
 ```
 
 
-### Async Routes
+## Async Routes
 
 The router works great with asynchronous functions out of the box!
 

docs/getting-started.md

@@ -25,11 +25,12 @@ import { resolve } from 'universal-router';
 
 const routes = [
   { path: '/one', action: () => '<h1>Page One</h1>' },
-  { path: '/two', action: () => '<h1>Page Two</h1>' }
+  { path: '/two', action: () => '<h1>Page Two</h1>' },
+  { path: '*', action: () => '<h1>Not Found</h1>' }
 ];
 
 resolve(routes, { path: '/one' }).then(result => {
-  document.body.innerHTML = result || <h1>Not Found</h1>;
+  document.body.innerHTML = result;
   // renders: <h1>Page One</h1>
 });
 ```
@@ -44,7 +45,8 @@ import { resolve } from 'universal-router';
 
 const routes = [
   { path: '/one', action: () => <h1>Page One</h1> },
-  { path: '/two', action: () => <h1>Page Two</h1> }
+  { path: '/two', action: () => <h1>Page Two</h1> },
+  { path: '*', action: () => <h1>Not Found</h1> }
 ];
 
 resolve(routes, { path: '/one' }).then(component => {

src/matchRoute.js

@@ -28,6 +28,7 @@ function* matchRoute(route, baseUrl, path, parentParams) {
 
   if (route.children) {
     match = matchBasePath(route.path, path, parentParams);
+
     if (match) {
       yield {
         route,

src/resolve.js

@@ -37,7 +37,15 @@ async function resolve(routes, pathOrContext) {
 
   context.next = next;
 
-  return await next();
+  await next();
+
+  if (result === null || result === undefined) {
+    const error = new Error('Page not found');
+    error.status = error.statusCode = 404;
+    throw error;
+  }
+
+  return result;
 }
 
 export default resolve;

test/matchRoute.spec.js

@@ -28,6 +28,19 @@ describe('matchRoute(route, baseUrl, path)', () => {
     expect(result).to.have.lengthOf(0);
   });
 
+  it('should match 0 routes (3)', () => {
+    const route = {
+      path: '/a',
+      children: [
+        {
+          path: '/b',
+        },
+      ],
+    };
+    const result = Array.from(matchRoute(route, '', '/b'));
+    expect(result).to.have.lengthOf(0);
+  });
+
   it('should match 1 route (1)', () => {
     const route = {
       path: '/',