Import functions from other packages rather than namespacing. (#51)

jonthegeek · Aug 25, 2023 · 0449de3 · 0449de3
1 parent bed3b93
commit 0449de3
Show file tree

Hide file tree

Showing 37 changed files with 192 additions and 139 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -20,6 +20,8 @@ S3method(to_lgl,double)
 S3method(to_lgl,factor)
 S3method(to_lgl,integer)
 S3method(to_lgl,logical)
+export(caller_arg)
+export(caller_env)
 export(object_type)
 export(stabilize_arg)
 export(stabilize_arg_scalar)
@@ -35,3 +37,17 @@ export(to_int)
 export(to_int_scalar)
 export(to_lgl)
 export(to_lgl_scalar)
+importFrom(cli,cli_abort)
+importFrom(cli,no)
+importFrom(glue,glue)
+importFrom(rlang,caller_arg)
+importFrom(rlang,caller_env)
+importFrom(rlang,check_dots_empty0)
+importFrom(rlang,inject)
+importFrom(rlang,is_scalar_character)
+importFrom(rlang,is_scalar_integer)
+importFrom(rlang,is_scalar_logical)
+importFrom(rlang,is_scalar_vector)
+importFrom(rlang,try_fetch)
+importFrom(vctrs,vec_cast)
+importFrom(vctrs,vec_size)
diff --git a/R/check.R b/R/check.R
@@ -1,7 +1,7 @@
 .check_na <- function(x,
                       allow_na = TRUE,
-                      x_arg = rlang::caller_arg(x),
-                      call = rlang::caller_env()) {
+                      x_arg = caller_arg(x),
+                      call = caller_env()) {
   allow_na <- to_lgl_scalar(allow_na, allow_null = FALSE, call = call)
   if (allow_na) {
     return(invisible(NULL))
@@ -23,8 +23,8 @@
 .check_size <- function(x,
                         min_size,
                         max_size,
-                        x_arg = rlang::caller_arg(x),
-                        call = rlang::caller_env()) {
+                        x_arg = caller_arg(x),
+                        call = caller_env()) {
   if (is.null(min_size) && is.null(max_size)) {
     return(invisible(NULL))
   }
@@ -33,7 +33,7 @@
   max_size <- to_int_scalar(max_size, call = call)
   .check_x_no_more_than_y(min_size, max_size, call = call)
 
-  x_size <- vctrs::vec_size(x)
+  x_size <- vec_size(x)
 
   min_ok <- is.null(min_size) || x_size >= min_size
   max_ok <- is.null(max_size) || x_size <= max_size
@@ -62,8 +62,8 @@
 .check_scalar <- function(x,
                           allow_null = TRUE,
                           allow_zero_length = TRUE,
-                          x_arg = rlang::caller_arg(x),
-                          call = rlang::caller_env(),
+                          x_arg = caller_arg(x),
+                          call = caller_env(),
                           x_class = object_type(x)) {
   # TODO: Some of this is redundant.
   if (!length(x)) {
@@ -83,11 +83,11 @@
     }
   }
 
-  if (rlang::is_scalar_vector(x)) {
+  if (is_scalar_vector(x)) {
     return(invisible(NULL))
   }
 
-  x_size <- vctrs::vec_size(x)
+  x_size <- vec_size(x)
 
   if (x_class == "NULL") {
     x_class <- "non-NULL"
@@ -96,17 +96,17 @@
     "must be a single {.cls {x_class}}.",
     x_arg = x_arg,
     call = call,
-    additional_msg = c(x = "{.arg {x_arg}} has {cli::no(x_size)} values.")
+    additional_msg = c(x = "{.arg {x_arg}} has {no(x_size)} values.")
   )
 }
 
 .check_x_no_more_than_y <- function(x,
                                     y,
-                                    x_arg = rlang::caller_arg(x),
-                                    y_arg = rlang::caller_arg(y),
-                                    call = rlang::caller_env()) {
+                                    x_arg = caller_arg(x),
+                                    y_arg = caller_arg(y),
+                                    call = caller_env()) {
   if (!is.null(x) && !is.null(y) && x > y) {
-    cli::cli_abort(
+    cli_abort(
       c(
         "{.arg {x_arg}} can't be larger than {.arg {y_arg}}.",
         "*" = "{.arg {x_arg}} = {x}",

diff --git a/R/cls_unexported.R b/R/cls_unexported.R
@@ -4,16 +4,16 @@
                            to_cls_args = list(),
                            allow_null = TRUE,
                            allow_zero_length = TRUE,
-                           x_arg = rlang::caller_arg(x),
-                           call = rlang::caller_env(),
+                           x_arg = caller_arg(x),
+                           call = caller_env(),
                            x_class = object_type(x)) {
   if (is_rlang_cls_scalar(x)) {
     return(x)
   }
 
   force(x_arg)
   force(call)
-  x <- rlang::inject(
+  x <- inject(
     to_cls_fn(
       x,
       allow_null = allow_null,
@@ -44,12 +44,12 @@
                            allow_na = TRUE,
                            min_size = NULL,
                            max_size = NULL,
-                           x_arg = rlang::caller_arg(x),
-                           call = rlang::caller_env(),
+                           x_arg = caller_arg(x),
+                           call = caller_env(),
                            x_class = object_type(x)) {
   force(x_arg)
   force(call)
-  x <- rlang::inject(
+  x <- inject(
     to_cls_fn(
       x,
       allow_null = allow_null,
@@ -60,7 +60,7 @@
     )
   )
   if (!is.null(check_cls_value_fn)) {
-    rlang::inject(
+    inject(
       check_cls_value_fn(
         x,
         !!!check_cls_value_fn_args,
@@ -90,14 +90,14 @@
                                   allow_null = TRUE,
                                   allow_zero_length = TRUE,
                                   allow_na = TRUE,
-                                  x_arg = rlang::caller_arg(x),
-                                  call = rlang::caller_env(),
+                                  x_arg = caller_arg(x),
+                                  call = caller_env(),
                                   x_class = object_type(x)) {
-  rlang::check_dots_empty0(..., call = call)
+  check_dots_empty0(..., call = call)
   force(x_arg)
   force(call)
 
-  x <- rlang::inject(
+  x <- inject(
     to_cls_scalar_fn(
       x,
       allow_null = allow_null,
@@ -109,7 +109,7 @@
     )
   )
   if (!is.null(check_cls_value_fn)) {
-    rlang::inject(
+    inject(
       check_cls_value_fn(
         x,
         !!!check_cls_value_fn_args,

diff --git a/R/is.R b/R/is.R
@@ -1,6 +1,6 @@
 .is_allowed_null <- function(x,
                              allow_null = TRUE,
-                             call = rlang::caller_env()) {
+                             call = caller_env()) {
   allow_null <- to_lgl_scalar(allow_null, allow_null = FALSE, call = call)
   return(is.null(x) && allow_null)
 }
diff --git a/R/msgs_common.R b/R/msgs_common.R
@@ -1,9 +1,17 @@
+#' @importFrom rlang caller_arg
+#' @export
+rlang::caller_arg
+
+#' @importFrom rlang caller_env
+#' @export
+rlang::caller_env
+
 .stop_must <- function(msg, x_arg, call, additional_msg = NULL) {
   main_msg <- .glue2("{.arg [x_arg]} [msg]")
-  cli::cli_abort(
+  cli_abort(
     c(main_msg, additional_msg),
     call = call,
-    .envir = rlang::caller_env()
+    .envir = caller_env()
   )
 }
 
@@ -15,10 +23,10 @@
   main_msg <- .glue2(
     "Can't coerce {.arg [x_arg]} {.cls [from_class]} to {.cls [to_class]}."
   )
-  cli::cli_abort(
+  cli_abort(
     c(main_msg, additional_msg),
     call = call,
-    .envir = rlang::caller_env()
+    .envir = caller_env()
   )
 }
 

diff --git a/R/stabilize_arg.R b/R/stabilize_arg.R
@@ -27,10 +27,10 @@ stabilize_arg <- function(x,
                           allow_na = TRUE,
                           min_size = NULL,
                           max_size = NULL,
-                          x_arg = rlang::caller_arg(x),
-                          call = rlang::caller_env(),
+                          x_arg = caller_arg(x),
+                          call = caller_env(),
                           x_class = object_type(x)) {
-  rlang::check_dots_empty0(..., call = call)
+  check_dots_empty0(..., call = call)
 
   if (is.null(x)) {
     return(

diff --git a/R/stabilize_arg_scalar.R b/R/stabilize_arg_scalar.R
@@ -18,10 +18,10 @@ stabilize_arg_scalar <- function(x,
                                  allow_null = TRUE,
                                  allow_zero_length = TRUE,
                                  allow_na = TRUE,
-                                 x_arg = rlang::caller_arg(x),
-                                 call = rlang::caller_env(),
+                                 x_arg = caller_arg(x),
+                                 call = caller_env(),
                                  x_class = object_type(x)) {
-  rlang::check_dots_empty0(..., call = call)
+  check_dots_empty0(..., call = call)
   .check_scalar(
     x,
     allow_null = allow_null,

diff --git a/R/stabilize_chr.R b/R/stabilize_chr.R
@@ -29,8 +29,8 @@ stabilize_chr <- function(x,
                           min_size = NULL,
                           max_size = NULL,
                           regex = NULL,
-                          x_arg = rlang::caller_arg(x),
-                          call = rlang::caller_env(),
+                          x_arg = caller_arg(x),
+                          call = caller_env(),
                           x_class = object_type(x)) {
   .stabilize_cls(
     x,
@@ -50,8 +50,8 @@ stabilize_chr <- function(x,
 
 .check_value_chr <- function(x,
                              regex,
-                             x_arg = rlang::caller_arg(x),
-                             call = rlang::caller_env()) {
+                             x_arg = caller_arg(x),
+                             call = caller_env()) {
   if (is.null(regex)) {
     return(invisible(NULL))
   }

diff --git a/R/stabilize_chr_scalar.R b/R/stabilize_chr_scalar.R
@@ -21,8 +21,8 @@ stabilize_chr_scalar <- function(x,
                                  allow_zero_length = TRUE,
                                  allow_na = TRUE,
                                  regex = NULL,
-                                 x_arg = rlang::caller_arg(x),
-                                 call = rlang::caller_env(),
+                                 x_arg = caller_arg(x),
+                                 call = caller_env(),
                                  x_class = object_type(x)) {
   .stabilize_cls_scalar(
     x,

diff --git a/R/stabilize_int.R b/R/stabilize_int.R
@@ -38,8 +38,8 @@ stabilize_int <- function(x,
                           max_size = NULL,
                           min_value = NULL,
                           max_value = NULL,
-                          x_arg = rlang::caller_arg(x),
-                          call = rlang::caller_env(),
+                          x_arg = caller_arg(x),
+                          call = caller_env(),
                           x_class = object_type(x)) {
   .stabilize_cls(
     x,
@@ -66,8 +66,8 @@ stabilize_int <- function(x,
 .check_value_int <- function(x,
                              min_value,
                              max_value,
-                             x_arg = rlang::caller_arg(x),
-                             call = rlang::caller_env()) {
+                             x_arg = caller_arg(x),
+                             call = caller_env()) {
   min_value <- to_int_scalar(min_value, call = call)
   max_value <- to_int_scalar(max_value, call = call)
 
@@ -87,5 +87,5 @@ stabilize_int <- function(x,
     x = "Values are too high at locations {max_failure_locations}."
   )
 
-  cli::cli_abort(c(min_msg, max_msg), call = call)
+  cli_abort(c(min_msg, max_msg), call = call)
 }
diff --git a/R/stabilize_int_scalar.R b/R/stabilize_int_scalar.R
@@ -24,8 +24,8 @@ stabilize_int_scalar <- function(x,
                                  coerce_factor = TRUE,
                                  min_value = NULL,
                                  max_value = NULL,
-                                 x_arg = rlang::caller_arg(x),
-                                 call = rlang::caller_env(),
+                                 x_arg = caller_arg(x),
+                                 call = caller_env(),
                                  x_class = object_type(x)) {
   .stabilize_cls_scalar(
     x,

diff --git a/R/stabilize_lgl.R b/R/stabilize_lgl.R
@@ -26,8 +26,8 @@ stabilize_lgl <- function(x,
                           allow_na = TRUE,
                           min_size = NULL,
                           max_size = NULL,
-                          x_arg = rlang::caller_arg(x),
-                          call = rlang::caller_env(),
+                          x_arg = caller_arg(x),
+                          call = caller_env(),
                           x_class = object_type(x)) {
   .stabilize_cls(
     x,

diff --git a/R/stabilize_lgl_scalar.R b/R/stabilize_lgl_scalar.R
@@ -20,8 +20,8 @@ stabilize_lgl_scalar <- function(x,
                                  allow_null = TRUE,
                                  allow_zero_length = TRUE,
                                  allow_na = TRUE,
-                                 x_arg = rlang::caller_arg(x),
-                                 call = rlang::caller_env(),
+                                 x_arg = caller_arg(x),
+                                 call = caller_env(),
                                  x_class = object_type(x)) {
   .stabilize_cls_scalar(
     x,

diff --git a/R/stbl-package.R b/R/stbl-package.R
@@ -2,5 +2,17 @@
 "_PACKAGE"
 
 ## usethis namespace: start
+#' @importFrom cli cli_abort
+#' @importFrom cli no
+#' @importFrom glue glue
+#' @importFrom rlang check_dots_empty0
+#' @importFrom rlang inject
+#' @importFrom rlang is_scalar_character
+#' @importFrom rlang is_scalar_integer
+#' @importFrom rlang is_scalar_logical
+#' @importFrom rlang is_scalar_vector
+#' @importFrom rlang try_fetch
+#' @importFrom vctrs vec_cast
+#' @importFrom vctrs vec_size
 ## usethis namespace: end
 NULL