Compatiblity with ropensci/targets#1368

NAMESPACE

@@ -210,6 +210,7 @@ importFrom(targets,tar_format)
 importFrom(targets,tar_group)
 importFrom(targets,tar_load)
 importFrom(targets,tar_meta)
+importFrom(targets,tar_name)
 importFrom(targets,tar_option_get)
 importFrom(targets,tar_option_set)
 importFrom(targets,tar_path_target)

R/tar_force.R

@@ -100,7 +100,7 @@ tar_force <- function(
 #' @param condition Logical, whether to run the downstream target
 #'   in [tar_force()].
 tar_force_change <- function(condition) {
-  name <- targets::tar_definition()$settings$name
+  name <- targets::tar_name()
   store <- targets::tar_runtime_object()$store
   path <- targets::tar_path_target(name = name, store = store)
   new <- basename(tempfile(pattern = ""))

R/tar_map2_raw.R

@@ -227,9 +227,9 @@ tar_map2_run <- function(command, values, columns, rep_workers) {
   columns <- substitute(columns)
   columns <- targets::tar_tidyselect_eval(columns, colnames(values))
   splits <- split(values, f = seq_len(nrow(values)))
-  pedigree <- targets::tar_definition()$pedigree
-  name <- pedigree$parent
-  batch <- pedigree$index
+  target <- targets::tar_definition()
+  name <- target$pedigree$parent %|||% target$settings$name
+  batch <- target$pedigree$index %|||% target$index
   reps <- length(splits)
   seeds <- produce_batch_seeds(name = name, batch = batch, reps = reps)
   envir <- targets::tar_envir()

R/tar_package.R

@@ -28,7 +28,7 @@
 #'   tar_assert_true tar_assert_unique tar_assert_unique_targets
 #'   tar_cue tar_definition tar_deparse_language tar_deparse_safe
 #'   tar_dir tar_envir tar_exist_meta tar_format tar_group tar_load tar_meta
-#'   tar_option_get tar_option_set tar_path_target tar_read
+#'   tar_name tar_option_get tar_option_set tar_path_target tar_read
 #'   tar_runtime_object tar_script tar_seed_create tar_seed_set
 #'   tar_target tar_target_raw tar_test tar_tidy_eval
 #'   tar_throw_validate tar_warn_deprecate tar_warn_validate

R/tar_quarto_files.R

@@ -6,8 +6,8 @@
 #'   of `quarto::quarto_inspect()` and returns what `tarchetypes` needs to
 #'   know about the current Quarto project or document.
 #' @return A named list of important file paths in a Quarto project or document:
-#'   * `sources`: source files with `tar_load()`/`tar_read()`
-#'     target dependencies in R code chunks.
+#'   * `sources`: source files which may reference upstream target
+#'     dependencies in code chunks using `tar_load()`/`tar_read()`.
 #'   * `output`: output files that will be generated during
 #'     `quarto::quarto_render()`.
 #'   * `input`: pre-existing files required to render the project or document,

R/tar_quarto_rep_raw.R

@@ -347,9 +347,9 @@ tar_quarto_rep_run <- function(
     }
   )
   fun <- eval(call, envir = targets::tar_option_get("envir"))
-  pedigree <- targets::tar_definition()$pedigree
-  name <- pedigree$parent
-  batch <- pedigree$index
+  target <- targets::tar_definition()
+  name <- target$pedigree$parent %|||% target$settings$name
+  batch <- target$pedigree$index %|||% target$index
   reps <- length(execute_params)
   seeds <- produce_batch_seeds(name = name, batch = batch, reps = reps)
   if (rep_workers > 1L) {

R/tar_render_rep_raw.R

@@ -203,9 +203,9 @@ tar_render_rep_run <- function(path, params, args, deps, rep_workers) {
     }
   )
   fun <- eval(call, envir = targets::tar_option_get("envir"))
-  pedigree <- targets::tar_definition()$pedigree
-  name <- pedigree$parent
-  batch <- pedigree$index
+  target <- targets::tar_definition()
+  name <- target$pedigree$parent %|||% target$settings$name
+  batch <- target$pedigree$index %|||% target$index
   reps <- length(params)
   seeds <- produce_batch_seeds(name = name, batch = batch, reps = reps)
   if (rep_workers > 1L) {

R/tar_rep2_raw.R

@@ -90,9 +90,9 @@ tar_rep2_run <- function(command, batches, iteration, rep_workers) {
   names(batches) <- names
   assert_batches(batches)
   reps <- batch_count_reps(batches[[1]])
-  pedigree <- targets::tar_definition()$pedigree
-  name <- pedigree$parent
-  batch <- pedigree$index
+  target <- targets::tar_definition()
+  name <- target$pedigree$parent %|||% target$settings$name
+  batch <- target$pedigree$index %|||% target$index
   seeds <- produce_batch_seeds(name = name, batch = batch, reps = reps)
   envir <- targets::tar_envir()
   slices <- split_batches(batches = batches, reps = reps)

R/tar_rep_raw.R

@@ -227,7 +227,8 @@ tar_rep_run_map <- function(expr, batch, reps, rep_workers) {
     }
   )
   fun <- eval(call, envir = targets::tar_option_get("envir"))
-  name <- targets::tar_definition()$pedigree$parent
+  target <- targets::tar_definition()
+  name <- target$pedigree$parent %|||% target$settings$name
   seeds <- produce_batch_seeds(name = name, batch = batch, reps = reps)
   envir <- targets::tar_envir()
   if (rep_workers > 1L) {

R/utils_targets.R

@@ -11,7 +11,7 @@ tar_copy_target <- function(target) {
     pattern = target$settings$pattern,
     packages = target$command$packages,
     library = target$command$library,
-    deps = target$command$deps,
+    deps = target$command$deps %|||% target$deps,
     string = target$command$string,
     format = target$settings$format,
     repository = target$settings$repository,
@@ -43,9 +43,14 @@ tar_replace_command <- function(target, expr, set_deps) {
     packages = target$command$packages,
     library = target$command$library,
     pattern = target$settings$pattern,
-    deps = if_any(set_deps, NULL, target$command$deps)
+    deps = if_any(
+      set_deps,
+      NULL,
+      target$command$deps %|||% target$deps
+    )
   )
   target$command <- pilot$command
+  target$deps <- pilot$deps
   invisible()
 }