473 na strings

R/class-workbook-utils.R

@@ -158,6 +158,15 @@ next_sheet <- function() {
   structure("next_sheet", class = "openxlsx2_waiver")
 }
 
+na_strings <- function() {
+  structure("na_strings", class = "openxlsx2_waiver")
+}
+
 is_waiver <- function(x) {
   inherits(x, "openxlsx2_waiver")
 }
+
+is_na_strings <- function(x) {
+  is_waiver(x) && isTRUE(x == "na_strings")
+}
+

R/class-workbook-wrappers.R

@@ -114,12 +114,9 @@ wb_add_data <- function(
     sep             = ", ",
     applyCellStyle  = TRUE,
     removeCellStyle = FALSE,
-    na.strings
+    na.strings = na_strings()
 ) {
   assert_workbook(wb)
-
-  if (missing(na.strings)) na.strings <- substitute()
-
   wb$clone(deep = TRUE)$add_data(
     sheet           = sheet,
     x               = x,
@@ -201,11 +198,9 @@ wb_add_data_table <- function(
     bandedCols  = FALSE,
     applyCellStyle  = TRUE,
     removeCellStyle = FALSE,
-    na.strings
+    na.strings = na_strings()
 ) {
   assert_workbook(wb)
-  if (missing(na.strings)) na.strings <- substitute()
-
   wb$clone()$add_data_table(
     sheet       = sheet,
     x           = x,

R/class-workbook.R

@@ -982,11 +982,9 @@ wbWorkbook <- R6::R6Class(
         sep             = ", ",
         applyCellStyle  = TRUE,
         removeCellStyle = FALSE,
-        na.strings
+        na.strings = na_strings()
       ) {
 
-      if (missing(na.strings)) na.strings <- substitute()
-
       write_data(
         wb              = self,
         sheet           = sheet,
@@ -1048,11 +1046,9 @@ wbWorkbook <- R6::R6Class(
         bandedCols  = FALSE,
         applyCellStyle = TRUE,
         removeCellStyle = FALSE,
-        na.strings
+        na.strings = na_strings()
     ) {
 
-      if (missing(na.strings)) na.strings <- substitute()
-
       write_datatable(
         wb          = self,
         sheet       = sheet,

R/write.R

@@ -13,7 +13,7 @@
 #' @keywords internal
 #' @noRd
 update_cell <- function(x, wb, sheet, cell, colNames = FALSE,
-                        removeCellStyle = FALSE, na.strings) {
+                        removeCellStyle = FALSE, na.strings = na_strings()) {
 
   sheet_id <- wb$validate_sheet(sheet)
 
@@ -82,7 +82,7 @@ update_cell <- function(x, wb, sheet, cell, colNames = FALSE,
     wb$worksheets[[sheet_id]]$dimension <- paste0("<dimension ref=\"", min_cell, ":", max_cell, "\"/>")
   }
 
-  if (missing(na.strings)) {
+  if (is_na_strings(na.strings)) {
     na.strings <- NULL
   }
 
@@ -167,12 +167,10 @@ write_data2 <- function(
     startCol = 1,
     applyCellStyle = TRUE,
     removeCellStyle = FALSE,
-    na.strings,
+    na.strings = na_strings(),
     data_table = FALSE
   ) {
 
-  if (missing(na.strings)) na.strings <- substitute()
-
   is_data_frame <- FALSE
   #### prepare the correct data formats for openxml
   dc <- openxlsx2_type(data)
@@ -313,7 +311,7 @@ write_data2 <- function(
   ## replace NA, NaN, and Inf
   is_na <- which(cc$is == "<is><t>_openxlsx_NA</t></is>" | cc$v == "NA")
   if (length(is_na)) {
-    if (missing(na.strings)) {
+    if (is_na_strings(na.strings)) {
       cc[is_na, "v"]   <- "#N/A"
       cc[is_na, "c_t"] <- "e"
       cc[is_na, "is"]  <- ""
@@ -601,7 +599,7 @@ write_data_table <- function(
     applyCellStyle = TRUE,
     removeCellStyle = FALSE,
     data_table = FALSE,
-    na.strings
+    na.strings = na_strings()
 ) {
 
   op <- openxlsx2_options()
@@ -625,8 +623,6 @@ write_data_table <- function(
     startRow <- min(dims[[2]])
   }
 
-  if (missing(na.strings)) na.strings <- substitute()
-
   ## common part ---------------------------------------------------------------
   if ((!is.character(sep)) || (length(sep) != 1))
     stop("sep must be a character vector of length 1")
@@ -930,11 +926,9 @@ write_data <- function(
     name = NULL,
     applyCellStyle = TRUE,
     removeCellStyle = FALSE,
-    na.strings
+    na.strings = na_strings()
 ) {
 
-  if (missing(na.strings)) na.strings <- substitute()
-
   write_data_table(
     wb = wb,
     sheet = sheet,
@@ -1236,11 +1230,9 @@ write_datatable <- function(
     bandedCols = FALSE,
     applyCellStyle = TRUE,
     removeCellStyle = FALSE,
-    na.strings
+    na.strings = na_strings()
 ) {
 
-  if (missing(na.strings)) na.strings <- substitute()
-
   write_data_table(
     wb = wb,
     sheet = sheet,

R/write_xlsx.R

@@ -284,10 +284,7 @@ write_xlsx <- function(x, file, asTable = FALSE, ...) {
     tableStyle <- params$tableStyle
   }
 
-  na_strings <- substitute()
-  if ("na.strings" %in% names(params)) {
-    na_strings <- params$na.strings
-  }
+  na.strings <- params$na.strings %||% na_strings()
 
 
   ## create new Workbook object
@@ -378,7 +375,7 @@ write_xlsx <- function(x, file, asTable = FALSE, ...) {
         tableStyle = tableStyle[[i]],
         tableName = NULL,
         withFilter = withFilter[[i]],
-        na.strings = na_strings
+        na.strings = na.strings
       )
     } else {
       write_data(
@@ -390,7 +387,7 @@ write_xlsx <- function(x, file, asTable = FALSE, ...) {
         xy = xy,
         colNames = colNames[[i]],
         rowNames = rowNames[[i]],
-        na.strings = na_strings
+        na.strings = na.strings
       )
     }