Improve .data and .env translation

Fixes #138

NEWS.md

@@ -1,5 +1,7 @@
 # dtplyr (development version)
 
+* Better handling for `.data` and `.env` pronouns (#138).
+
 * dplyr verbs now work with `NULL` inputs (#129).
 
 * `lazy_dt()` objects now have a useful `glimpse()` method (#132).

R/step.R

@@ -117,7 +117,9 @@ as.data.frame.dtplyr_step <- function(x, ...) {
 #' @export
 #' @importFrom tibble as_tibble
 as_tibble.dtplyr_step <- function(x, ...) {
- as_tibble(dt_eval(x))
+ out <- as_tibble(dt_eval(x))
+ attr(out, ".internal.selfref") <- NULL
+ out
 }
 
 #' @export

R/tidyeval.R

@@ -59,6 +59,20 @@ dt_squash <- function(x, env, vars, j = TRUE) {
  } else if (is_quosure(x)) {
  dt_squash(get_expr(x), get_env(x), vars = vars, j = j)
  } else if (is_call(x)) {
+ # Handle .env and .data
+ if (is_call(x, c("$", "[["), n = 2)) {
+ var <- x[[3]]
+ if (is_call(x, "[[")) {
+ var <- sym(eval(var, env))
+ }
+
+ if (is_symbol(x[[2]], ".data")) {
+ return(var)
+ } else if (is_symbol(x[[2]], ".env")) {
+ return(sym(paste0("..", var)))
+ }
+ }
+
  if (is_call(x, "n", n = 0)) {
  quote(.N)
  } else if (is_call(x, "row_number", n = 0)) {

tests/testthat/test-tidyeval.R

@@ -58,6 +58,18 @@ test_that("can access functions in local env", {
  expect_equal(dt %>% summarise(n = f()) %>% pull(), 100)
 })
 
+test_that("can disambiguate using .data and .env", {
+ dt <- lazy_dt(data.frame(x = 1))
+ x <- 2
+
+ out <- dt %>% summarise(data = .data$x, env = .env$x) %>% as_tibble()
+ expect_equal(out, tibble(data = 1, env = 2))
+
+ var <- "x"
+ out <- dt %>% summarise(data = .data[[var]], env = .env[[var]]) %>% collect()
+ expect_equal(out, tibble(data = 1, env = 2))
+})
+
 # dplyr verbs -------------------------------------------------------------
 
 test_that("n() is equivalent to .N", {