don't pick wildcard when other routes found #36

Author: jcubic

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.16.5
+### Bug fix
+* don't pick wildcard when other routes found [#36](https://github.com/jcubic/wayne/issues/36)
+
 ## 0.16.4
 ### Bug fix
 * fix check if request origin match

index.js

@@ -488,10 +488,21 @@ export class Wayne {
                     const routes = this._routes[method];
                     if (routes) {
                         const match = this._parser.pick(routes, path, origin);
+                        const have_wildcard = match.length > 1 && match.find(route => {
+                            return !!route.pattern.match(/\*/);
+                        });
                         if (match.length) {
-                            const [first_match] = match;
-                            const fns = [...this._middlewares, ...routes[first_match.pattern]];
-                            req.params = first_match.data;
+                            let selected_route;
+                            if (have_wildcard) {
+                                selected_route = match.find(route => {
+                                    return !route.pattern.match(/\*/);
+                                });
+                            }
+                            if (!(have_wildcard && selected_route)) {
+                                selected_route = match[0];
+                            }
+                            const fns = [...this._middlewares, ...routes[selected_route.pattern]];
+                            req.params = selected_route.data;
                             setTimeout(function() {
                                 reject('Timeout Error');
                             }, this._timeout);
@@ -504,7 +515,6 @@ export class Wayne {
                     if (event.request.cache === 'only-if-cached' && event.request.mode !== 'same-origin') {
                         return;
                     }
-                    //request = credentials: 'include'
                     fetch(event.request).then(resolve).catch(reject);
                 } catch(error) {
                     this._handle_error(resolve, req, error);