create get_j() and add to summarise()

R/step-subset-summarise.R

@@ -43,7 +43,7 @@ summarise.dtplyr_step <- function(.data, ..., .by = NULL, .groups = NULL) {
     out <- step_subset_j(
       .data,
       vars = union(group_vars, names(dots)),
-      j = call2(".", !!!dots),
+      j = get_j(dots),
       by = by
     )
   }

R/tidyeval.R

@@ -75,6 +75,24 @@ capture_dot <- function(.data, x, j = TRUE) {
   dt_squash(enquo(x), data = .data, j = j)
 }
 
+get_j <- function(dots) {
+  dot_is_data_frame_call <- map_lgl(dots, is_data_frame_call)
+
+  if (!any(dot_is_data_frame_call)) {
+    return(call2('.', !!!dots))
+  }
+  if (length(dots) == 1) {
+    return(dots[[1]])
+  }
+
+  names(dots)[dot_is_data_frame_call] <- ""
+  dots[!dot_is_data_frame_call] <- lapply(dots[!dot_is_data_frame_call], function(x) {
+    call2('list', x)
+  })
+  j <- call2(".", !!!dots)
+  call2("unlist", j, recursive = FALSE)
+}
+
 # squash quosures
 dt_squash <- function(x, env, data, j = TRUE, is_top = FALSE) {
   if (is_atomic(x) || is_null(x)) {
@@ -372,3 +390,16 @@ prep_case_match_dot <- function(dot, .x) {
   f_lhs(dot) <- lhs
   dot
 }
+
+is_data_frame_call <- function(dot) {
+  if (!is_call(dot)) {
+    return(FALSE)
+  }
+  is_call(dot, "as_tibble") ||
+  is_call(dot, "as.tibble") ||
+  is_call(dot, "as_tibble_row") ||
+  is_call(dot, "as.data.frame") ||
+  is_call(dot, "as.data.table") ||
+  is_call(dot, "tibble")
+}
+

tests/testthat/test-step-subset-summarise.R

@@ -140,3 +140,45 @@ test_that("can change group vars", {
     dt %>% summarise(across(a, ~ 2)), "Column `a` doesn't exist"
   )
 })
+
+test_that("data.frame()-ish calls get spliced", {
+
+  df <- lazy_dt(data.frame(a = 'a'))
+
+  one_dot <- df %>%
+    summarise(tibble::as_tibble_row(c(x = 1, y = 2)))
+  expect_identical(
+    collect(one_dot),
+    tibble(x = 1, y = 2)
+  )
+
+  two_dots <- df %>%
+    summarise(tibble::as_tibble_row(c(x = 1, y = 2)), z = 3)
+  expect_identical(
+    collect(two_dots),
+    tibble(x = 1, y = 2, z = 3)
+  )
+
+})
+
+test_that("data.frame()-ish calls get spliced - with grouped input", {
+
+  df <- lazy_dt(data.frame(a = 'a')) %>%
+    group_by(a)
+
+  one_dot <- df %>%
+    summarise(tibble::as_tibble_row(c(x = 1, y = 2)))
+  expect_identical(
+    collect(one_dot),
+    tibble(x = 1, y = 2)
+  )
+
+  two_dots <- df %>%
+    summarise(tibble::as_tibble_row(c(x = 1, y = 2)), z = 3)
+  expect_identical(
+    collect(two_dots),
+    tibble(x = 1, y = 2, z = 3)
+  )
+
+})
+