fix: proper rlang imports and types check

Author: atsyplenkov

.Rbuildignore

@@ -18,3 +18,4 @@
 ^codemeta\.json$
 ^CODE_OF_CONDUCT\.md$
 ^src/.*\.o$
+^dev\.R$

DESCRIPTION

@@ -11,7 +11,8 @@ Depends: R (>= 4.1.0)
 Imports:
     Rcpp (>= 1.0.12),
     rlang (>= 1.1.0),
-    yardstick (>= 1.3.1)
+    yardstick (>= 1.3.1),
+    cli
 LinkingTo: Rcpp
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.3.2

NAMESPACE

@@ -1,5 +1,6 @@
 useDynLib(tidyhydro, .registration = TRUE)
 importFrom(Rcpp, evalCpp)
+import(rlang)
 # exportPattern("^[[:alpha:]]+")
 
 S3method(nse, data.frame)

R/aaa-new.R

@@ -38,7 +38,7 @@ new_sym_measure <- function(fn) {
 }
 
 #' @include import-standalone-types-check.R
-new_measure <- function(fn, direction, class = NULL, call = caller_env()) {
+new_measure <- function(fn, class = NULL, call = caller_env()) {
   check_function(fn, call = call)
 
   class <- c(class, "measure", "function")

R/import-standalone-obj-type.R

@@ -67,7 +67,7 @@
 #'   article, e.g. "an integer vector".
 #' @noRd
 obj_type_friendly <- function(x, value = TRUE) {
-  if (rlang::is_missing(x)) {
+  if (is_missing(x)) {
     return("absent")
   }
 
@@ -80,15 +80,15 @@ obj_type_friendly <- function(x, value = TRUE) {
     return(sprintf("a <%s> object", type))
   }
 
-  if (!rlang::is_vector(x)) {
+  if (!is_vector(x)) {
     return(.rlang_as_friendly_type(typeof(x)))
   }
 
   n_dim <- length(dim(x))
 
   if (!n_dim) {
-    if (!rlang::is_list(x) && length(x) == 1) {
-      if (rlang::is_na(x)) {
+    if (!is_list(x) && length(x) == 1) {
+      if (is_na(x)) {
         return(switch(
           typeof(x),
           logical = "`NA`",
@@ -173,8 +173,8 @@ obj_type_friendly <- function(x, value = TRUE) {
 }
 
 vec_type_friendly <- function(x, length = FALSE) {
-  if (!rlang::is_vector(x)) {
-    rlang::abort("`x` must be a vector.")
+  if (!is_vector(x)) {
+    abort("`x` must be a vector.")
   }
   type <- typeof(x)
   n_dim <- length(dim(x))
@@ -260,8 +260,8 @@ vec_type_friendly <- function(x, length = FALSE) {
   )
 }
 
-.rlang_stop_unexpected_typeof <- function(x, call = rlang::caller_env()) {
-  rlang::abort(
+.rlang_stop_unexpected_typeof <- function(x, call = caller_env()) {
+  abort(
     sprintf("Unexpected type <%s>.", typeof(x)),
     call = call
   )
@@ -296,7 +296,7 @@ obj_type_oo <- function(x) {
 #'   character vector of expected types, in which case the error
 #'   message mentions all of them in an "or" enumeration.
 #' @param show_value Passed to `value` argument of `obj_type_friendly()`.
-#' @param ... Arguments passed to [rlang::abort()].
+#' @param ... Arguments passed to [abort()].
 #' @inheritParams args_error_context
 #' @noRd
 stop_input_type <- function(
@@ -306,11 +306,11 @@ stop_input_type <- function(
   allow_na = FALSE,
   allow_null = FALSE,
   show_value = TRUE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   # From standalone-cli.R
-  cli <- rlang::env_get_list(
+  cli <- env_get_list(
     nms = c("format_arg", "format_code"),
     last = topenv(),
     default = function(x) sprintf("`%s`", x),
@@ -339,7 +339,7 @@ stop_input_type <- function(
     obj_type_friendly(x, value = show_value)
   )
 
-  rlang::abort(message, ..., call = call, arg = arg)
+  abort(message, ..., call = call, arg = arg)
 }
 
 oxford_comma <- function(chr, sep = ", ", final = "or") {

R/import-standalone-types-check.R

@@ -70,8 +70,8 @@ check_bool <- function(
   ...,
   allow_na = FALSE,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (
     !missing(x) &&
@@ -102,8 +102,8 @@ check_string <- function(
   allow_empty = TRUE,
   allow_na = FALSE,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
     is_string <- .rlang_check_is_string(
@@ -129,13 +129,13 @@ check_string <- function(
 }
 
 .rlang_check_is_string <- function(x, allow_empty, allow_na, allow_null) {
-  if (rlang::is_string(x)) {
-    if (allow_empty || !rlang::is_string(x, "")) {
+  if (is_string(x)) {
+    if (allow_empty || !is_string(x, "")) {
       return(TRUE)
     }
   }
 
-  if (allow_null && rlang::is_null(x)) {
+  if (allow_null && is_null(x)) {
     return(TRUE)
   }
 
@@ -150,8 +150,8 @@ check_name <- function(
   x,
   ...,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
     is_string <- .rlang_check_is_string(
@@ -188,8 +188,8 @@ check_number_decimal <- function(
   allow_infinite = TRUE,
   allow_na = FALSE,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (missing(x)) {
     exit_code <- IS_NUMBER_false
@@ -231,8 +231,8 @@ check_number_whole <- function(
   allow_infinite = FALSE,
   allow_na = FALSE,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (missing(x)) {
     exit_code <- IS_NUMBER_false
@@ -295,7 +295,7 @@ check_number_whole <- function(
     } else if (x > max) {
       what <- sprintf("%s smaller than or equal to %s", what, max)
     } else {
-      rlang::abort("Unexpected state in OOB check", .internal = TRUE)
+      abort("Unexpected state in OOB check", .internal = TRUE)
     }
   }
 
@@ -314,14 +314,14 @@ check_symbol <- function(
   x,
   ...,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
-    if (rlang::is_symbol(x)) {
+    if (is_symbol(x)) {
       return(invisible(NULL))
     }
-    if (allow_null && rlang::is_null(x)) {
+    if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
   }
@@ -341,14 +341,14 @@ check_arg <- function(
   x,
   ...,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
-    if (rlang::is_symbol(x)) {
+    if (is_symbol(x)) {
       return(invisible(NULL))
     }
-    if (allow_null && rlang::is_null(x)) {
+    if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
   }
@@ -368,14 +368,14 @@ check_call <- function(
   x,
   ...,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
-    if (rlang::is_call(x)) {
+    if (is_call(x)) {
       return(invisible(NULL))
     }
-    if (allow_null && rlang::is_null(x)) {
+    if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
   }
@@ -395,14 +395,14 @@ check_environment <- function(
   x,
   ...,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
-    if (rlang::is_environment(x)) {
+    if (is_environment(x)) {
       return(invisible(NULL))
     }
-    if (allow_null && rlang::is_null(x)) {
+    if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
   }
@@ -422,14 +422,14 @@ check_function <- function(
   x,
   ...,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
-    if (rlang::is_function(x)) {
+    if (is_function(x)) {
       return(invisible(NULL))
     }
-    if (allow_null && rlang::is_null(x)) {
+    if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
   }
@@ -449,14 +449,14 @@ check_closure <- function(
   x,
   ...,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
-    if (rlang::is_closure(x)) {
+    if (is_closure(x)) {
       return(invisible(NULL))
     }
-    if (allow_null && rlang::is_null(x)) {
+    if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
   }
@@ -476,14 +476,14 @@ check_formula <- function(
   x,
   ...,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
-    if (rlang::is_formula(x)) {
+    if (is_formula(x)) {
       return(invisible(NULL))
     }
-    if (allow_null && rlang::is_null(x)) {
+    if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
   }
@@ -509,13 +509,13 @@ check_character <- function(
   ...,
   allow_na = TRUE,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
-    if (rlang::is_character(x)) {
+    if (is_character(x)) {
       if (!allow_na && any(is.na(x))) {
-        rlang::abort(
+        abort(
           sprintf("`%s` can't contain NA values.", arg),
           arg = arg,
           call = call
@@ -525,7 +525,7 @@ check_character <- function(
       return(invisible(NULL))
     }
 
-    if (allow_null && rlang::is_null(x)) {
+    if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
   }
@@ -544,14 +544,14 @@ check_logical <- function(
   x,
   ...,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
-    if (rlang::is_logical(x)) {
+    if (is_logical(x)) {
       return(invisible(NULL))
     }
-    if (allow_null && rlang::is_null(x)) {
+    if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
   }
@@ -571,14 +571,14 @@ check_data_frame <- function(
   x,
   ...,
   allow_null = FALSE,
-  arg = rlang::caller_arg(x),
-  call = rlang::caller_env()
+  arg = caller_arg(x),
+  call = caller_env()
 ) {
   if (!missing(x)) {
     if (is.data.frame(x)) {
       return(invisible(NULL))
     }
-    if (allow_null && rlang::is_null(x)) {
+    if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
   }