need to fix pipe

DESCRIPTION

@@ -23,14 +23,14 @@ Imports:
     dplyr,
     ggplot2,
     maybe,
+    purrr,
     rlang,
     stringr,
     tibble,
     utils
 Suggests: 
     knitr,
     lubridate,
-    purrr,
     rmarkdown,
     testthat (>= 3.0.0),
     tidyr

R/pipe.R

@@ -24,10 +24,10 @@
   expr_ls <- as.list(q_ex_std)
 
   # need to set .value to empty, if not .value will be matched multiple times in call2
-  names(expr_ls)[names(expr_ls) == ".value"] <- ""
+  names(expr_ls)[names(expr_ls) == "..1"] <- ""
 
   rlang::eval_tidy(rlang::call2(f,
-                                .value = maybe::from_maybe(.c$value, default = maybe::nothing()),
+                                ..1 = maybe::from_maybe(.c$value, default = maybe::nothing()),
                                 !!!expr_ls[-1],
                                 .log_df = .c$log_df))
 

R/purely.R

@@ -17,21 +17,21 @@
 #' @export
 purely <- function(.f, strict = 2){
 
-  function(.value, ..., .log_df = "Log start..."){
-
-    if(maybe::is_nothing(.value)){
-
-      final_result <- list(
-        value = maybe::nothing(),
-        log_df = "A `Nothing` was given as input."
-      )
-
+  function(..., .log_df = "Log start..."){
+
+    if(any(purrr::map_lgl(list(...), maybe::is_nothing))){
+    
+          final_result <- list(
+            value = maybe::nothing(),
+            log_df = "A `Nothing` was given as input."
+          )
+    
     } else {
 
       res <- switch(strict,
-                    only_errors(.f, .value,  ...),
-                    errors_and_warnings(.f, .value, ...),
-                    errs_warn_mess(.f, .value, ...))
+                    only_errors(.f, ...),
+                    errors_and_warnings(.f, ...),
+                    errs_warn_mess(.f, ...))
 
       final_result <- list(
         value = NULL,

R/record.R

@@ -29,16 +29,17 @@ record <- function(.f, .g = (\(x) NA), strict = 2, diff = "none"){
 
   fstring <- deparse1(substitute(.f))
 
-  function(.value, ..., .log_df = data.frame()){
+  function(..., .log_df = data.frame()){
 
     args <- paste0(rlang::enexprs(...), collapse = ",")
 
     start <- Sys.time()
     pure_f <- purely(.f, strict = strict)
-    res_pure <- (pure_f(.value, ...))
+    res_pure <- (pure_f(...))
     end <- Sys.time()
 
-    input <- .value
+    input <- "hu"
+    #input <- .value
     output <- maybe::from_maybe(res_pure$value, default = maybe::nothing())
     diff_obj <- switch(diff,
                        "none" = NULL,

dev/0-dev_history.Rmd

@@ -167,6 +167,15 @@ fusen::inflate(
        )
 ```
 
+```{r}
+fusen::inflate(
+         flat_file = "dev/flat_named_args.Rmd",
+         vignette_name = NA,
+         overwrite = TRUE,
+         check = FALSE
+       )
+```
+
 ```{r}
 fusen::inflate(
          flat_file = "dev/flat_ggplot.Rmd",

dev/config_fusen.yaml

@@ -63,6 +63,19 @@ flat_ggplot.Rmd:
     check: false
     document: true
     overwrite: 'yes'
+flat_named_args.Rmd:
+  path: dev/flat_named_args.Rmd
+  state: active
+  R: []
+  tests: tests/testthat/test-named_args.R
+  vignettes: []
+  inflate:
+    flat_file: dev/flat_named_args.Rmd
+    vignette_name: .na
+    open_vignette: true
+    check: false
+    document: true
+    overwrite: 'yes'
 flat_pipe.Rmd:
   path: dev/flat_pipe.Rmd
   state: active

dev/flat_chronicle.Rmd

@@ -43,16 +43,17 @@ record <- function(.f, .g = (\(x) NA), strict = 2, diff = "none"){
 
   fstring <- deparse1(substitute(.f))
 
-  function(.value, ..., .log_df = data.frame()){
+  function(..., .log_df = data.frame()){
 
     args <- paste0(rlang::enexprs(...), collapse = ",")
 
     start <- Sys.time()
     pure_f <- purely(.f, strict = strict)
-    res_pure <- (pure_f(.value, ...))
+    res_pure <- (pure_f(...))
     end <- Sys.time()
 
-    input <- .value
+    input <- "hu"
+    #input <- .value
     output <- maybe::from_maybe(res_pure$value, default = maybe::nothing())
     diff_obj <- switch(diff,
                        "none" = NULL,

dev/flat_named_args.Rmd

@@ -0,0 +1,75 @@
+---
+title: "Named args tests"
+output: html_document
+editor_options: 
+  chunk_output_type: console
+---
+
+```{r development, include=FALSE}
+library(testthat)
+```
+
+This vignette is only for defining some tests.
+
+
+```{r tests-purely_decorated_args, filename = "named_args.R"}
+test_that("purely decorated function with named args works", {
+
+  pmean <- purely(mean)
+
+  arg <- c(1, 2, 3)
+
+  expect_equal(pmean(arg), pmean(x = arg))
+
+})
+
+
+test_that("purely decorated function, we can name many arguments", {
+
+  soma <- function(x, y){
+
+    res <- x+y
+  
+    return(res)
+  }
+  
+  psoma <- purely(soma)
+  
+  expect_equal(psoma(2, 6), psoma(2, y = 6))
+
+  expect_equal(psoma(2, 6), psoma(x = 2, y = 6))
+  
+})
+
+```
+
+```{r tests-record_decorated_args, filename = "named_args.R"}
+test_that("record decorated function with named args works", {
+
+  rmean <- record(mean)
+
+  arg <- c(1, 2, 3)
+
+  expect_equal(rmean(arg)$value, rmean(x = arg)$value)
+
+})
+
+
+test_that("record decorated function, we can name many arguments", {
+
+  soma <- function(x, y){
+
+    res <- x+y
+  
+    return(res)
+  }
+  
+  rsoma <- record(soma)
+  
+  expect_equal(rsoma(2, 6)$value, rsoma(2, y = 6)$value)
+
+  expect_equal(rsoma(2, 6)$value, rsoma(x = 2, y = 6)$value)
+    
+})
+
+```

dev/flat_pipe.Rmd

@@ -28,12 +28,13 @@ editor_options:
 
   q_ex_std <- rlang::call_match(call = f_exp, fn = f)
   expr_ls <- as.list(q_ex_std)
+  browser()
 
   # need to set .value to empty, if not .value will be matched multiple times in call2
-  names(expr_ls)[names(expr_ls) == ".value"] <- ""
+  #names(expr_ls)[names(expr_ls) == "..1"] <- ""
 
   rlang::eval_tidy(rlang::call2(f,
-                                .value = maybe::from_maybe(.c$value, default = maybe::nothing()),
+                                ..1 = maybe::from_maybe(.c$value, default = maybe::nothing()),
                                 !!!expr_ls[-1],
                                 .log_df = .c$log_df))
 

tests/testthat/test-named_args.R

@@ -0,0 +1,59 @@
+# WARNING - Generated by {fusen} from dev/flat_named_args.Rmd: do not edit by hand
+
+test_that("purely decorated function with named args works", {
+
+  pmean <- purely(mean)
+
+  arg <- c(1, 2, 3)
+
+  expect_equal(pmean(arg), pmean(x = arg))
+
+})
+
+
+test_that("purely decorated function, we can name many arguments", {
+
+  soma <- function(x, y){
+
+    res <- x+y
+
+    return(res)
+  }
+
+  psoma <- purely(soma)
+
+  expect_equal(psoma(2, 6), psoma(2, y = 6))
+
+  expect_equal(psoma(2, 6), psoma(x = 2, y = 6))
+
+})
+
+
+test_that("record decorated function with named args works", {
+
+  rmean <- record(mean)
+
+  arg <- c(1, 2, 3)
+
+  expect_equal(rmean(arg)$value, rmean(x = arg)$value)
+
+})
+
+
+test_that("record decorated function, we can name many arguments", {
+
+  soma <- function(x, y){
+
+    res <- x+y
+
+    return(res)
+  }
+
+  rsoma <- record(soma)
+
+  expect_equal(rsoma(2, 6)$value, rsoma(2, y = 6)$value)
+
+  expect_equal(rsoma(2, 6)$value, rsoma(x = 2, y = 6)$value)
+
+})
+