give the pattern a store

ropensci · Nov 7, 2024 · eb70a6d · eb70a6d
1 parent faa43ce
commit eb70a6d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/R/class_pattern.R b/R/class_pattern.R
@@ -1,10 +1,31 @@
+pattern_init <- function(
+  name = NULL,
+  command = NULL,
+  seed = NULL,
+  deps = NULL,
+  settings = NULL,
+  cue = NULL
+) {
+  pattern_new(
+    name = name,
+    command = command,
+    seed = seed,
+    deps = deps,
+    settings = settings,
+    cue = cue,
+    store = settings_produce_store(settings),
+    patternview = patternview_init()
+  )
+}
+
 pattern_new <- function(
   name = NULL,
   command = NULL,
   seed = NULL,
   deps = NULL,
   settings = NULL,
   cue = NULL,
+  store = NULL,
   patternview = NULL
 ) {
   out <- new.env(parent = emptyenv(), hash = FALSE)
@@ -14,6 +35,7 @@ pattern_new <- function(
   out$deps <- deps
   out$settings <- settings
   out$cue <- cue
+  out$store <- store
   out$patternview <- patternview
   enclass(out, pattern_s3_class)
 }
@@ -142,6 +164,7 @@ target_validate.tar_pattern <- function(target) {
   tar_assert_scalar(target$seed)
   tar_assert_none_na(target$seed)
   tar_assert_chr(target$deps)
+  store_validate(target$store)
   if (!is.null(target$junction)) {
     junction_validate(target$junction)
   }
@@ -229,7 +252,7 @@ pattern_set_branches <- function(target, pipeline) {
   deps_parent <- target$deps
   settings <- target$settings
   cue <- target$cue
-  store <- settings_produce_store(settings)
+  store <- target$store
   specs <- junction_transpose(target$junction)
   for (spec in specs) {
     branch <- branch_init(

diff --git a/R/class_target.R b/R/class_target.R
@@ -62,14 +62,13 @@ target_init <- function(
       settings = settings,
       cue = cue
     ),
-    pattern_new(
+    pattern_init(
       name = name,
       command = command,
       seed = seed,
       deps = deps,
       settings = settings,
-      cue = cue,
-      patternview = patternview_init()
+      cue = cue
     )
   )
 }