Properly add support for explicit inclusion of defaults in url generation

Author: Tobias Feijten

Resources/js/router.test.js

@@ -187,7 +187,7 @@ function testGenerateSupportsOptionalPlaceholderDefaults() {
 function testGenerateSupportsExplicitNonOptionalPlaceholderDefaults() {
     var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
         homepage: {
-            tokens: [['variable', '/','', '!page'],['text', '/bar']],
+            tokens: [['variable', '/','', 'page', false, true],['text', '/bar']],
             defaults: {page: 'api'},
             requirements: {},
             hosttokens: [

Resources/js/router.ts

@@ -202,8 +202,7 @@ export class Router {
       }
 
       if ('variable' === token[0]) {
-        if (typeof token[3] === 'string' && token[3][0] === '!') { // If parameter starts with exclamation mark, always include in path
-          token[3] = token[3].substring(1); // Remove the exclamation mark
+        if (token.length === 6 && token[5] === true) { // Sixth part of the token array indicates if it should be included in case of defaults
           optional = false;
         }
         let hasDefault = route.defaults && !Array.isArray(route.defaults) && typeof token[3] === 'string' && (token[3] in route.defaults);

Resources/public/js/router.js

@@ -211,9 +211,8 @@ var Router = /*#__PURE__*/function () {
         }
 
         if ('variable' === token[0]) {
-          if (typeof token[3] === 'string' && token[3][0] === '!') {
-            token[3] = token[3].substring(1); // Remove the exclamation mark
-
+          if (token.length === 6 && token[5] === true) {
+            // Sixth part of the token array indicates if it should be included in case of defaults
             optional = false;
           }
 

Resources/public/js/router.min.js

@@ -53,6 +53,22 @@ public function testIndexAction()
         $this->assertEquals('{"base_url":"","routes":{"literal":{"tokens":[["text","\/homepage"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"blog":{"tokens":[["variable","\/","[^\/]++","slug"],["text","\/blog-post"]],"defaults":[],"requirements":[],"hosttokens":[["text","localhost"]],"methods":[],"schemes":[]}},"prefix":"","host":"","port":null,"scheme":"","locale":"en"}', $response->getContent());
     }
 
+    public function testIndexWithExplicitTokenAction()
+    {
+        $routes = new RouteCollection();
+        $routes->add('literal', new Route('/homepage'));
+        $routes->add('blog', new Route('/blog-post/{!slug}', array(), array(), array(), 'localhost'));
+
+        $controller = new Controller(
+            $this->getSerializer(),
+            $this->getExtractor($routes)
+        );
+
+        $response = $controller->indexAction($this->getRequest('/'), 'json');
+
+        $this->assertEquals('{"base_url":"","routes":{"literal":{"tokens":[["text","\/homepage"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"blog":{"tokens":[["variable","\/","[^\/]++","slug",false,true],["text","\/blog-post"]],"defaults":[],"requirements":[],"hosttokens":[["text","localhost"]],"methods":[],"schemes":[]}},"prefix":"","host":"","port":null,"scheme":"","locale":"en"}', $response->getContent());
+    }
+
     public function testIndexActionWithLocalizedRoutes()
     {
         $routes = new RouteCollection();