fix: move assert dataframe up

atorus-research · Nov 30, 2023 · 531f706 · 531f706
1 parent d59c241
commit 531f706
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/R/df_label.R b/R/df_label.R
@@ -51,6 +51,7 @@ xportr_df_label <- function(.df,
     )
     metadata <- metacore
   }
+  assert_data_frame(.df)
   assert(
     combine = "or",
     check_r6(metadata, "Metacore", null.ok = TRUE),
@@ -67,7 +68,6 @@ xportr_df_label <- function(.df,
   if (!is.null(domain)) attr(.df, "_xportr.df_arg_") <- domain
 
   ## End of common section
-  assert_data_frame(.df) # deferred after `enexpr` call
 
   ## Pull out correct metadata
   metadata <- metadata %||%

diff --git a/R/format.R b/R/format.R
@@ -53,6 +53,7 @@ xportr_format <- function(.df,
     )
     metadata <- metacore
   }
+  assert_data_frame(.df)
   assert(
     combine = "or",
     check_r6(metadata, "Metacore", null.ok = TRUE),
@@ -70,7 +71,6 @@ xportr_format <- function(.df,
   if (!is.null(domain)) attr(.df, "_xportr.df_arg_") <- domain
 
   ## End of common section
-  assert_data_frame(.df) # deferred after `enexpr` call
 
   metadata <- metadata %||%
     attr(.df, "_xportr.df_metadata_") %||%

diff --git a/R/label.R b/R/label.R
@@ -69,6 +69,7 @@ xportr_label <- function(.df,
     )
     metadata <- metacore
   }
+  assert_data_frame(.df)
   assert(
     combine = "or",
     check_r6(metadata, "Metacore", null.ok = TRUE),
@@ -87,7 +88,6 @@ xportr_label <- function(.df,
   if (!is.null(domain)) attr(.df, "_xportr.df_arg_") <- domain
 
   ## End of common section
-  assert_data_frame(.df) # deferred after `enexpr` call
 
   metadata <- metadata %||%
     attr(.df, "_xportr.df_metadata_") %||%

diff --git a/R/length.R b/R/length.R
@@ -76,6 +76,7 @@ xportr_length <- function(.df,
     )
     metadata <- metacore
   }
+  assert_data_frame(.df)
   assert(
     combine = "or",
     check_r6(metadata, "Metacore", null.ok = TRUE),
@@ -94,7 +95,6 @@ xportr_length <- function(.df,
   if (!is.null(domain)) attr(.df, "_xportr.df_arg_") <- domain
 
   ## End of common section
-  assert_data_frame(.df) # deferred after `enexpr` call
 
   metadata <- metadata %||%
     attr(.df, "_xportr.df_metadata_") %||%

diff --git a/R/metadata.R b/R/metadata.R
@@ -41,6 +41,7 @@
 #'     xportr_order()
 #' }
 xportr_metadata <- function(.df, metadata, domain = NULL) {
+  assert_data_frame(.df)
   assert(
     combine = "or",
     check_r6(metadata, "Metacore", null.ok = TRUE),
@@ -54,7 +55,6 @@ xportr_metadata <- function(.df, metadata, domain = NULL) {
   if (!is.null(domain)) attr(.df, "_xportr.df_arg_") <- domain
 
   ## End of common section
-  assert_data_frame(.df) # deferred after `enexpr` call
 
   structure(.df, "_xportr.df_metadata_" = metadata)
 }

diff --git a/R/order.R b/R/order.R
@@ -72,6 +72,7 @@ xportr_order <- function(.df,
     )
     metadata <- metacore
   }
+  assert_data_frame(.df)
   assert(
     combine = "or",
     check_r6(metadata, "Metacore", null.ok = TRUE),
@@ -90,7 +91,6 @@ xportr_order <- function(.df,
   if (!is.null(domain)) attr(.df, "_xportr.df_arg_") <- domain
 
   ## End of common section
-  assert_data_frame(.df) # deferred after `enexpr` call
 
   metadata <- metadata %||%
     attr(.df, "_xportr.df_metadata_") %||%

diff --git a/R/type.R b/R/type.R
@@ -89,6 +89,7 @@ xportr_type <- function(.df,
     )
     metadata <- metacore
   }
+  assert_data_frame(.df)
   assert(
     combine = "or",
     check_r6(metadata, "Metacore", null.ok = TRUE),
@@ -111,7 +112,6 @@ xportr_type <- function(.df,
   if (!is.null(domain)) attr(.df, "_xportr.df_arg_") <- domain
 
   ## End of common section
-  assert_data_frame(.df) # deferred after `enexpr` call
 
   ## Pull out correct metadata
   metadata <- metadata %||%