set safely

insightsengineering · Jul 31, 2024 · f6be311 · f6be311
1 parent ee389a5
commit f6be311
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/R/join_keys.R b/R/join_keys.R
@@ -142,7 +142,7 @@ join_keys.teal_data <- function(...) {
 #' join_keys(td)
 `join_keys<-.teal_data` <- function(x, value) {
   join_keys(x@join_keys) <- value
-  x@datanames <- sort_datanames(x@datanames, x@join_keys)
+  datanames(x) <- x@datanames # datanames fun manages some exceptions
   x
 }
 

diff --git a/R/teal_data-class.R b/R/teal_data-class.R
@@ -82,7 +82,7 @@ new_teal_data <- function(data,
   new_env <- rlang::env_clone(list2env(data), parent = parent.env(.GlobalEnv))
   lockEnvironment(new_env, bindings = TRUE)
 
-  datanames <- sort_datanames(datanames, join_keys)
+  datanames <- .get_sorted_datanames(datanames = datanames, join_keys = join_keys, env = env)
 
   methods::new(
     "teal_data",

diff --git a/R/teal_data-datanames.R b/R/teal_data-datanames.R
@@ -42,8 +42,7 @@ setMethod("datanames", signature = "qenv.error", definition = function(x) {
 setGeneric("datanames<-", function(x, value) standardGeneric("datanames<-"))
 setMethod("datanames<-", signature = c("teal_data", "character"), definition = function(x, value) {
   checkmate::assert_subset(value, names(x@env))
-  x@datanames <- value
-  x@datanames <- sort_datanames(x@datanames, x@join_keys)
+  x@datanames <- .get_sorted_datanames(datanames = value, join_keys = x@join_keys, env = x@env)
   methods::validObject(x)
   x
 })
@@ -54,13 +53,16 @@ setMethod("datanames<-", signature = c("qenv.error", "character"), definition =
 
 
 #' @keywords internal
-sort_datanames <- function(datanames, joinkeys) {
+.get_sorted_datanames <- function(datanames, join_keys, env) {
   child_parent <- sapply(
     datanames,
-    function(name) parent(joinkeys, name),
+    function(name) parent(join_keys, name),
     USE.NAMES = TRUE,
     simplify = FALSE
   )
 
-  union(unlist(topological_sort(child_parent)), datanames)
+  union(
+    intersect(unlist(topological_sort(child_parent)), ls(env)),
+    datanames
+  )
 }