Update embedded pkgdepends

For r-lib/pkgdepends@634661a

Author: gaborcsardi

src/library/pkgdepends/DESCRIPTION

@@ -37,7 +37,7 @@ Config/usethis/last-upkeep: 2025-05-05
 Encoding: UTF-8
 RoxygenNote: 7.3.2.9000
 NeedsCompilation: yes
-Packaged: 2026-03-10 08:02:30 UTC; gaborcsardi
+Packaged: 2026-03-19 17:25:38 UTC; gaborcsardi
 Author: Gábor Csárdi [aut, cre],
   Posit Software, PBC [cph, fnd] (ROR: <https://ror.org/03wc8by49>)
 Maintainer: Gábor Csárdi <csardi.gabor@gmail.com>

src/library/pkgdepends/R/aaa-rstudio-detect.R

@@ -51,8 +51,12 @@ rstudio <- local({
     }
 
     # Cached?
-    if (clear_cache) data <<- NULL
-    if (!is.null(data)) return(get_caps(data))
+    if (clear_cache) {
+      data <<- NULL
+    }
+    if (!is.null(data)) {
+      return(get_caps(data))
+    }
 
     if (
       (rspid <- Sys.getenv("RSTUDIO_SESSION_PID")) != "" &&
@@ -86,7 +90,9 @@ rstudio <- local({
     pane <- Sys.getenv("RSTUDIO_CHILD_PROCESS_PANE")
 
     # this should not happen, but be defensive and fall back
-    if (pane == "") return(detect_old(clear_cache))
+    if (pane == "") {
+      return(detect_old(clear_cache))
+    }
 
     # direct subprocess
     new$type <- if (rspid == parentpid) {
@@ -175,7 +181,9 @@ rstudio <- local({
     }
 
     installing <- Sys.getenv("R_PACKAGE_DIR", "")
-    if (cache && installing == "") data <<- new
+    if (cache && installing == "") {
+      data <<- new
+    }
 
     get_caps(new)
   }

src/library/pkgdepends/R/assertions.R

@@ -18,8 +18,37 @@ is_character <- function(x) {
   }
 }
 
+is_non_empty_character <- function(x) {
+  if (!is.character(x)) {
+    structure(
+      FALSE,
+      msg = "{.arg {(.arg)}} must be a non-empty character vector without {.code NA},
+             but it is {.type {x}}",
+      env = environment()
+    )
+  } else if (anyNA(x)) {
+    structure(
+      FALSE,
+      msg = "{.arg {(.arg)}} must be a non-empty character vector without {.code NA},
+             but it has {sum(is.na(x))} {.code NA} value{?s}.",
+      env = environment()
+    )
+  } else if (length(x) == 0) {
+    structure(
+      FALSE,
+      msg = "{.arg {(.arg)}} must be a non-empty character vector without {.code NA},
+             but it is empty.",
+      env = environment()
+    )
+  } else {
+    TRUE
+  }
+}
+
 is_string <- function(x) {
-  if (is.character(x) && length(x) == 1 && !is.na(x)) return(TRUE)
+  if (is.character(x) && length(x) == 1 && !is.na(x)) {
+    return(TRUE)
+  }
   if (is.character(x) && length(x) == 1 && is.na(x)) {
     structure(
       FALSE,
@@ -37,7 +66,9 @@ is_string <- function(x) {
 }
 
 is_optional_string <- function(x) {
-  if (is.null(x) || is_string(x)) return(TRUE)
+  if (is.null(x) || is_string(x)) {
+    return(TRUE)
+  }
   structure(
     FALSE,
     msg = "{.arg {(.arg)}} must be a path (character scalar),
@@ -47,7 +78,9 @@ is_optional_string <- function(x) {
 }
 
 is_flag <- function(x) {
-  if (is.logical(x) && length(x) == 1 && !is.na(x)) return(TRUE)
+  if (is.logical(x) && length(x) == 1 && !is.na(x)) {
+    return(TRUE)
+  }
   if (is.logical(x) && length(x) == 1 && is.na(x)) {
     structure(
       FALSE,
@@ -67,7 +100,9 @@ is_flag <- function(x) {
 ## To be refined
 
 is_path <- function(x) {
-  if (is_string(x)) return(TRUE)
+  if (is_string(x)) {
+    return(TRUE)
+  }
   structure(
     FALSE,
     msg = "{.arg {(.arg)}} must be a path (character scalar),
@@ -77,7 +112,9 @@ is_path <- function(x) {
 }
 
 is_optional_path <- function(x) {
-  if (is_optional_string(x)) return(TRUE)
+  if (is_optional_string(x)) {
+    return(TRUE)
+  }
   structure(
     FALSE,
     msg = "{.arg {(.arg)}} must be a path (character scalar) or {.code NULL},
@@ -87,7 +124,9 @@ is_optional_path <- function(x) {
 }
 
 all_named <- function(x) {
-  if (length(names(x)) == length(x) && all(names(x) != "")) return(TRUE)
+  if (length(names(x)) == length(x) && all(names(x) != "")) {
+    return(TRUE)
+  }
   structure(
     FALSE,
     msg = "All elements in {.arg {(.arg)}} must be named.",
@@ -202,7 +241,9 @@ is_r_version_list <- function(x) {
 }
 
 is_difftime <- function(x) {
-  if (inherits(x, "difftime")) return(TRUE)
+  if (inherits(x, "difftime")) {
+    return(TRUE)
+  }
   structure(
     FALSE,
     msg = "{.arg {(.arg)}} must be a {.cls difftime} object, but it is

src/library/pkgdepends/R/assertthat.R

@@ -11,7 +11,9 @@ assert_that <- function(..., env = parent.frame(), msg = NULL) {
       }
     )
     check_result(res)
-    if (res) next
+    if (res) {
+      next
+    }
 
     if (is.null(msg)) {
       msg <- get_message(res, assertion, env)
@@ -55,8 +57,12 @@ assert_error <- function(
     )
   )
 
-  if (length(.data)) cnd[names(.data)] <- .data
-  if (length(class)) class(cnd) <- unique(c(.class, "assertError", class(cnd)))
+  if (length(.data)) {
+    cnd[names(.data)] <- .data
+  }
+  if (length(class)) {
+    class(cnd) <- unique(c(.class, "assertError", class(cnd)))
+  }
 
   cnd
 }
@@ -90,7 +96,9 @@ get_message <- function(res, call, env = parent.frame()) {
   }
 
   f <- eval(call[[1]], env)
-  if (is.call(call) && !is.primitive(f)) call <- match.call(f, call)
+  if (is.call(call) && !is.primitive(f)) {
+    call <- match.call(f, call)
+  }
   fname <- deparse(call[[1]])
 
   base_fs[[fname]] %||% fail_default(call, env)
@@ -110,7 +118,9 @@ fail_default <- function(call, env) {
 }
 
 has_attr <- function(x, which) {
-  if (!is.null(attr(x, which, exact = TRUE))) return(TRUE)
+  if (!is.null(attr(x, which, exact = TRUE))) {
+    return(TRUE)
+  }
   structure(
     FALSE,
     msg = "{.arg {(.arg)}} must have attribute {.code {which}}.",

src/library/pkgdepends/R/config.R

@@ -99,6 +99,11 @@
 #' String or `NULL`. `NA` is not allowed. In environment variables the
 #' string `NULL` means an R `NULL` value.
 #'
+#' ## `character_or_null`
+#'
+#' Character vector or `NULL`. `NA` is not allowed. In environment variables
+#' the entries are separated by a semicolon.
+#'
 #' ## `character`
 #'
 #' Character vector without `NA` values. In environment variables the
@@ -117,7 +122,9 @@ config <- local({
   true <- function(...) TRUE
 
   is_config_name <- function(name) {
-    if (is_string(name)) return(TRUE)
+    if (is_string(name)) {
+      return(TRUE)
+    }
     structure(
       FALSE,
       msg = c(
@@ -129,7 +136,9 @@ config <- local({
   }
 
   is_config_check <- function(check) {
-    if (is_string(check) || is.function(check) || is.null(check)) return(TRUE)
+    if (is_string(check) || is.function(check) || is.null(check)) {
+      return(TRUE)
+    }
     structure(
       FALSE,
       msg = c(
@@ -153,6 +162,7 @@ config <- local({
   # Built-in types
   builtin_types <- c(
     "character",
+    "character_or_null",
     "count",
     "custom",
     "flag",
@@ -163,6 +173,9 @@ config <- local({
   # Checks for builtin types
   builtin_checks <- list(
     character = function(x) is.character(x) && !anyNA(x),
+    character_or_null = function(x) {
+      (is.character(x) && !anyNA(x)) || is.null(x)
+    },
     custom = function(x) true(x),
     flag = function(x) is_flag(x),
     string = function(x) is_string(x),
@@ -183,15 +196,22 @@ config <- local({
     },
     flag = function(x, name, ...) {
       x <- tolower(x)
-      if (tolower(x) %in% c("yes", "true", "1", "on")) return(TRUE)
-      if (tolower(x) %in% c("no", "false", "0", "off")) return(FALSE)
+      if (tolower(x) %in% c("yes", "true", "1", "on")) {
+        return(TRUE)
+      }
+      if (tolower(x) %in% c("no", "false", "0", "off")) {
+        return(FALSE)
+      }
       throw(pkg_error(
         "Invalid value for the {.envvar {name}} environment variable.",
         i = "It must be either {.code true} or {.code false}."
       ))
     },
     string = function(x, ...) x,
     string_or_null = function(x, ...) if (identical(x, "NULL")) NULL else x,
+    character_or_null = function(x, ...) {
+      if (x %in% c("", "NULL")) NULL else strsplit(x, ";", fixed = TRUE)[[1]]
+    },
     count = function(x, name, ...) {
       num <- suppressWarnings(as.numeric(num))
       if (is.na(num) || !is_count(num)) {
@@ -218,13 +238,17 @@ config <- local({
     rec <- env$data[[name]]
 
     # was explicitly set?
-    if (!is.null(rec$value)) return(list("set", rec$value))
+    if (!is.null(rec$value)) {
+      return(list("set", rec$value))
+    }
 
     # set via options()
     optname <- paste0(env$prefix, name)
     opt <- getOption(optname)
     if (!is.null(opt)) {
-      if (!is.null(chk <- env$data[[name]]$check)) chk(opt)
+      if (!is.null(chk <- env$data[[name]]$check)) {
+        chk(opt)
+      }
       return(list("option", opt))
     }
 
@@ -365,11 +389,17 @@ config <- local({
         ))
       }
 
-      if (is_string(check)) check <- env$checks[[check]]
+      if (is_string(check)) {
+        check <- env$checks[[check]]
+      }
       check <- check %||% true
-      if (!is.null(default) && !is.function(default)) check(default)
+      if (!is.null(default) && !is.function(default)) {
+        check(default)
+      }
 
-      if (is_string(env_decode)) env_decode <- env$env_decode[[env_decode]]
+      if (is_string(env_decode)) {
+        env_decode <- env$env_decode[[env_decode]]
+      }
       env_decode <- env_decode %||% identity
 
       env$data[[name]] <- list(
@@ -454,7 +484,9 @@ config <- local({
           i = "See `$list()` for the list of all config entries."
         ))
       }
-      if (!is.null(chk <- env$data[[name]]$check)) chk(value)
+      if (!is.null(chk <- env$data[[name]]$check)) {
+        chk(value)
+      }
       env$data[[name]]$value <- value
       invisible(env)
     }

src/library/pkgdepends/R/dep-utils.R

@@ -67,7 +67,9 @@ deps_from_desc <- function(deps, last) {
 parse_all_deps <- function(deps) {
   deps <- na.omit(deps)
   res <- do.call(rbind, parse_deps(deps, names(deps)))
-  if (is.null(res)) res <- parse_deps("", "")[[1]]
+  if (is.null(res)) {
+    res <- parse_deps("", "")[[1]]
+  }
   res$ref <- res$package
   res[, c("ref", setdiff(names(res), "ref"))]
 }