Merge pull request #436 from davidkmenta/master

Handle nullable route defaults

Author: tobias-93

Resources/js/router.test.js

@@ -602,4 +602,33 @@ function testGenerateWithPortInHost() {
   });
 
   assertEquals('/foo/', router.generate('homepage'));
-}
+}
+
+function testGenerateWithNullableDefaults() {
+    var router = new fos.Router({ base_url: '/foo' }, {
+        homepage: {
+            tokens: [
+                ['text', '/'],
+                [
+                    'variable',
+                    '/',
+                    '\d*',
+                    'id',
+                    true,
+                ],
+            ],
+            defaults: {
+                'id': null,
+            },
+            requirements: {
+                'id': '\d*',
+            },
+            hosttokens: [],
+            methods: [],
+            schemes: [],
+        },
+    });
+
+    assertEquals('/foo//', router.generate('homepage'));
+    assertEquals('/foo/1234/', router.generate('homepage', { id: 1234 }));
+}

Resources/js/router.ts

@@ -1,5 +1,5 @@
 export interface RouteDefaults {
-  [index: string]: string;
+  [index: string]: string | null;
 }
 
 export interface RouteRequirements {

Resources/ts/router.d.ts

@@ -1,5 +1,5 @@
 export interface RouteDefaults {
-    [index: string]: string;
+    [index: string]: string | null;
 }
 export interface RouteRequirements {
     [index: string]: string;