Use check_spec_mode_val for all mode checking

Author: juliasilge

R/aaa_models.R

@@ -135,13 +135,15 @@ check_mode_val <- function(mode) {
 # check if class and mode are compatible
 check_spec_mode_val <- function(cls, mode) {
   spec_modes <- rlang::env_get(get_model_env(), paste0(cls, "_modes"))
-  if (!(mode %in% spec_modes))
-    rlang::abort(
-      glue::glue(
-        "`mode` should be one of: ",
-        glue::glue_collapse(glue::glue("'{spec_modes}'"), sep = ", ")
-      )
+  compatible_modes <-
+    glue::glue(
+      "`mode` should be one of: ",
+      glue::glue_collapse(glue::glue("'{spec_modes}'"), sep = ", ")
     )
+
+  if (is.null(mode)) rlang::abort(compatible_modes)
+  else if (!(mode %in% spec_modes)) rlang::abort(compatible_modes)
+
   invisible(NULL)
 }
 

R/arguments.R

@@ -78,14 +78,6 @@ set_args <- function(object, ...) {
 set_mode <- function(object, mode) {
   if (rlang::is_missing(mode)) mode <- NULL
   mode <- mode[1]
-  if (is.null(mode) | !(any(all_modes == mode))) {
-    rlang::abort(
-      glue::glue(
-        "`mode` should be one of ",
-        glue::glue_collapse(glue::glue("'{all_modes}'"), sep = ", ")
-      )
-    )
-  }
   check_spec_mode_val(class(object)[1], mode)
   object$mode <- mode
   object