use modern jsonlite::parse_json for safer JSON parsing

Author: cpsievert

DESCRIPTION

@@ -27,7 +27,7 @@ Imports:
     tools,
     scales,
     httr,
-    jsonlite,
+    jsonlite (>= 1.6),
     magrittr,
     digest,
     viridisLite,

NAMESPACE

@@ -246,7 +246,8 @@ importFrom(httr,config)
 importFrom(httr,content)
 importFrom(httr,stop_for_status)
 importFrom(httr,warn_for_status)
-importFrom(jsonlite,fromJSON)
+importFrom(jsonlite,parse_json)
+importFrom(jsonlite,read_json)
 importFrom(jsonlite,toJSON)
 importFrom(lazyeval,all_dots)
 importFrom(lazyeval,f_eval)

R/imports.R

@@ -5,7 +5,7 @@
 #' @importFrom stats setNames complete.cases quantile is.leaf
 #' @importFrom tidyr unnest
 #' @importFrom viridisLite viridis
-#' @importFrom jsonlite toJSON fromJSON
+#' @importFrom jsonlite toJSON parse_json read_json
 #' @importFrom httr GET POST PATCH content config add_headers stop_for_status warn_for_status
 #' @importFrom htmlwidgets createWidget sizingPolicy saveWidget onRender prependContent
 #' @importFrom lazyeval f_eval is_formula all_dots is_lang f_new

R/shiny.R

@@ -46,7 +46,7 @@ renderPlotly <- function(expr, env = parent.frame(), quoted = FALSE) {
   shiny::snapshotPreprocessOutput(
     renderFunc,
     function(value) {
-      json <- from_JSON_safe(value)
+      json <- from_JSON(value)
       json$x <- json$x[setdiff(names(json$x), c("visdat", "cur_data", "attrs"))]
       to_JSON(json)
     }
@@ -103,7 +103,7 @@ event_data <- function(
   val <- session$rootScope()$input[[src]]
 
   # legend clicking returns trace(s), which shouldn't be simplified...
-  fromJSONfunc <- if (event %in% c("plotly_legendclick", "plotly_legenddoubleclick")) from_JSON else jsonlite::fromJSON
+  fromJSONfunc <- if (event %in% c("plotly_legendclick", "plotly_legenddoubleclick")) from_JSON else jsonlite::parse_json
 
   if (is.null(val)) val else fromJSONfunc(val)
 }

R/utils.R

@@ -948,7 +948,7 @@ grab <- function(what = "username") {
 
 # try to grab an object key from a JSON file (returns empty string on error)
 try_file <- function(f, what) {
-  tryCatch(jsonlite::fromJSON(f)[[what]], error = function(e) NULL)
+  tryCatch(jsonlite::read_json(f)[[what]], error = function(e) NULL)
 }
 
 # preferred defaults for toJSON mapping
@@ -959,14 +959,7 @@ to_JSON <- function(x, ...) {
 
 # preferred defaults for toJSON mapping
 from_JSON <- function(x, ...) {
-  jsonlite::fromJSON(x, simplifyDataFrame = FALSE, simplifyMatrix = FALSE, ...)
-}
-
-from_JSON_safe <- function(txt, ...) {
-  if (!jsonlite::validate(txt)) {
-    stop("Expected a valid JSON string.")
-  }
-  from_JSON(txt, ...)
+  jsonlite::parse_json(x, simplifyDataFrame = FALSE, simplifyMatrix = FALSE, ...)
 }
 
 i <- function(x) {