enh: checkmate some checks

Author: dshemetov

R/epidatacall.R

@@ -44,11 +44,11 @@
 #' @importFrom purrr map_chr map_lgl
 create_epidata_call <- function(endpoint, params, meta = NULL,
                                 only_supports_classic = FALSE) {
-  stopifnot(is.character(endpoint), length(endpoint) == 1)
-  stopifnot(is.list(params))
-  stopifnot(is.null(meta) || is.list(meta))
-  stopifnot(all(map_lgl(meta, ~ inherits(.x, "EpidataFieldInfo"))))
-  stopifnot(is.logical(only_supports_classic), length(only_supports_classic) == 1)
+  checkmate::assert_character(endpoint, len = 1)
+  checkmate::assert_list(params)
+  checkmate::assert_list(meta, null.ok = TRUE)
+  checkmate::assert_logical(only_supports_classic, len = 1)
+  checkmate::assert_true(all(map_lgl(meta, ~ inherits(.x, "EpidataFieldInfo"))))
 
   if (length(unique(meta)) != length(meta)) {
     cli::cli_abort(
@@ -73,6 +73,15 @@ create_epidata_call <- function(endpoint, params, meta = NULL,
     )
   }
 
+  # TODO: Something like this in the future? We set up the categories
+  # but we don't actually validate them yet?
+  # for (field in names(params)) {
+  #   value <- params[[field]]
+  #   if (meta[[field]]$type == "categorical") {
+  #     checkmate::assert_subset(value, meta[[field]]$categories)
+  #   }
+  # }
+
   if (is.null(meta)) {
     meta <- list()
   }

R/model.R

@@ -132,21 +132,18 @@ create_epidata_field_info <- function(name,
                                       type,
                                       description = "",
                                       categories = c()) {
-  stopifnot(is.character(name) && length(name) == 1)
-  stopifnot(
-    is.character(type) &&
-      length(type) == 1 &&
-      type %in% c(
-        "text",
-        "int",
-        "float",
-        "date",
-        "epiweek",
-        "categorical",
-        "bool"
-      )
-  )
-  stopifnot(is.character(description) && length(description) == 1)
+  checkmate::assert_character(name, len = 1)
+  checkmate::assert_character(type, len = 1)
+  checkmate::assert_subset(type, c(
+    "text",
+    "int",
+    "float",
+    "date",
+    "epiweek",
+    "categorical",
+    "bool"
+  ))
+  checkmate::assert_character(description, len = 1)
   structure(
     list(
       name = name,