Merge with Lara changes

Merge branch 'master' of https://github.com/m-path-io/mpathr

# Conflicts:
#	R/cast_vec.R
#	R/read_mpath.R
#	R/write_mpath.R

NAMESPACE

@@ -26,6 +26,7 @@ importFrom(dplyr,where)
 importFrom(ggplot2,aes)
 importFrom(ggplot2,ggplot)
 importFrom(jsonlite,fromJSON)
+importFrom(jsonlite,toJSON)
 importFrom(lifecycle,deprecated)
 importFrom(rlang,.data)
 importFrom(rlang,.env)

R/cast_vec.R

@@ -62,7 +62,7 @@
   }
 
   # Parse the JSON string
-  unjson <- jsonlite::fromJSON(unjson, simplifyVector = TRUE)
+  unjson <- fromJSON(unjson, simplifyVector = TRUE)
 
   # Fill in the unjsoned values
   vec[!idx_na] <- unjson
@@ -86,7 +86,7 @@
     return(vec)
   }
 
-  unjson <- jsonlite::fromJSON(unjson, simplifyVector = FALSE)
+  unjson <- fromJSON(unjson, simplifyVector = FALSE)
 
   # The JSON is now parsed to a lists of lists of lists. We want to unlist in such a way that we
   # have a list of vectors. So loop over the outer list and collapse everything into a single

R/mpathr-package.R

@@ -23,6 +23,7 @@
 #' @importFrom ggplot2 aes
 #' @importFrom ggplot2 ggplot
 #' @importFrom jsonlite fromJSON
+#' @importFrom jsonlite toJSON
 #' @importFrom lifecycle deprecated
 #' @importFrom rlang .data
 #' @importFrom rlang .env

R/read_mpath.R

@@ -238,6 +238,7 @@ read_meta_data <- function(
     file = meta_data,
     delim = ";",
     locale = .mpath_locale,
+    escape_double = TRUE,
     show_col_types = FALSE,
     col_names = TRUE,
     col_types = c("cccclll")
@@ -317,10 +318,10 @@ read_meta_data <- function(
   meta_data <- meta_data |>
     mutate(type = case_match(
       .data$typeAnswer,
-      "basic" ~ "i",
+      "basic" ~ "?",
       c("int", "integer") ~ "i",
       "string" ~ "c",
-      "stringList" ~ "c", # the lists are read as strings and then converted to their respective types
+      "stringList" ~ "c",
       "intList" ~ "c",
       "doubleList" ~ "c",
       "double" ~ "n"

R/write_mpath.R

@@ -159,7 +159,7 @@ write_mpath <- function(
   parsed <- vec[!idx_na]
 
   # Parse the string to JSON
-  parsed <- vapply(parsed, jsonlite::toJSON, character(1))
+  parsed <- vapply(parsed, toJSON, character(1))
 
   # But remove the square brackets from the JSON string
   parsed <- gsub("^\\[", "", parsed)

vignettes/mpathr.Rmd

@@ -61,8 +61,8 @@ data <- read_mpath(
 
 ### Note: saving m-Path data
 As explained above, the resulting data frame will contain columns with lists,
-which can be problematic when saving the data. To save the data, we suggest
-using either `fwrite` from the `data.table` package, or the `save` function. 
+which can be problematic when saving the data. To save the data, we suggest the
+following two options:
 
 If you want to save the data as a 'csv' to use it in another program, use `write_mpath()`.