mechanism to hide internal variables

Author: teunbrand

R/make-constructor.R

@@ -44,7 +44,8 @@ make_constructor <- function(x, ...) {
 
 #' @export
 #' @rdname make_constructor
-make_constructor.Geom <- function(x, ..., checks = exprs(), env = caller_env()) {
+make_constructor.Geom <- function(x, ..., checks = exprs(), omit = character(),
+                                  env = caller_env()) {
 
   # Check that we can independently find the geom
   geom <- gsub("^geom_", "", snake_class(x))
@@ -61,7 +62,7 @@ make_constructor.Geom <- function(x, ..., checks = exprs(), env = caller_env())
 
   # Fill in values for parameters from draw functions
   known_params <-
-    unique(c(names(args), fixed_fmls_names, "flipped_aes", x$aesthetics()))
+    unique(c(names(args), fixed_fmls_names, "flipped_aes", x$aesthetics(), omit))
   missing_params <- setdiff(x$parameters(), known_params)
   if (length(missing_params) > 0) {
     draw_args <- ggproto_formals(x$draw_panel)
@@ -128,7 +129,8 @@ make_constructor.Geom <- function(x, ..., checks = exprs(), env = caller_env())
 
 #' @export
 #' @rdname make_constructor
-make_constructor.Stat <- function(x, ..., checks = exprs(), env = caller_env()) {
+make_constructor.Stat <- function(x, ..., checks = exprs(), omit = character(),
+                                  env = caller_env()) {
   # Check that we can independently find the stat
   stat <- gsub("^stat_", "", snake_class(x))
   check_subclass(stat, "Stat", env = env)
@@ -143,7 +145,7 @@ make_constructor.Stat <- function(x, ..., checks = exprs(), env = caller_env())
   }
 
   known_params <-
-    unique(c(names(args), fixed_fmls_names, "flipped_aes", x$aesthetics()))
+    unique(c(names(args), fixed_fmls_names, "flipped_aes", x$aesthetics(), omit))
   missing_params <- setdiff(x$parameters(), known_params)
 
   # Fill in missing parameters from the compute methods

R/stat-align.R

@@ -82,5 +82,5 @@ StatAlign <- ggproto(
 #' @rdname geom_ribbon
 stat_align <- make_constructor(
   StatAlign, geom = "area",
-  exclude = c("unique_loc", "adjust")
+  omit = c("unique_loc", "adjust")
 )

R/stat-bin2d.R

@@ -57,7 +57,10 @@ StatBin2d <- ggproto(
 #'   ncount   = "count, scaled to maximum of 1.",
 #'   ndensity = "density, scaled to a maximum of 1."
 #' )
-stat_bin_2d <- make_constructor(StatBin2d, geom = "tile")
+stat_bin_2d <- make_constructor(
+  StatBin2d, geom = "tile",
+  omit = c("breaks", "origin")
+)
 
 #' @export
 #' @rdname geom_bin_2d

R/stat-boxplot.R

@@ -108,5 +108,5 @@ StatBoxplot <- ggproto("StatBoxplot", Stat,
 #' )
 stat_boxplot <- make_constructor(
   StatBoxplot, geom = "boxplot", position = "dodge2",
-  orientation = NA
+  orientation = NA, omit = "width"
 )

R/stat-contour.R

@@ -100,11 +100,17 @@ StatContourFilled <- ggproto(
 #'
 #'
 #' @rdname geom_contour
-stat_contour <- make_constructor(StatContour, geom = "contour")
+stat_contour <- make_constructor(
+  StatContour, geom = "contour",
+  omit = "z.range"
+)
 
 #' @rdname geom_contour
 #' @export
-stat_contour_filled <- make_constructor(StatContourFilled, geom = "contour_filled")
+stat_contour_filled <- make_constructor(
+  StatContourFilled, geom = "contour_filled",
+  omit = "z.range"
+)
 
 #' Calculate the breaks used for contouring
 #'

R/stat-count.R

@@ -66,5 +66,5 @@ StatCount <- ggproto(
 #' @rdname geom_bar
 stat_count <- make_constructor(
   StatCount, geom = "bar", position = "stack",
-  orientation = NA
+  orientation = NA, omit = "width"
 )

R/stat-density.R

@@ -76,7 +76,10 @@ StatDensity <- ggproto(
 #' )
 #' @export
 #' @rdname geom_density
-stat_density <- make_constructor(StatDensity, geom = "area", position = "stack")
+stat_density <- make_constructor(
+  StatDensity, geom = "area", position = "stack",
+  orientation = NA
+)
 
 compute_density <- function(x, w, from, to, bw = "nrd0", adjust = 1,
                             kernel = "gaussian", n = 512,

R/stat-qq-line.R

@@ -56,7 +56,7 @@ StatQqLine <- ggproto(
 #' defaults to `c(.25, .75)`.
 #' @param fullrange Should the q-q line span the full range of the plot, or just
 #'   the data
-geom_qq_line <- make_constructor(StatQqLine, geom = "path")
+geom_qq_line <- make_constructor(StatQqLine, geom = "path", omit = "quantiles")
 
 #' @export
 #' @rdname geom_qq

R/stat-quantilemethods.R

@@ -73,7 +73,10 @@ StatQuantile <- ggproto(
 #' )
 #' @export
 #' @rdname geom_quantile
-stat_quantile <- make_constructor(StatQuantile, geom = "quantile")
+stat_quantile <- make_constructor(
+  StatQuantile, geom = "quantile",
+  omit = c("xseq", "lambda")
+)
 
 quant_pred <- function(quantile, data, method, formula, weight, grid,
                        method.args = method.args) {

R/stat-smooth.R

@@ -174,7 +174,7 @@ StatSmooth <- ggproto(
 #' )
 #' @export
 #' @rdname geom_smooth
-stat_smooth <- make_constructor(StatSmooth, geom = "smooth")
+stat_smooth <- make_constructor(StatSmooth, geom = "smooth", orientation = NA)
 
 # This function exists to silence an undeclared import warning
 gam_method <- function() {