Improve error messages with cli

DESCRIPTION

@@ -25,6 +25,7 @@ BugReports: https://github.com/sfirke/janitor/issues
 Depends:
     R (>= 3.1.2)
 Imports:
+    cli,
     dplyr (>= 1.0.0),
     hms,
     lifecycle,

R/convert_to_date.R

@@ -111,7 +111,7 @@ convert_to_datetime_helper.Date <- function(x, ..., tz = "UTC", out_class = c("P
   ret
 }
 
-convert_to_datetime_helper.character <- function(x, ..., tz = "UTC", character_fun = lubridate::ymd_hms, string_conversion_failure = c("error", "warning"), out_class = c("POSIXct", "Date")) {
+convert_to_datetime_helper.character <- function(x, ..., tz = "UTC", character_fun = lubridate::ymd_hms, string_conversion_failure = c("error", "warning"), out_class = c("POSIXct", "Date"), error_call = rlang::caller_env()) {
   string_conversion_failure <- match.arg(string_conversion_failure)
   out_class <- match.arg(out_class)
   mask_na <- is.na(x)
@@ -133,35 +133,28 @@ convert_to_datetime_helper.character <- function(x, ..., tz = "UTC", character_f
         character_fun(x[mask_character], ...)
       }
     if (!(out_class %in% class(characters_converted))) {
-      stop(
-        "`character_fun(x)` must return class ", out_class,
-        "; the returned class was: ", paste(class(characters_converted), collapse = ", ")
+      cli::cli_abort(
+        c(
+          x = "`character_fun(x)` must return class {out_class}",
+          "The returned class was: {.obj_type_friendly {characters_converted}}"
+        ),
+        call = error_call
       )
     }
     ret[mask_character] <- characters_converted
-    if (any(is.na(ret[mask_character]))) {
+    if (anyNA(ret[mask_character])) {
       not_converted_values <- unique(x[mask_character & is.na(ret)])
-      # Don't provide too many error values
-      if (length(not_converted_values) > 10) {
-        not_converted_values <-
-          paste(
-            paste0('"', not_converted_values[1:9], '"', collapse = ", "),
-            "... and", length(not_converted_values) - 9, "other values."
-          )
-      } else {
-        not_converted_values <-
-          paste0('"', not_converted_values, '"', collapse = ", ")
-      }
+      n_not_converted <- length(not_converted_values)
+      # Let cli print which values were not converted.
       not_converted_message <-
-        paste0(
-          "Not all character strings converted to class ", out_class,
-          ".  Values not converted were: ",
-          not_converted_values
+        c(
+          "Not all character strings converted to class {.cls {out_class}}.",
+          i = "{n_not_converted} value{?s} not converted: {.val {not_converted_values}}"
         )
       if (string_conversion_failure %in% "error") {
-        stop(not_converted_message)
+        cli::cli_abort(not_converted_message, call = error_call)
       } else {
-        warning(not_converted_message)
+        cli::cli_warn(not_converted_message)
       }
     }
   }

tests/testthat/test-convert_to_date.R

@@ -103,25 +103,19 @@ test_that("convert_date warnings and errors work", {
   expect_warning(
     expect_error(
       convert_to_date("A"),
-      regexp = "Not all character strings converted to class Date."
+      regexp = "Not all character strings converted to class .+Date"
     ),
     regexp = "All formats failed to parse." # lubridate warning
   )
   expect_warning(
     expect_error(
       convert_to_date(LETTERS),
-      regexp = "Not all character strings converted to class Date.*17 other values",
+      regexp = "Not all character strings converted to class .+Date",
       info = "Confirm the 'other values' when there are many values not converted."
     ),
     regexp = "All formats failed to parse." # lubridate warning
   )
-  expect_warning(
-    expect_error(
-      convert_to_date(LETTERS),
-      regexp = "Not all character strings converted to class Date."
-    ),
-    regexp = "All formats failed to parse." # lubridate warning
-  )
+
   expect_warning(
     expect_warning(
       expect_equal(
@@ -130,7 +124,7 @@ test_that("convert_date warnings and errors work", {
       ),
       regexp = "All formats failed to parse. No formats found."
     ),
-    regexp = "Not all character strings converted to class Date."
+    regexp = "Not all character strings converted to class.+Date."
   )
   expect_error(
     convert_to_date("A", character_fun = function(x) 1),