Merge b5130bb

Author: eddiemonge

src/url/urlMatcher.ts

@@ -16,9 +16,14 @@ function quoteRegExp(string: any, param?: any) {
   if (!param) return result;
 
   switch (param.squash) {
-    case false: surroundPattern = ['(', ')' + (param.isOptional ? '?' : '')]; break;
-    case true:  surroundPattern = ['?(', ')?']; break;
-    default:    surroundPattern = [`(${param.squash}|`, ')?']; break;
+    case false:
+      surroundPattern = ['(', ')' + (param.isOptional ? '?' : '')]; break;
+    case true:
+      result = result.replace(/\/$/, '');
+      surroundPattern = ['(?:\/(', ')|\/)?'];
+      break;
+    default:
+      surroundPattern = [`(${param.squash}|`, ')?']; break;
   }
   return result + surroundPattern[0] + param.type.pattern.source + surroundPattern[1];
 }

test/urlMatcherFactorySpec.js

@@ -665,6 +665,7 @@ describe("urlMatcherFactory", function () {
         params: { id: { value: null, squash: true } }
       });
       expect(m.exec('/users/1138')).toEqual({ id: 1138 });
+      expect(m.exec('/users1138')).toBeNull();
       expect(m.exec('/users/').id).toBeNull();
       expect(m.exec('/users').id).toBeNull();
     });