wip: Refactor app.R

R/app.R

@@ -35,7 +35,13 @@ configure_logger <- function() {
   }
 }
 
-load_main_module <- function() {
+source_main <- function() {
+  main <- new.env(parent = baseenv())
+  source(fs::path("app", "main.R"), local = main)
+  main
+}
+
+box_use_main <- function() {
   # Silence "no visible binding" notes raised by `box::use()` on R CMD check.
   app <- NULL
   main <- NULL
@@ -55,6 +61,13 @@ as_top_level <- function(shiny_module) {
   wrap(shiny_module)
 }
 
+as_shiny_app <- function(main) {
+  shiny::shinyApp(
+    ui = with_head_tags(main$ui),
+    server = main$server
+  )
+}
+
 with_head_tags <- function(ui) {
   wrap <- function(tag) {
     shiny::tagList(
@@ -126,20 +139,14 @@ app <- function() {
 
   entrypoint <- read_config()$legacy_entrypoint
   if (identical(entrypoint, "app_dir")) {
-    return(shiny::shinyAppDir("app"))
-  }
-
-  if (identical(entrypoint, "source")) {
-    main <- new.env()
-    source(fs::path("app", "main.R"), local = main)
+    shiny::shinyAppDir("app")
+  } else if (identical(entrypoint, "source")) {
+    as_shiny_app(source_main())
+  } else if (identical(entrypoint, "box_top_level")) {
+    as_shiny_app(box_use_main())
+  } else if (is.null(entrypoint)) {
+    as_shiny_app(as_top_level(box_use_main()))
   } else {
-    main <- load_main_module()
-    if (!identical(entrypoint, "box_top_level")) {
-      main <- as_top_level(main)
-    }
+    stop()
   }
-  shiny::shinyApp(
-    ui = with_head_tags(main$ui),
-    server = main$server
-  )
 }