cherry-pick 77fa11b from 0.2.17

Author: JakobJingleheimer

src/url/urlMatcher.ts

@@ -372,6 +372,7 @@ export class UrlMatcher {
     // TODO: rewrite as reduce over params with result as initial
     params.map((param: Param, i) => {
       let isPathParam = i < segments.length - 1;
+      var isFinalPathParam = i + 2 === segments.length;
       let value = param.value(values[param.id]);
       let isDefaultValue = param.isDefaultValue(value);
       let squash = isDefaultValue ? param.squash : false;
@@ -396,6 +397,8 @@ export class UrlMatcher {
         if (param.type.raw) return encoded + segment;
         return encodeURIComponent(<string> encoded) + segment;
       })(segments[i + 1], result);
+
+      if (isFinalPathParam && squash === true && result.slice(-1) === '/') result = result.slice(0, -1);
     });
 
     if (values["#"]) result += "#" + values["#"];

test/urlMatcherFactorySpec.js

@@ -173,6 +173,14 @@ describe("UrlMatcher", function () {
       var m = new UrlMatcher('/users/:id#:section');
       expect(m.format({ id: 'bob', section: 'contact-details' })).toEqual('/users/bob#contact-details');
     });
+
+    it("should trim trailing slashes when the terminal value is optional", function () {
+      var config = { params: { id: { squash: true, value: '123' } } },
+          m = new UrlMatcher('/users/:id', config),
+          params = { id: '123' };
+
+      expect(m.format(params)).toEqual('/users');
+    });
   });
 
   describe(".append()", function() {
@@ -700,8 +708,8 @@ describe("urlMatcherFactory", function () {
         params: { id: { value: null, squash: true }, state: { value: null, squash: true } }
       });
 
-      expect(m.format()).toBe("/users/");
-      expect(m.format({ id: 1138 })).toBe("/users/1138/");
+      expect(m.format()).toBe("/users");
+      expect(m.format({ id: 1138 })).toBe("/users/1138");
       expect(m.format({ state: "NY" })).toBe("/users/NY");
       expect(m.format({ id: 1138, state: "NY" })).toBe("/users/1138/NY");
     });