fix

easystats · Jun 5, 2024 · 26dd3d4 · 26dd3d4
1 parent 0e6b167
commit 26dd3d4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/R/utils_compact.R b/R/utils_compact.R
@@ -10,12 +10,14 @@
 #' @export
 compact_list <- function(x, remove_na = FALSE) {
   # to make regular(!) R code work with vctrs, we need to remove the vctrs-class
-  x <- .clean_from_vctrs(x)
+  # x <- .clean_from_vctrs(x)
   # finally, we can compact the list...
   if (remove_na) {
-    x[!sapply(x, function(i) !is_model(i) && !inherits(i, c("Formula", "gFormula")) && (length(i) == 0L || is.null(i) || (length(i) == 1L && is.na(i)) || all(is.na(i)) || any(i == "NULL", na.rm = TRUE)))]
+    x[!sapply(x, function(i) !is_model(i) && !inherits(i, c("Formula", "gFormula")) && (length(i) == 0L || is.null(i) || (length(i) == 1L && is.na(i)) || all(is.na(i)) || all(vapply(i, is.null, logical(1))) || any(vapply(i, function(j) length(j) == 1 && is.character(j) && j == "NULL", logical(1)), na.rm = TRUE)))]
+    # x[!sapply(x, function(i) !is_model(i) && !inherits(i, c("Formula", "gFormula")) && (length(i) == 0L || is.null(i) || (length(i) == 1L && is.na(i)) || all(is.na(i)) || any(i == "NULL", na.rm = TRUE)))]
   } else {
-    x[!sapply(x, function(i) !is_model(i) && !inherits(i, c("Formula", "gFormula")) && (length(i) == 0L || is.null(i) || any(i == "NULL", na.rm = TRUE)))]
+    x[!sapply(x, function(i) !is_model(i) && !inherits(i, c("Formula", "gFormula")) && (length(i) == 0L || is.null(i) || all(vapply(i, is.null, logical(1))) || any(vapply(i, function(j) length(j) == 1 && is.character(j) && j == "NULL", logical(1)), na.rm = TRUE)))]
+    # x[!sapply(x, function(i) !is_model(i) && !inherits(i, c("Formula", "gFormula")) && (length(i) == 0L || is.null(i) || any(i == "NULL", na.rm = TRUE)))]
   }
 }