From 2d8a8c8ed76edfd71476ad836a7660d7fe986853 Mon Sep 17 00:00:00 2001
From: YR Chen <stevapple@icloud.com>
Date: Thu, 25 Jun 2020 03:01:48 +0800
Subject: [PATCH] Fix `routes` command symbol usage (#2366)

* Update RoutesCommand to align with RoutingKit

* Simplify the implementation

* Move consoleText() conversion to PathComponent

Co-authored-by: Tanner <tannernelson@gmail.com>
---
 Sources/Vapor/Commands/RoutesCommand.swift | 38 ++++++++++++----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/Sources/Vapor/Commands/RoutesCommand.swift b/Sources/Vapor/Commands/RoutesCommand.swift
index 0cfa41f007..f8c6191ee9 100644
--- a/Sources/Vapor/Commands/RoutesCommand.swift
+++ b/Sources/Vapor/Commands/RoutesCommand.swift
@@ -10,7 +10,7 @@
 /// A colon preceding a path component indicates a variable parameter. A colon with no text following
 /// is a parameter whose result will be discarded.
 ///
-/// An asterisk indicates a catch-all. Any path components after a catch-all will be discarded and ignored.
+/// The path will be displayed with the same syntax that is used to register a route.
 public final class RoutesCommand: Command {
     public struct Signature: CommandSignature {
         public init() { }
@@ -25,26 +25,17 @@ public final class RoutesCommand: Command {
     public func run(using context: CommandContext, signature: Signature) throws {
         let routes = context.application.routes
         let includeDescription = !routes.all.filter { $0.userInfo["description"] != nil }.isEmpty
+        let pathSeparator = "/".consoleText()
         context.console.outputASCIITable(routes.all.map { route -> [ConsoleText] in
-            var pathText: ConsoleText = ""
+            var column = [route.method.string.consoleText()]
             if route.path.isEmpty {
-                pathText += "/".consoleText(.info)
+                column.append(pathSeparator)
+            } else {
+                column.append(route.path
+                    .map { pathSeparator + $0.consoleText() }
+                    .reduce("".consoleText(), +)
+                )
             }
-            for path in route.path {
-                pathText += "/".consoleText(.info)
-                switch path {
-                case .constant(let string):
-                    pathText += string.consoleText()
-                case .parameter(let name):
-                    pathText += ":".consoleText(.info)
-                    pathText += name.consoleText()
-                case .anything:
-                    pathText += ":".consoleText(.info)
-                case .catchall:
-                    pathText += "*".consoleText(.info)
-                }
-            }
-            var column = [route.method.string.consoleText(), pathText]
             if includeDescription {
                 let desc = route.userInfo["description"]
                     .flatMap { $0 as? String }
@@ -56,6 +47,17 @@ public final class RoutesCommand: Command {
     }
 }
 
+extension PathComponent {
+    func consoleText() -> ConsoleText {
+        switch self {
+        case .constant:
+            return description.consoleText()
+        default:
+            return description.consoleText(.info)
+        }
+    }
+}
+
 extension Console {
     func outputASCIITable(_ rows: [[ConsoleText]]) {
         var columnWidths: [Int] = []