unify mapping validation

Author: teunbrand

R/layer.R

@@ -209,7 +209,10 @@ validate_mapping <- function(mapping, call = caller_env()) {
   }
 
   if (!is_mapping(mapping)) {
-    msg <- "{.arg mapping} must be created by {.fn aes}."
+    msg <- c(
+      "{.arg mapping} must be created by {.fn aes}.",
+      "x" = "You've supplied {.obj_type_friendly {mapping}}."
+    )
     # Native pipe have higher precedence than + so any type of gg object can be
     # expected here, not just ggplot
     if (S7::S7_inherits(mapping, class_gg)) {

R/plot.R

@@ -116,11 +116,8 @@ ggplot <- function(
 ggplot.default <-
   function(data, mapping = aes(), ..., environment = parent.frame()) {
 
-  if (!missing(mapping) && !is_mapping(mapping)) {
-    cli::cli_abort(c(
-      "{.arg mapping} must be created with {.fn aes}.",
-      "x" = "You've supplied {.obj_type_friendly {mapping}}."
-    ))
+  if (!missing(mapping)) {
+    mapping <- validate_mapping(mapping)
   }
   if (missing(data)) {
     data <- NULL