modelsummary's coef_rename doens't work with logical variables

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: parameters
 Title: Processing of Model Parameters
-Version: 0.29.2
+Version: 0.29.2.1
 Authors@R:
     c(person(given = "Daniel",
              family = "Lüdecke",

NEWS.md

@@ -1,3 +1,10 @@
+# parameters (devel)
+
+## Changes
+
+* Logical variables are now properly formatted when pretty value labels are
+  printed.
+
 # parameters 0.29.2
 
 ## Changes

R/format_parameters.R

@@ -242,6 +242,11 @@ format_parameters.parameters_model <- function(model, ...) {
     name <- .format_factor(name = name, variable = variable, brackets = brackets)
   }
 
+  # Logical
+  if (type == "logical") {
+    name <- .format_logical(name = name, brackets = brackets)
+  }
+
   # Polynomials
   if (type %in% c("poly", "poly_raw")) {
     name <- .format_poly(
@@ -394,6 +399,12 @@ format_parameters.parameters_model <- function(model, ...) {
 }
 
 
+#' @keywords internal
+.format_logical <- function(name, brackets = c("[", "]")) {
+  paste0(sub("TRUE$", "", name), " ", brackets[1], "TRUE", brackets[2])
+}
+
+
 #' @keywords internal
 .format_log <- function(name, variable, type, brackets = c("[", "]")) {
   paste0(variable, " ", brackets[1], gsub("(.*)\\((.*)\\)", "\\1", name), brackets[2])
@@ -463,7 +474,7 @@ format_parameters.parameters_model <- function(model, ...) {
             factor_terms
           )
           for (k in seq_along(factor_terms)) {
-            ft <- factor_terms[k]    # e.g. "factor(cyl)"
+            ft <- factor_terms[k] # e.g. "factor(cyl)"
             orig <- cleaned_terms[k] # e.g. "cyl"
             if (orig %in% colnames(mf) && !ft %in% colnames(mf)) {
               orig_label <- attr(mf[[orig]], "label", exact = TRUE)

R/parameters_type.R

@@ -90,7 +90,7 @@
     params$Parameter <- gsub("^(count_|zero_)", "", params$Parameter)
   }
 
   data <- insight::get_data(model, source = "mf", verbose = FALSE)
   if (is.null(data) || inherits(data, "ts") || nrow(data) == 0) {
     return(NULL)
   }
@@ -167,13 +167,13 @@
 
 #' @keywords internal
 .parameters_type <- function(name, data, reference) {
   if (grepl(":", name, fixed = TRUE)) {
     # Split
     var <- unlist(strsplit(name, ":", fixed = TRUE))
     if (length(var) > 2) {
       var <- c(utils::tail(var, 1), paste0(utils::head(var, -1), collapse = ":"))
     } else {
       var <- rev(var)
     }
 
     # Check if any is factor
@@ -186,7 +186,7 @@
     link <- ifelse(any("factor" %in% types), "Difference", "Association")
     # Get type
     main <- .parameters_type_basic(var[1], data, reference)
     return(c("interaction", link, main[3], main[4], main[5], var[2]))
   } else {
     .parameters_type_basic(name, data, reference)
   }
@@ -209,12 +209,17 @@
 
   # Intercept
   if (.in_intercepts(cleaned_name)) {
     return(c("intercept", "Mean", "(Intercept)", NA, NA, NA))
 
     # Numeric
   } else if (cleaned_name %in% reference$numeric) {
     return(c("numeric", "Association", name, name, NA, NA))
 
+    # Logicals
+  } else if (sub("TRUE$", "", cleaned_name) %in% reference$logical) {
+    cleaned_name <- sub("TRUE$", "", cleaned_name)
+    return(c("logical", "Difference", name, cleaned_name, "TRUE", NA))
+
     # Ordered factors
   } else if (is.ordered(data[[cleaned_ordered_name]])) {
     fac <- reference$levels_parent[match(cleaned_name, reference$levels)]
@@ -327,7 +332,7 @@
   .check_for_numerics <- function(x) {
     is.numeric(x) && !isTRUE(attributes(x)$factor)
   }
-  out$numeric <- names(data[vapply(data, .check_for_numerics, TRUE)])
+  out$numeric <- names(data)[vapply(data, .check_for_numerics, TRUE)]
 
   # get contrast coding
   contrast_coding <- .safe(model$contrasts)
@@ -368,12 +373,12 @@
   }
 
   # Ordered factors
-  out$ordered <- names(data[vapply(data, is.ordered, TRUE)])
+  out$ordered <- names(data)[vapply(data, is.ordered, TRUE)]
 
   # Factors
-  out$factor <- names(data[
+  out$factor <- names(data)[
     vapply(data, is.factor, TRUE) | vapply(data, is.character, TRUE)
-  ])
+  ]
 
   out$levels <- NA
   out$levels_parent <- NA
@@ -427,5 +432,8 @@
   out$levels <- out$levels[!is.na(out$levels)]
   out$levels_parent <- out$levels_parent[!is.na(out$levels_parent)]
 
+  # Logical
+  out$logical <- names(data)[vapply(data, is.logical, TRUE)]
+
   out
 }

R/utils_cleaners.R

@@ -11,15 +11,19 @@
   # remove them here and clean/prepare them in ".parameters_type_basic()".
   # for formatting / printing, refer to ".format_parameter()".
 
+  # fmt: skip
   pattern <- if (full) {
     c(
-      "as.factor", "as.numeric", "as.ordered", "factor", "ordered", "offset",
-      "lag", "diff", "catg", "matrx", "pol", "strata", "strat", "scale",
+      "as.factor", "as.numeric", "as.ordered", "as.logical", "factor", "ordered",
+      "offset", "lag", "diff", "catg", "matrx", "pol", "strata", "strat", "scale",
       "scored", "interaction", "lsp", "pb", "lo", "t2", "te", "ti", "tt", "mi",
       "mo", "gp"
     )
   } else {
-    c("as.factor", "as.numeric", "as.ordered", "factor", "ordered", "catg", "interaction")
+    c(
+      "as.factor", "as.numeric", "as.ordered", "as.logical", "factor", "ordered",
+      "catg", "interaction"
+    )
   }
 
   for (j in seq_along(pattern)) {
@@ -31,7 +35,12 @@
       x <- insight::trim_ws(sub("offset\\(([^-+ )]*)\\)(.*)", "\\1\\2", x))
       # some exceptions here...
     } else if (full && pattern[j] == "scale" && any(grepl("scale(", x, fixed = TRUE))) {
-      x[grepl("scale(", x, fixed = TRUE)] <- insight::clean_names(grep("scale(", x, fixed = TRUE, value = TRUE))
+      x[grepl("scale(", x, fixed = TRUE)] <- insight::clean_names(grep(
+        "scale(",
+        x,
+        fixed = TRUE,
+        value = TRUE
+      ))
     } else if (any(grepl(pattern[j], x, fixed = TRUE))) {
       p <- paste0(pattern[j], "\\(((\\w|\\.)*)\\)(.*)")
       x <- insight::trim_ws(sub(p, "\\1\\3", x))

tests/testthat/test-factor_analysis.R

@@ -117,7 +117,7 @@ test_that("factor_analysis", {
 
   out <- suppressWarnings(factor_analysis(r_mat, n_obs = n_mat, n = 2))
   expect_identical(dim(out), c(28L, 5L))
-  expect_named(out, c("Variable", "MR1", "MR2", "Complexity", "Uniqueness"))
+  expect_named(out, c("Variable", "MR2", "MR1", "Complexity", "Uniqueness"))
 
   n_mat <- matrix(0, nrow = n - 2, ncol = n - 2)
   diag(n_mat) <- 1