Merge branch 'main' into 0063-unexported-fns

pharmaverse · Jul 24, 2024 · 42991da · 42991da
2 parents 3e9c9da + a6e52d5
commit 42991da
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/r-renv-lock.yml b/.github/workflows/r-renv-lock.yml
@@ -36,7 +36,7 @@ jobs:
     steps:
       - name: Get branch names
         id: branch-name
-        uses: tj-actions/branch-names@v5.4
+        uses: tj-actions/branch-names@v8
 
       - name: Checkout repo (PR) 🛎
         uses: actions/checkout@v3

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,6 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method(ctl_new_rowid_pillar,cnd_df)
+S3method(mutate,cnd_df)
 S3method(print,iso8601)
 S3method(tbl_sum,cnd_df)
 export("%.>%")

diff --git a/R/cnd_df.R b/R/cnd_df.R
@@ -340,7 +340,7 @@ condition_add <- function(dat, ..., .na = NA, .dat2 = rlang::env()) {
 #'
 #' @inheritParams dplyr::mutate
 #' @importFrom dplyr mutate
-#' @keywords internal
+#' @export
 mutate.cnd_df <- function(.data,
                           ...,
                           .by = NULL,
@@ -364,5 +364,5 @@ mutate.cnd_df <- function(.data,
   lst <- purrr::map(derivations, ~ rlang::expr(dplyr::if_else(!!cnd, !!.x, NA)))
   lst <- rlang::set_names(lst, derived_vars)
 
-  dplyr::mutate(dat, !!!lst, .by = NULL, .keep = .keep, .after = .after)
+  dplyr::mutate(dat, !!!lst, .by = NULL, .keep = .keep, .after = dplyr::all_of(.after))
 }
diff --git a/man/mutate.cnd_df.Rd b/man/mutate.cnd_df.Rd