Implement defer_knitr()

DESCRIPTION

@@ -17,15 +17,15 @@ Depends:
 Imports:
     knitr,
     readr (>= 1.0.0),
-    rmarkdown,
-    withr (>= 2.5.0)
+    rmarkdown
 Suggests:
     callr (>= 3.7.5),
     pkgload,
     testthat (>= 3.0.0),
-    usethis
+    usethis,
+    withr (>= 2.5.0)
 Config/Needs/website: arnaudgallou/cygne
 Config/testthat/edition: 3
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3

NEWS.md

@@ -1,5 +1,7 @@
 # pakret (development version)
 
+* pakret now works when called after the package [conflicted](https://conflicted.r-lib.org) (#30).
+
 * Citing multiple packages is now significantly faster (#31).
 
 # pakret 0.2.2

R/pkrt-set.R

@@ -55,7 +55,7 @@ reset <- function(x) {
 update <- function(x) {
   if (is_updating_bib(x)) {
     bib_write()
-    withr::defer(bib_set())
+    defer(bib_set())
   }
   do.call(set, as.list(x))
 }

R/utils-local.R

@@ -114,7 +114,7 @@ bib_field <- function(name) {
 }
 
 load_pkg <- function(path, env) {
-  withr::defer(pkgload::unload(basename(path), quiet = TRUE), envir = env)
+  defer(pkgload::unload(basename(path), quiet = TRUE), frame = env)
   pkgload::load_all(path, export_all = FALSE, quiet = TRUE)
 }
 

R/zzz.R

@@ -4,10 +4,24 @@
     bibs <- rmarkdown::metadata$bibliography
     set(render = TRUE, bibliography = bibs)
     bib_init()
-    terminate()
+    defer_knitr(bib_write())
   }
 }
 
-terminate <- function() {
-  withr::defer(bib_write(), envir = parent.frame(5L))
+defer <- function(expr, frame = parent.frame()) {
+  thunk <- as.call(list(function() expr))
+  do.call(on.exit, list(thunk, TRUE, FALSE), envir = frame)
+}
+
+defer_knitr <- function(expr) {
+  defer(expr, knitr_exit_frame())
+}
+
+knitr_exit_frame <- function() {
+  ns <- asNamespace("knitr")
+  for (frame in as.list(sys.frames())) {
+    if (identical(topenv(frame), ns)) {
+      return(frame)
+    }
+  }
 }

tests/testthat/helper.R

@@ -1,5 +1,5 @@
 local_settings <- function(..., env = parent.frame()) {
-  withr::defer(reset(...names()), envir = env)
+  defer(reset(...names()), frame = env)
   pkrt_set(...)
 }
 

tests/testthat/test-pkrt.R

@@ -83,6 +83,23 @@ test_that("pakret handles references that have a premade key (#18)", {
   expect_match(res, "@Manual\\{baz,")
 })
 
+test_that("pakret works with modified frame stacks (#30)", {
+  template <- dedent("
+    ---
+    bibliography: %s
+    ---
+    ```{r}
+    (function() library(pakret))()
+    pakret:::load_foo()
+    ```
+    `r pkrt('foo')`
+  ")
+  dir <- local_files(template)
+  res <- read_local_file(dir, target = "bib")
+
+  expect_match(res, "@Manual\\{foo,")
+})
+
 # errors
 
 test_that("pkrt() gives meaningful error messages", {