Merge pull request #614 from yjunechoe/create_agent-base-pipe

Truncate long auto-generated `tbl_name`s

Author: yjunechoe

NEWS.md

@@ -1,5 +1,7 @@
 # pointblank (development version)
 
+- Bugfix agents auto-generating a table label that was too long. They now get truncated (#614)
+
 - Bugfix agents not searching the formula environment when materializing `~ tbl` (#599)
 
 - `info_columns()` warn more informatively when no columns are selected (#589).

R/create_agent.R

@@ -507,13 +507,16 @@ create_agent <- function(
 
   # Try to infer the table name if one isn't
   # explicitly given in `tbl_name`
-  if (!is.null(tbl) && is.null(tbl_name)) {
-    tbl_name <- deparse(match.call()$tbl)
-    if (tbl_name[1] == ".") {
-      tbl_name <- NA_character_
+  if (is.null(tbl_name) && !missing(tbl)) {
+    tbl_expr <- rlang::enexpr(tbl)
+    tbl_name <- paste0(deparse(tbl_expr), collapse = " ")
+    # truncate tbl expr that exceeds `deparse()` width (#613)
+    if (nchar(tbl_name) > 60) {
+      tbl_name <- truncate_expr(tbl_expr)
     }
   }
-  if (is.null(tbl_name)) {
+  # ignore empty or magrittr pipe
+  if (is.null(tbl) || tbl_name == ".") {
     tbl_name <- NA_character_
   }
 

R/utils.R

@@ -1740,3 +1740,12 @@ string_is_valid_symbol <- function(x) {
   rlang::is_scalar_character(x) &&
     identical(make.names(x), x)
 }
+
+truncate_expr <- function(x) {
+  if (rlang::is_symbol(x)) {
+    rlang::expr_deparse(x)
+  } else {
+    truncated <- rlang::call2(x[[1]], quote(...))
+    rlang::expr_deparse(truncated)
+  }
+}

tests/testthat/test-create_agent.R

@@ -169,3 +169,35 @@ test_that("`agent` can materialize table from formula environment", {
   expect_identical(agent$tbl, data.frame(x = 1))
 
 })
+
+test_that("truncate long auto-generated `tbl_name`s", {
+
+  # Isue #613 (can't use base pipe in test but this is equivalent)
+  expect_identical(
+    create_agent(data.frame(
+      a = c(1, 2, 3), b = c(1, 2, 3), c = c(1, 2, 3), d = c(1, 2, 3)
+    )) %>%
+      el("tbl_name"),
+    "data.frame(...)"
+  )
+  expect_identical(
+    create_agent(data.frame(a = c(1, 2, 3), b = 4:6)) %>%
+      el("tbl_name"),
+    "data.frame(a = c(1, 2, 3), b = 4:6)"
+  )
+
+  # Same treatment for formulas
+  expect_identical(
+    create_agent(~ data.frame(
+      a = c(1, 2, 3), b = c(1, 2, 3), c = c(1, 2, 3), d = c(1, 2, 3)
+    )) %>%
+      el("tbl_name"),
+    "~..."
+  )
+  expect_identical(
+    create_agent(~ data.frame(a = c(1, 2, 3), b = 4:6)) %>%
+      el("tbl_name"),
+    "~data.frame(a = c(1, 2, 3), b = 4:6)"
+  )
+
+})