condense classes

wlandau · wlandau · commit 56f617915a1c · 2024-11-01T11:05:25.000-04:00
diff --git a/R/class_resources_aws.R b/R/class_resources_aws.R
@@ -42,19 +42,20 @@ resources_aws_new <- function(
   verbose = TRUE,
   args = NULL
 ) {
-  force(bucket)
-  force(prefix)
-  force(region)
-  force(endpoint)
-  force(s3_force_path_style)
-  force(part_size)
-  force(page_size)
-  force(max_tries)
-  force(seconds_timeout)
-  force(close_connection)
-  force(verbose)
-  force(args)
-  enclass(environment(), c("tar_resources_aws", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$bucket <- bucket
+  out$prefix <- prefix
+  out$region <- region
+  out$endpoint <- endpoint
+  out$s3_force_path_style <- s3_force_path_style
+  out$part_size <- part_size
+  out$page_size <- page_size
+  out$max_tries <- max_tries
+  out$seconds_timeout <- seconds_timeout
+  out$close_connection <- close_connection
+  out$verbose <- verbose
+  out$args <- args
+  enclass(out, c("tar_resources_aws", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_clustermq.R b/R/class_resources_clustermq.R
@@ -9,8 +9,9 @@ resources_clustermq_init <- function(
 resources_clustermq_new <- function(
   template = NULL
 ) {
-  force(template)
-  enclass(environment(), c("tar_resources_clustermq", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$template <- template
+  enclass(out, c("tar_resources_clustermq", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_crew.R b/R/class_resources_crew.R
@@ -12,9 +12,10 @@ resources_crew_new <- function(
   controller = NULL,
   seconds_timeout = NULL
 ) {
-  force(controller)
-  force(seconds_timeout)
-  enclass(environment(), c("tar_resources_crew", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$controller <- controller
+  out$seconds_timeout <- seconds_timeout
+  enclass(out, c("tar_resources_crew", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_custom_format.R b/R/class_resources_custom_format.R
@@ -9,8 +9,9 @@ resources_custom_format_init <- function(
 resources_custom_format_new <- function(
   envvars = NULL
 ) {
-  force(envvars)
-  enclass(environment(), c("tar_resources_custom_format", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$envvars <- envvars
+  enclass(out, c("tar_resources_custom_format", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_feather.R b/R/class_resources_feather.R
@@ -12,9 +12,10 @@ resources_feather_new <- function(
   compression = NULL,
   compression_level = NULL
 ) {
-  force(compression)
-  force(compression_level)
-  enclass(environment(), c("tar_resources_feather", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$compression <- compression
+  out$compression_level <- compression_level
+  enclass(out, c("tar_resources_feather", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_fst.R b/R/class_resources_fst.R
@@ -9,8 +9,9 @@ resources_fst_init <- function(
 resources_fst_new <- function(
   compress = NULL
 ) {
-  force(compress)
-  enclass(environment(), c("tar_resources_fst", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$compress <- compress
+  enclass(out, c("tar_resources_fst", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_future.R b/R/class_resources_future.R
@@ -12,9 +12,10 @@ resources_future_new <- function(
   plan = NULL,
   resources = NULL
 ) {
-  force(plan)
-  force(resources)
-  enclass(environment(), c("tar_resources_future", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$plan <- plan
+  out$resources <- resources
+  enclass(out, c("tar_resources_future", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_gcp.R b/R/class_resources_gcp.R
@@ -21,12 +21,13 @@ resources_gcp_new <- function(
   max_tries = NULL,
   verbose = NULL
 ) {
-  force(bucket)
-  force(prefix)
-  force(predefined_acl)
-  force(max_tries)
-  force(verbose)
-  enclass(environment(), c("tar_resources_gcp", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$bucket <- bucket
+  out$prefix <- prefix
+  out$predefined_acl <- predefined_acl
+  out$max_tries <- max_tries
+  out$verbose <- verbose
+  enclass(out, c("tar_resources_gcp", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_network.R b/R/class_resources_network.R
@@ -18,11 +18,12 @@ resources_network_new <- function(
   max_tries = NULL,
   verbose = NULL
 ) {
-  force(seconds_interval)
-  force(seconds_timeout)
-  force(max_tries)
-  force(verbose)
-  enclass(environment(), c("tar_resources_network", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$seconds_interval <- seconds_interval
+  out$seconds_timeout <- seconds_timeout
+  out$max_tries <- max_tries
+  out$verbose <- verbose
+  enclass(out, c("tar_resources_network", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_parquet.R b/R/class_resources_parquet.R
@@ -12,9 +12,10 @@ resources_parquet_new <- function(
   compression = NULL,
   compression_level = NULL
 ) {
-  force(compression)
-  force(compression_level)
-  enclass(environment(), c("tar_resources_parquet", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$compression <- compression
+  out$compression_level <- compression_level
+  enclass(out, c("tar_resources_parquet", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_qs.R b/R/class_resources_qs.R
@@ -9,8 +9,9 @@ resources_qs_init <- function(
 resources_qs_new <- function(
   preset = NULL
 ) {
-  force(preset)
-  enclass(environment(), c("tar_resources_qs", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$preset <- preset
+  enclass(out, c("tar_resources_qs", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_repository_cas.R b/R/class_resources_repository_cas.R
@@ -9,8 +9,9 @@ resources_repository_cas_init <- function(
 resources_repository_cas_new <- function(
   envvars = NULL
 ) {
-  force(envvars)
-  enclass(environment(), c("tar_resources_repository_cas", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$envvars <- envvars
+  enclass(out, c("tar_resources_repository_cas", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_resources_url.R b/R/class_resources_url.R
@@ -18,11 +18,12 @@ resources_url_new <- function(
   seconds_interval = NULL,
   seconds_timeout = NULL
 ) {
-  force(handle)
-  force(max_tries)
-  force(seconds_interval)
-  force(seconds_timeout)
-  enclass(environment(), c("tar_resources_url", "tar_resources"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$handle <- handle
+  out$max_tries <- max_tries
+  out$seconds_interval <- seconds_interval
+  out$seconds_timeout <- seconds_timeout
+  enclass(out, c("tar_resources_url", "tar_resources"))
 }
 
 #' @export
diff --git a/R/class_runtime.R b/R/class_runtime.R
@@ -19,26 +19,27 @@ runtime_new <- function(
   number_targets_run = NULL,
   installed_packages = NULL
 ) {
-  force(target)
-  force(frames)
-  force(interactive)
-  force(script)
-  force(store)
-  force(working_directory)
-  force(fun)
-  force(gcp_auth)
-  force(file_exist)
-  force(file_info)
-  force(file_info_exist)
-  force(nanonext)
-  force(inventories)
-  force(traceback)
-  force(pid_parent)
-  force(file_systems)
-  force(trust_timestamps_store)
-  force(number_targets_run)
-  force(installed_packages)
-  environment()
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$target <- target
+  out$frames <- frames
+  out$interactive <- interactive
+  out$script <- script
+  out$store <- store
+  out$working_directory <- working_directory
+  out$fun <- fun
+  out$gcp_auth <- gcp_auth
+  out$file_exist <- file_exist
+  out$file_info <- file_info
+  out$file_info_exist <- file_info_exist
+  out$nanonext <- nanonext
+  out$inventories <- inventories
+  out$traceback <- traceback
+  out$pid_parent <- pid_parent
+  out$file_systems <- file_systems
+  out$trust_timestamps_store <- trust_timestamps_store
+  out$number_targets_run <- number_targets_run
+  out$installed_packages <- installed_packages
+  out
 }
 
 runtime_validate <- function(x) {
diff --git a/R/class_settings.R b/R/class_settings.R
@@ -53,22 +53,23 @@ settings_new <- function(
   storage = NULL,
   retrieval = NULL
 ) {
-  force(name)
-  force(description)
-  force(format)
-  force(repository)
-  force(pattern)
-  force(dimensions)
-  force(iteration)
-  force(error)
-  force(memory)
-  force(garbage_collection)
-  force(deployment)
-  force(priority)
-  force(resources)
-  force(storage)
-  force(retrieval)
-  environment()
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$name <- name
+  out$description <- description
+  out$format <- format
+  out$repository <- repository
+  out$pattern <- pattern
+  out$dimensions <- dimensions
+  out$iteration <- iteration
+  out$error <- error
+  out$memory <- memory
+  out$garbage_collection <- garbage_collection
+  out$deployment <- deployment
+  out$priority <- priority
+  out$resources <- resources
+  out$storage <- storage
+  out$retrieval <- retrieval
+  out
 }
 
 settings_produce_pattern <- function(pattern) {
diff --git a/R/class_stem.R b/R/class_stem.R
@@ -8,15 +8,16 @@ stem_new <- function(
   subpipeline = NULL,
   junction = NULL
 ) {
-  force(command)
-  force(settings)
-  force(cue)
-  force(value)
-  force(metrics)
-  force(store)
-  force(subpipeline)
-  force(junction)
-  enclass(environment(), c("tar_stem", "tar_builder", "tar_target"))
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$command <- command
+  out$settings <- settings
+  out$cue <- cue
+  out$value <- value
+  out$metrics <- metrics
+  out$store <- store
+  out$subpipeline <- subpipeline
+  out$junction <- junction
+  enclass(out, c("tar_stem", "tar_builder", "tar_target"))
 }
 
 #' @export
diff --git a/R/class_store.R b/R/class_store.R
@@ -29,11 +29,12 @@ store_new <- function(
   methods_format = NULL,
   methods_repository = NULL
 ) {
-  force(file)
-  force(resources)
-  force(methods_format)
-  force(methods_repository)
-  environment()
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$file <- file
+  out$resources <- resources
+  out$methods_format <- methods_format
+  out$methods_repository <- methods_repository
+  out
 }
 
 store_enclass <- function(store, format, repository) {
diff --git a/R/class_store_format_custom_methods.R b/R/class_store_format_custom_methods.R
@@ -42,13 +42,14 @@ store_format_custom_methods_new <- function(
   convert = NULL,
   copy = NULL
 ) {
-  force(read)
-  force(write)
-  force(marshal)
-  force(unmarshal)
-  force(convert)
-  force(copy)
-  environment()
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$read <- read
+  out$write <- write
+  out$marshal <- marshal
+  out$unmarshal <- unmarshal
+  out$convert <- convert
+  out$copy <- copy
+  out
 }
 
 store_format_custom_methods_validate <- function(methods) {
diff --git a/R/class_store_repository_cas_methods.R b/R/class_store_repository_cas_methods.R
@@ -16,11 +16,12 @@ store_repository_cas_methods_new <- function(
   exists = NULL,
   consistent = NULL
 ) {
-  force(upload)
-  force(download)
-  force(exists)
-  force(consistent)
-  environment()
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$upload <- upload
+  out$download <- download
+  out$exists <- exists
+  out$consistent <- consistent
+  out
 }
 
 store_repository_cas_methods_validate <- function(methods) {
diff --git a/R/class_target.R b/R/class_target.R
@@ -74,11 +74,12 @@ target_new <- function(
   cue = NULL,
   value = NULL
 ) {
-  force(command)
-  force(settings)
-  force(cue)
-  force(value)
-  enclass(environment(), "tar_target")
+  out <- new.env(parent = emptyenv(), hash = FALSE)
+  out$command
+  out$settings
+  out$cue
+  out$value
+  enclass(out, "tar_target")
 }
 
 target_get_name <- function(target) {
diff --git a/R/class_value.R b/R/class_value.R
diff --git a/R/class_vector.R b/R/class_vector.R
diff --git a/R/class_workspace.R b/R/class_workspace.R
