all tests pass, flag removed

Author: dajmcdon

R/layer_add_forecast_date.R

@@ -69,13 +69,8 @@ layer_add_forecast_date <-
   }
 
 layer_add_forecast_date_new <- function(forecast_date, id) {
-  arg_is_scalar(forecast_date, allow_null = TRUE)
-  if (!is.null(forecast_date)) {
-    forecast_date <- tryCatch(as.Date(forecast_date), error = function(e) NA)
-  }
-  arg_is_date(forecast_date, allow_null = TRUE)
+  forecast_date <- arg_to_date(forecast_date, allow_null = TRUE)
   arg_is_chr_scalar(id)
-
   layer("add_forecast_date", forecast_date = forecast_date, id = id)
 }
 

R/layer_add_target_date.R

@@ -45,8 +45,8 @@
 #' p2
 layer_add_target_date <-
   function(frosting, target_date = NULL, id = rand_id("add_target_date")) {
+    target_date <- arg_to_date(target_date, allow_null = TRUE)
     arg_is_chr_scalar(id)
-    arg_is_date(target_date)
     add_layer(
       frosting,
       layer_add_target_date_new(

R/utils_arg.R

@@ -158,3 +158,13 @@ arg_is_sorted = function(..., allow_null = FALSE) {
 
     })
 }
+
+
+arg_to_date <- function(x, allow_null = FALSE, allow_na = FALSE) {
+  arg_is_scalar(x, allow_null = allow_null, allow_na = allow_na)
+  if (allow_null && !is.null(x)) {
+    x <- tryCatch(as.Date(x), error = function(e) NA)
+  }
+  arg_is_date(x, allow_null = allow_null, allow_na = allow_na)
+  x
+}