Rename trans arguments to transform

NEWS.md

@@ -1,5 +1,7 @@
 # ggplot2 (development version)
 
+* The `trans` argument in scales and secondary axes has been renamed to 
+  `transform`. The `trans` argument itself is deprecated (#5558).
 * When legend titles are larger than the legend, title justification extends
   to the placement of keys and labels (#1903).
 

R/axis-secondary.R

@@ -4,7 +4,9 @@
 #' secondary axis, positioned opposite of the primary axis. All secondary
 #' axes must be based on a one-to-one transformation of the primary axes.
 #'
-#' @param trans A formula or function of transformation
+#' @param transform A formula or function of transformation
+#'
+#' @param trans `r lifecycle::badge("deprecated")`
 #'
 #' @param name The name of the secondary axis
 #'
@@ -94,14 +96,20 @@
 #'   )
 #'
 #' @export
-sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels = waiver(),
-                     guide = waiver()) {
+sec_axis <- function(transform = NULL,
+                     name = waiver(), breaks = waiver(), labels = waiver(),
+                     guide = waiver(), trans = deprecated()) {
+  if (lifecycle::is_present(trans)) {
+    deprecate_soft0("3.5.0", "sec_axis(trans)", "sec_axis(transform)")
+    transform <- trans
+  }
+
   # sec_axis() historically accepted two-sided formula, so be permissive.
-  if (length(trans) > 2) trans <- trans[c(1,3)]
+  if (length(transform) > 2) transform <- transform[c(1,3)]
 
-  trans <- as_function(trans)
+  transform <- as_function(transform)
   ggproto(NULL, AxisSecondary,
-    trans = trans,
+    trans = transform,
     name = name,
     breaks = breaks,
     labels = labels,
@@ -111,8 +119,9 @@ sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels =
 #' @rdname sec_axis
 #'
 #' @export
-dup_axis <- function(trans = ~., name = derive(), breaks = derive(), labels = derive(), guide = derive()) {
-  sec_axis(trans, name, breaks, labels, guide)
+dup_axis <- function(transform = ~., trans = deprecated(),
+                     name = derive(), breaks = derive(), labels = derive(), guide = derive()) {
+  sec_axis(transform, trans = trans, name, breaks, labels, guide)
 }
 
 is.sec_axis <- function(x) {
@@ -169,7 +178,7 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
     }
     if (is.derived(self$name) && !is.waive(scale$name)) self$name <- scale$name
     if (is.derived(self$breaks)) self$breaks <- scale$breaks
-    if (is.waive(self$breaks)) self$breaks <- scale$trans$breaks
+    if (is.waive(self$breaks)) self$breaks <- scale$transformation$breaks
     if (is.derived(self$labels)) self$labels <- scale$labels
     if (is.derived(self$guide)) self$guide <- scale$guide
   },
@@ -186,8 +195,9 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
       return()
     }
 
+    transformation <- scale$transformation %||% scale$trans
     along_range <- seq(range[1], range[2], length.out = self$detail)
-    old_range <- scale$trans$inverse(along_range)
+    old_range <- transformation$inverse(along_range)
 
     # Create mapping between primary and secondary range
     full_range <- self$transform_range(old_range)
@@ -204,8 +214,9 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
     self$mono_test(scale)
 
     # Get scale's original range before transformation
+    transformation <- scale$transformation %||% scale$trans
     along_range <- seq(range[1], range[2], length.out = self$detail)
-    old_range <- scale$trans$inverse(along_range)
+    old_range <- transformation$inverse(along_range)
 
     # Create mapping between primary and secondary range
     full_range <- self$transform_range(old_range)
@@ -225,8 +236,8 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
 
     # patch for date and datetime scales just to maintain functionality
     # works only for linear secondary transforms that respect the time or date transform
-    if (scale$trans$name %in% c("date", "time")) {
-      temp_scale <- self$create_scale(new_range, trans = scale$trans)
+    if (transformation$name %in% c("date", "time")) {
+      temp_scale <- self$create_scale(new_range, trans = transformation)
       range_info <- temp_scale$break_info()
       old_val_trans <- rescale(range_info$major, from = c(0, 1), to = range)
       old_val_minor_trans <- rescale(range_info$minor, from = c(0, 1), to = range)
@@ -237,7 +248,7 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
       # Map the break values back to their correct position on the primary scale
       if (!is.null(range_info$major_source)) {
         old_val <- stats::approx(full_range, old_range, range_info$major_source)$y
-        old_val_trans <- scale$trans$transform(old_val)
+        old_val_trans <- transformation$transform(old_val)
 
         # rescale values from 0 to 1
         range_info$major[] <- round(
@@ -253,7 +264,7 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
 
       if (!is.null(range_info$minor_source)) {
         old_val_minor <- stats::approx(full_range, old_range, range_info$minor_source)$y
-        old_val_minor_trans <- scale$trans$transform(old_val_minor)
+        old_val_minor_trans <- transformation$transform(old_val_minor)
 
         range_info$minor[] <- round(
           rescale(
@@ -287,7 +298,7 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
                      labels = self$labels,
                      limits = range,
                      expand = c(0, 0),
-                     trans = trans
+                     transformation = trans
     )
     scale$train(range)
     scale

R/coord-transform.R

@@ -190,8 +190,8 @@ transform_value <- function(trans, value, range) {
 # TODO: can we merge this with view_scales_from_scale()?
 view_scales_from_scale_with_coord_trans <- function(scale, coord_limits, trans, expand = TRUE) {
   expansion <- default_expansion(scale, expand = expand)
-  scale_trans <- scale$trans %||% transform_identity()
-  coord_limits <- coord_limits %||% scale_trans$inverse(c(NA, NA))
+  transformation <- scale$transformation %||% scale$trans %||% transform_identity()
+  coord_limits <- coord_limits %||% transformation$inverse(c(NA, NA))
   scale_limits <- scale$get_limits()
 
   if (scale$is_discrete()) {
@@ -204,7 +204,7 @@ view_scales_from_scale_with_coord_trans <- function(scale, coord_limits, trans,
     )
   } else {
     # transform user-specified limits to scale transformed space
-    coord_limits <- scale$trans$transform(coord_limits)
+    coord_limits <- transformation$transform(coord_limits)
     continuous_ranges <- expand_limits_continuous_trans(
       scale_limits,
       expansion,

R/fortify-multcomp.R

@@ -22,7 +22,7 @@
 #' ggplot(mapping = aes(lhs, estimate)) +
 #'    geom_linerange(aes(ymin = lwr, ymax = upr), data = CI) +
 #'    geom_point(aes(size = p), data = summary(wht)) +
-#'    scale_size(trans = "reverse")
+#'    scale_size(transform = "reverse")
 #'
 #' cld <- cld(wht)
 #' fortify(cld)

R/guide-axis-logticks.R

@@ -55,7 +55,7 @@ NULL
 #'   geom_density() +
 #'   scale_x_continuous(
 #'     breaks = c(-10^(4:0), 0, 10^(0:4)),
-#'     trans = "pseudo_log"
+#'     transform = "pseudo_log"
 #'   )
 #'
 #' # The log ticks are mirrored when 0 is included
@@ -147,20 +147,20 @@ GuideAxisLogticks <- ggproto(
 
     # Reconstruct a transformation if user has prescaled data
     if (!is.null(params$prescale_base)) {
-      trans_name <- scale$scale$trans$name
+      trans_name <- scale$scale$transformation$name
       if (trans_name != "identity") {
         cli::cli_warn(paste0(
           "The {.arg prescale_base} argument will override the scale's ",
           "{.field {trans_name}} transformation in log-tick positioning."
         ))
       }
-      trans <- transform_log(base = params$prescale_base)
+      transformation <- transform_log(base = params$prescale_base)
     } else {
-      trans <- scale$scale$trans
+      transformation <- scale$scale$transformation %||% scale$scale$trans
     }
 
     # Reconstruct original range
-    limits <- trans$inverse(scale$get_limits())
+    limits <- transformation$inverse(scale$get_limits())
     has_negatives <- any(limits <= 0)
 
     if (!has_negatives) {
@@ -188,7 +188,7 @@ GuideAxisLogticks <- ggproto(
     }
 
     # Set ticks back into transformed space
-    ticks  <- trans$transform(c(tens, fives, ones))
+    ticks  <- transformation$transform(c(tens, fives, ones))
     nticks <- c(length(tens), length(fives), length(ones))
 
     logkey <- data_frame0(

R/limits.R

@@ -122,7 +122,7 @@ limits.numeric <- function(lims, var, call = caller_env()) {
     trans <- "identity"
   }
 
-  make_scale("continuous", var, limits = lims, trans = trans, call = call)
+  make_scale("continuous", var, limits = lims, transform = trans, call = call)
 }
 
 make_scale <- function(type, var, ..., call = NULL) {