remove/replace wrap_as_facets_list() (by compact_facets()

Author: teunbrand

R/facet-.R

@@ -455,10 +455,9 @@ validate_facets <- function(x) {
   x
 }
 
-
 # Flatten a list of quosures objects to a quosures object, and compact it
 compact_facets <- function(x) {
-
+  x <- as_facets_list(x)
   proxy   <- vec_proxy(x)
   is_list <- vapply(proxy, vec_is_list, logical(1))
   proxy[is_list]  <- lapply(proxy[is_list],  unclass)

R/facet-grid-.R

@@ -219,8 +219,8 @@ grid_as_facets_list <- function(rows, cols) {
   check_object(cols, is_quosures, "a {.fn vars} specification", allow_null = TRUE)
 
   list(
-    rows = compact_facets(as_facets_list(rows)),
-    cols = compact_facets(as_facets_list(cols))
+    rows = compact_facets(rows),
+    cols = compact_facets(cols)
   )
 }
 

R/facet-wrap.R

@@ -147,7 +147,7 @@ facet_wrap <- function(facets, nrow = NULL, ncol = NULL, scales = "fixed",
   labeller <- check_labeller(labeller)
 
   # Flatten all facets dimensions into a single one
-  facets <- wrap_as_facets_list(facets)
+  facets <- compact_facets(facets)
 
   if (lifecycle::is_present(switch) && !is.null(switch)) {
     deprecate_warn0("2.2.0", "facet_wrap(switch)", "facet_wrap(strip.position)")
@@ -182,12 +182,6 @@ facet_wrap <- function(facets, nrow = NULL, ncol = NULL, scales = "fixed",
   )
 }
 
-# Returns a quosures object
-wrap_as_facets_list <- function(x) {
-  facets_list <- as_facets_list(x)
-  compact_facets(facets_list)
-}
-
 #' @rdname ggplot2-ggproto
 #' @format NULL
 #' @usage NULL

tests/testthat/test-facet-.R

@@ -21,7 +21,7 @@ test_that("as_facets_list() coerces character vectors", {
 
   expect_identical(as_facets_list("foo"), list(foobar[1]))
   expect_identical(as_facets_list(c("foo", "bar")), list(foobar[1], foobar[2]))
-  expect_identical(wrap_as_facets_list(c("foo", "bar")), foobar)
+  expect_identical(compact_facets(c("foo", "bar")), foobar)
 })
 
 test_that("as_facets_list() coerces lists", {
@@ -47,12 +47,12 @@ test_that("facets reject aes()", {
   expect_error(facet_grid(aes(foo)), "Please use `vars()` to supply facet variables", fixed = TRUE)
 })
 
-test_that("wrap_as_facets_list() returns a quosures object with compacted", {
-  expect_identical(wrap_as_facets_list(vars(foo)), quos(foo = foo))
-  expect_identical(wrap_as_facets_list(~foo + bar), quos(foo = foo, bar = bar))
+test_that("compact_facets() returns a quosures object with compacted", {
+  expect_identical(compact_facets(vars(foo)), quos(foo = foo))
+  expect_identical(compact_facets(~foo + bar), quos(foo = foo, bar = bar))
 
   f <- function(x) {
-    expect_identical(wrap_as_facets_list(vars(foo, {{ x }}, bar)), quos(foo = foo, bar = bar))
+    expect_identical(compact_facets(vars(foo, {{ x }}, bar)), quos(foo = foo, bar = bar))
   }
 
   f(NULL)
@@ -71,12 +71,12 @@ test_that("grid_as_facets_list() returns a list of quosures objects with compact
   f()
 })
 
-test_that("wrap_as_facets_list() and grid_as_facets_list() accept empty specs", {
-  expect_identical(wrap_as_facets_list(NULL), quos())
-  expect_identical(wrap_as_facets_list(list()), quos())
-  expect_identical(wrap_as_facets_list(. ~ .), quos())
-  expect_identical(wrap_as_facets_list(list(. ~ .)), quos())
-  expect_identical(wrap_as_facets_list(list(NULL)), quos())
+test_that("compact_facets() and grid_as_facets_list() accept empty specs", {
+  expect_identical(compact_facets(NULL), quos())
+  expect_identical(compact_facets(list()), quos())
+  expect_identical(compact_facets(. ~ .), quos())
+  expect_identical(compact_facets(list(. ~ .)), quos())
+  expect_identical(compact_facets(list(NULL)), quos())
 
   expect_identical(grid_as_facets_list(list(), NULL), list(rows = quos(), cols = quos()))
   expect_identical(grid_as_facets_list(. ~ ., NULL), list(rows = quos(), cols = quos()))