Replace is_toggle() and check_needle() with rlang standalone types-check

Co-authored-by: krlmlr <1741643+krlmlr@users.noreply.github.com>

Author: Copilot

R/drive_examples.R

@@ -79,7 +79,7 @@ many_files <- function(needle, haystack, where = c("local", "remote")) {
   out <- haystack
 
   if (!missing(needle)) {
-    check_needle(needle)
+    check_string(needle, arg = "matches")
     sel <- grepl(needle, haystack$name, ignore.case = TRUE)
     if (!any(sel)) {
       drive_abort(
@@ -142,11 +142,4 @@ remote_example_files <- function() {
   env_get(.googledrive, "remote_example_files")
 }
 
-check_needle <- function(needle) {
-  if (is_string(needle)) {
-    return()
-  }
-  drive_abort(c(
-    "{.arg matches} must be a string, not {.cls class(needle)}"
-  ))
-}
+

R/drive_find.R

@@ -141,7 +141,7 @@ drive_find <- function(
   if (!is.null(pattern) && !(is_string(pattern))) {
     drive_abort("{.arg pattern} must be a character string.")
   }
-  stopifnot(is_toggle(trashed))
+  check_bool(trashed)
   stopifnot(is.numeric(n_max), n_max >= 0, length(n_max) == 1)
 
   if (lifecycle::is_present(team_drive)) {

R/standalone-types-check.R

@@ -0,0 +1,92 @@
+# ---
+# repo: r-lib/rlang
+# file: standalone-types-check.R
+# last-updated: 2023-03-13
+# license: https://unlicense.org
+# dependencies: none (simplified version for googledrive)
+# imports: rlang (>= 1.1.0)
+# ---
+#
+# This is a simplified version of the rlang standalone types-check
+# focusing only on the functions needed by googledrive
+
+# nocov start
+
+check_bool <- function(
+  x,
+  ...,
+  allow_na = TRUE,
+  allow_null = FALSE,
+  arg = rlang::caller_arg(x),
+  call = rlang::caller_env()
+) {
+  if (!missing(x)) {
+    if (allow_null && is.null(x)) {
+      return(invisible(NULL))
+    }
+    if (length(x) == 1L && is.logical(x)) {
+      if (allow_na || !is.na(x)) {
+        return(invisible(NULL))
+      }
+    }
+  }
+
+  # Create error message based on what we allow
+  expected <- "`TRUE` or `FALSE`"
+  if (allow_na) {
+    expected <- paste(expected, "or `NA`")
+  }
+  if (allow_null) {
+    expected <- paste(expected, "or `NULL`")
+  }
+
+  rlang::abort(
+    message = paste0("`", arg, "` must be ", expected, "."),
+    ...,
+    call = call
+  )
+}
+
+check_string <- function(
+  x,
+  ...,
+  allow_empty = TRUE,
+  allow_na = FALSE,
+  allow_null = FALSE,
+  arg = rlang::caller_arg(x),
+  call = rlang::caller_env()
+) {
+  if (!missing(x)) {
+    if (allow_null && is.null(x)) {
+      return(invisible(NULL))
+    }
+    if (length(x) == 1L && is.character(x)) {
+      if (allow_na && is.na(x)) {
+        return(invisible(NULL))
+      }
+      if (!is.na(x) && (allow_empty || nzchar(x))) {
+        return(invisible(NULL))
+      }
+    }
+  }
+
+  # Create error message
+  expected <- "a single string"
+  if (!allow_empty) {
+    expected <- "a single non-empty string"
+  }
+  if (allow_na) {
+    expected <- paste(expected, "or `NA`")
+  }
+  if (allow_null) {
+    expected <- paste(expected, "or `NULL`")
+  }
+
+  rlang::abort(
+    message = paste0("`", arg, "` must be ", expected, "."),
+    ...,
+    call = call
+  )
+}
+
+# nocov end

R/utils-paths.R

@@ -84,7 +84,7 @@ check_for_overwrite <- function(parent = NULL, name, overwrite) {
 }
 
 overwrite_hits <- function(parent = NULL, name, overwrite) {
-  stopifnot(is_toggle(overwrite))
+  check_bool(overwrite)
   if (is.na(overwrite)) {
     return(invisible())
   }

R/utils.R

@@ -1,7 +1,5 @@
 isFALSE <- function(x) identical(x, FALSE)
 
-is_toggle <- function(x) length(x) == 1L && is.logical(x)
-
 last <- function(x) pluck(x, length(x))
 
 escape_regex <- function(x) {