Use more informative check_arg (#1031)

* Use more informative check_arg

* fix

* Update R/utils.R

Co-authored-by: Brenton M. Wiernik <[email protected]>

* replace with validate_argument

* desc

* lintr, styler

---------

Co-authored-by: Brenton M. Wiernik <[email protected]>

Author: strengejacke

DESCRIPTION

@@ -223,3 +223,4 @@ Config/testthat/edition: 3
 Config/testthat/parallel: true
 Config/Needs/website: easystats/easystatstemplate
 Config/rcmdcheck/ignore-inconsequential-notes: true
+Remotes: easystats/insight#938

R/2_ci.R

@@ -73,7 +73,7 @@ ci.glm <- function(x,
                    vcov_args = NULL,
                    verbose = TRUE,
                    ...) {
-  method <- match.arg(method, choices = c("profile", "wald", "normal", "residual"))
+  method <- insight::validate_argument(method, c("profile", "wald", "normal", "residual"))
 
   # No robust vcov for profile method
   if (method == "profile") {

R/bootstrap_model.R

@@ -75,7 +75,7 @@ bootstrap_model.default <- function(model,
 
   insight::check_if_installed("boot")
 
-  type <- match.arg(type, choices = c("ordinary", "parametric", "balanced", "permutation", "antithetic"))
+  type <- insight::validate_argument(type, c("ordinary", "parametric", "balanced", "permutation", "antithetic"))
   parallel <- match.arg(parallel)
 
   model_data <- data <- insight::get_data(model, verbose = FALSE) # nolint
@@ -156,7 +156,7 @@ bootstrap_model.merMod <- function(model,
                                    ...) {
   insight::check_if_installed("lme4")
 
-  type <- match.arg(type, choices = c("parametric", "semiparametric"))
+  type <- insight::validate_argument(type, c("parametric", "semiparametric"))
   parallel <- match.arg(parallel)
 
   boot_function <- function(model) {
@@ -228,7 +228,7 @@ bootstrap_model.nestedLogit <- function(model,
                                         ...) {
   insight::check_if_installed("boot")
 
-  type <- match.arg(type, choices = c("ordinary", "balanced", "permutation", "antithetic"))
+  type <- insight::validate_argument(type, c("ordinary", "balanced", "permutation", "antithetic"))
   parallel <- match.arg(parallel)
 
   model_data <- data <- insight::get_data(model, verbose = FALSE) # nolint

R/ci_generic.R

@@ -17,11 +17,14 @@
   if (is.null(method)) {
     method <- "wald"
   }
-  method <- match.arg(tolower(method), choices = c(
-    "wald", "ml1", "betwithin", "kr",
-    "satterthwaite", "kenward", "boot",
-    "profile", "residual", "normal"
-  ))
+  method <- tolower(method)
+  method <- insight::validate_argument(
+    method,
+    c(
+      "wald", "ml1", "betwithin", "kr", "satterthwaite", "kenward", "boot",
+      "profile", "residual", "normal"
+    )
+  )
 
   effects <- match.arg(effects)
   component <- match.arg(component)

R/extract_random_variances.R

@@ -28,7 +28,7 @@
 
   # check for errors
   if (is.null(out) && isTRUE(verbose)) {
-    insight::format_warning("Something went wrong when calculating random effects parameters. Only showing model's fixed effects now. You may use `effects=\"fixed\"` to speed up the call to `model_parameters()`.")
+    insight::format_warning("Something went wrong when calculating random effects parameters. Only showing model's fixed effects now. You may use `effects=\"fixed\"` to speed up the call to `model_parameters()`.") # nolint
   }
 
   out
@@ -45,7 +45,7 @@
                                               ci_random = NULL,
                                               verbose = FALSE,
                                               ...) {
-  component <- match.arg(component, choices = c("all", "conditional", "zero_inflated", "zi", "dispersion"))
+  component <- insight::validate_argument(component, c("all", "conditional", "zero_inflated", "zi", "dispersion"))
 
   out <- suppressWarnings(
     .extract_random_variances_helper(
@@ -208,7 +208,7 @@
   )
 
   # fix names for uncorrelated slope-intercepts
-  pattern <- paste0("(", paste0(insight::find_random(model, flatten = TRUE), collapse = "|"), ")\\.\\d+$")
+  pattern <- paste0("(", paste(insight::find_random(model, flatten = TRUE), collapse = "|"), ")\\.\\d+$")
   out$Group <- gsub(pattern, "\\1", out$Group)
 
   # remove non-used columns

R/methods_glmmTMB.R

@@ -47,8 +47,8 @@ model_parameters.glmmTMB <- function(model,
   ci_method <- .check_df_method(ci_method)
 
   # which components to return?
-  effects <- match.arg(effects, choices = c("fixed", "random", "all"))
-  component <- match.arg(component, choices = c("all", "conditional", "zi", "zero_inflated", "dispersion"))
+  effects <- insight::validate_argument(effects, c("fixed", "random", "all"))
+  component <- insight::validate_argument(component, c("all", "conditional", "zi", "zero_inflated", "dispersion"))
 
   # standardize only works for fixed effects...
   if (!is.null(standardize) && standardize != "refit") {
@@ -268,8 +268,8 @@ ci.glmmTMB <- function(x,
                        verbose = TRUE,
                        ...) {
   method <- tolower(method)
-  method <- match.arg(method, choices = c("wald", "normal", "ml1", "betwithin", "profile", "uniroot", "robust"))
-  component <- match.arg(component, choices = c("all", "conditional", "zi", "zero_inflated", "dispersion"))
+  method <- insight::validate_argument(method, c("wald", "normal", "ml1", "betwithin", "profile", "uniroot", "robust"))
+  component <- insight::validate_argument(component, c("all", "conditional", "zi", "zero_inflated", "dispersion"))
 
   if (is.null(.check_component(x, component, verbose = verbose))) {
     return(NULL)
@@ -315,8 +315,8 @@ standard_error.glmmTMB <- function(model,
                                    component = "all",
                                    verbose = TRUE,
                                    ...) {
-  component <- match.arg(component, choices = c("all", "conditional", "zi", "zero_inflated", "dispersion"))
-  effects <- match.arg(effects, choices = c("fixed", "random"))
+  component <- insight::validate_argument(component, c("all", "conditional", "zi", "zero_inflated", "dispersion"))
+  effects <- insight::validate_argument(effects, c("fixed", "random"))
 
   dot_args <- .check_dots(
     dots = list(...),
@@ -374,10 +374,10 @@ standard_error.glmmTMB <- function(model,
 #' @export
 simulate_model.glmmTMB <- function(model,
                                    iterations = 1000,
-                                   component = c("all", "conditional", "zi", "zero_inflated", "dispersion"),
+                                   component = "all",
                                    verbose = FALSE,
                                    ...) {
-  component <- match.arg(component)
+  component <- insight::validate_argument(component, c("all", "conditional", "zi", "zero_inflated", "dispersion"))
   info <- insight::model_info(model, verbose = FALSE)
 
   ## TODO remove is.list() when insight 0.8.3 on CRAN

R/methods_lme4.R

@@ -193,22 +193,22 @@ model_parameters.merMod <- function(model,
   ci_method <- tolower(ci_method)
 
   if (isTRUE(bootstrap)) {
-    ci_method <- match.arg(
+    ci_method <- insight::validate_argument(
       ci_method,
-      choices = c("hdi", "quantile", "ci", "eti", "si", "bci", "bcai")
+      c("hdi", "quantile", "ci", "eti", "si", "bci", "bcai")
     )
   } else {
-    ci_method <- match.arg(
+    ci_method <- insight::validate_argument(
       ci_method,
-      choices = c(
+      c(
         "wald", "normal", "residual", "ml1", "betwithin", "satterthwaite",
         "kenward", "kr", "boot", "profile", "uniroot"
       )
     )
   }
 
   # which component to return?
-  effects <- match.arg(effects, choices = c("fixed", "random", "all"))
+  effects <- insight::validate_argument(effects, c("fixed", "random", "all"))
   params <- params_random <- params_variance <- NULL
 
   # post hoc standardize only works for fixed effects...
@@ -343,7 +343,7 @@ ci.merMod <- function(x,
                       iterations = 500,
                       ...) {
   method <- tolower(method)
-  method <- match.arg(method, choices = c(
+  method <- insight::validate_argument(method, c(
     "wald", "ml1", "betwithin", "kr",
     "satterthwaite", "kenward", "boot",
     "profile", "residual", "normal"
@@ -379,7 +379,7 @@ standard_error.merMod <- function(model,
                                   vcov_args = NULL,
                                   ...) {
   dots <- list(...)
-  effects <- match.arg(effects, choices = c("fixed", "random"))
+  effects <- insight::validate_argument(effects, c("fixed", "random"))
 
   if (effects == "random") {
     out <- .standard_errors_random(model)

R/utils.R

@@ -220,6 +220,7 @@
   ifnotfound
 }
 
+
 .deprecated_warning <- function(old, new, verbose = TRUE) {
   if (verbose) {
     insight::format_warning(paste0(