refactor: Replace as_top_level() workaround

Author: kamilzyla

R/app.R

@@ -44,15 +44,29 @@ load_main_module <- function() {
 }
 
 as_top_level <- function(app_env) {
-  # Necessary to avoid infinite recursion / bugs due to lazy evaluation:
-  # https://adv-r.hadley.nz/function-factories.html?q=force#forcing-evaluation
-  force(app_env)
+  list(
+    # Wrap the UI in a function to support Shiny bookmarking.
+    ui = function(request) app_env$main$ui("app"),
+    server = fix_server_reloading(function(input, output) {
+      app_env$main$server("app")
+    })
+  )
+}
+
+fix_server_reloading <- function(server) {
+  reparse(curly_wrap(server))
+}
 
-  # The actual function must be sourced with `keep.source = TRUE` for reloading to work:
-  # https://github.com/Appsilon/rhino/issues/157
-  wrap <- source(fs::path_package("rhino", "as_top_level.R"), keep.source = TRUE)$value
+reparse <- function(f) {
+  eval(parse(text = deparse(f)), envir = environment(f))
+}
 
-  wrap(app_env)
+curly_wrap <- function(f) {
+  wrapped <- function() {
+    do.call(f, as.list(match.call())[-1])
+  }
+  formals(wrapped) <- formals(f)
+  wrapped
 }
 
 load_app <- function() {