update swagger doc generation to recursively walk mounted routers

R/plumber.R

@@ -532,29 +532,8 @@ plumber <- R6Class(
       private$addFilterInternal(filter)
     },
     swaggerFile = function(){ #FIXME: test
-      endpoints <- self$endpoints
 
-      if (length(self$mounts) > 0){
-        for (path in names(self$mounts)){
-
-          mount <- self$mounts[[path]]
-          mount_endpoints <- mount$endpoints
-          path <- sub("[/]$", "", path)
-
-          if (length(mount_endpoints) > 0) {
-            mount_endpoints <- lapply(mount_endpoints, function(i){
-              i <- lapply(i, function(j){
-                subpath <- sub("^[/]", "", j$path)
-                j$path <- paste(path, subpath, sep="/")
-                j
-              })
-              i
-            })
-
-            endpoints <- c(endpoints, mount_endpoints)
-          }
-        }
-      }
+      endpoints <- private$swaggerFileWalkMountsInternal(self)
       endpoints <- prepareSwaggerEndpoints(endpoints)
 
       # Extend the previously parsed settings with the endpoints
@@ -696,6 +675,30 @@ plumber <- R6Class(
       }
 
       private$ends[[preempt]] <- c(private$ends[[preempt]], ep)
+    },
+    swaggerFileWalkMountsInternal = function(router, parentPath = ""){
+
+      parentPath <- sub("[/]$", "", parentPath)
+      endpoints <- lapply(router$endpoints, function(endpoint){
+
+        endpointEntries <- lapply(endpoint, function(endpointEntry){
+          endpointPath <- sub("^[/]", "", endpointEntry$path)
+          endpointPath <- paste(parentPath, endpointPath, sep="/")
+          endpointEntry$path <- endpointPath
+          endpointEntry
+        })
+
+        endpoint
+      })
+
+      mounts <- router$mounts
+      mountedEndpoints <- unlist(lapply(names(mounts), function(mountPath){
+        mountedSubrouter <- router$mounts[[mountPath]]
+        mountPath <- sub("^[/]", "", mountPath)
+        mountedEndpoints <- private$swaggerFileWalkMountsInternal(mountedSubrouter, paste(parentPath, mountPath, sep="/"))
+      }))
+
+      c(endpoints, list(mountedEndpoints))
     }
   )
 )