Merge remote-tracking branch 'upstream/master'

Author: fproske

.Rbuildignore

@@ -31,3 +31,5 @@ vignettes/framed.sty$
 ^revdep$
 ^CODE_OF_CONDUCT\.md$
 ^\.github$
+^air.toml$
+

.github/workflows/R-CMD-check.yaml

@@ -17,6 +17,7 @@ jobs:
       matrix:
         config:
           - {os: macOS-latest,    r: 'release'}
+          - {os: macOS-15,        r: 'next'}
           - {os: windows-2022,    r: 'devel'}
           - {os: windows-latest,  r: '4.1'}
           - {os: windows-latest,  r: '3.6'}
@@ -47,3 +48,5 @@ jobs:
           extra-packages: rcmdcheck
 
       - uses: r-lib/actions/check-r-package@v2
+        env:
+          MAKEFLAGS: -j4

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: jsonlite
-Version: 1.8.9.999
-Title: A Robust, High Performance JSON Parser and Generator for R (adjusted for use in MIRO)
+Version: 2.0.0.999
+Title: A Simple and Robust JSON Parser and Generator for R (adjusted for use in MIRO)
 License: MIT + file LICENSE
 Depends: methods
 Authors@R: c(
@@ -30,6 +30,6 @@ Suggests:
     rmarkdown,
     R.rsp,
     sf
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)

NEWS

@@ -1,3 +1,18 @@
+2.0.0
+  - Output for toJSON(x, pretty = p) where p is a number has changed: now uses
+    the same r-based indent system as for pretty = TRUE. To get the old format,
+    run json output through prettify().
+  - Both toJSON() and prettify() support now can use tabs instead of spaces by
+    setting a negative number as indent/pretty argument.
+  - Fix an ubsan warning in prettify/minify in libyajl
+  - Reformatted code with air
+
+1.9.1
+  - Fix a unit test in R 4.5 due to the new 'penguins_raw' dataset
+
+1.9.0
+  - Remove legacy modp_stdint.h which breaks in C23 on Windows (R-4.5)
+
 1.8.9
   - Fix memory leak in base64 decoder
   - Update maintainer email address

R/apply_by_pages.R

@@ -1,30 +1,30 @@
-apply_by_pages <- function(x, FUN, pagesize, verbose, ...){
+apply_by_pages <- function(x, FUN, pagesize, verbose, ...) {
   stopifnot(is.data.frame(x))
   nr <- nrow(x)
-  npages <- nr %/% pagesize;
-  lastpage <- nr %% pagesize;
+  npages <- nr %/% pagesize
+  lastpage <- nr %% pagesize
 
   out <- as.list(rep(NA, npages + as.logical(lastpage)))
-  for(i in seq_len(npages)){
-    from <- pagesize * (i-1) + 1;
+  for (i in seq_len(npages)) {
+    from <- pagesize * (i - 1) + 1
     to <- pagesize * i
-    out[[i]] <- FUN(x[from:to, ,drop = FALSE], ...)
-    if(verbose) cat("\rProcessed", i * pagesize, "rows...")
+    out[[i]] <- FUN(x[from:to, , drop = FALSE], ...)
+    if (verbose) cat("\rProcessed", i * pagesize, "rows...")
   }
 
-  if(lastpage){
-    from <- nr - lastpage + 1;
-    out[[npages + 1]] <- FUN(x[from:nr, ,drop = FALSE], ...)
+  if (lastpage) {
+    from <- nr - lastpage + 1
+    out[[npages + 1]] <- FUN(x[from:nr, , drop = FALSE], ...)
   }
-  if(verbose) cat("\rComplete! Processed total of", nr, "rows.\n")
+  if (verbose) cat("\rComplete! Processed total of", nr, "rows.\n")
   out
 }
 
 #this is another slightly slower implementation
-apply_by_pages2 <- function(x, FUN, pagesize, verbose, ...){
+apply_by_pages2 <- function(x, FUN, pagesize, verbose, ...) {
   x2 <- split(x, seq_len(nrow(x)) %/% pagesize)
-  for(page in x2){
-    if(verbose) message("Writing ", nrow(page), " lines (", ").")
+  for (page in x2) {
+    if (verbose) message("Writing ", nrow(page), " lines (", ").")
     FUN(page)
   }
   invisible()

R/as.scalar.R

@@ -1,16 +1,16 @@
 as.scalar <- function(obj) {
   # Lists can never be a scalar (this can arise if a dataframe contains a column
   # with lists)
-  if(length(dim(obj)) > 1){
-    if(!identical(nrow(obj), 1L)){
-      warning("Tried to use as.scalar on an array or dataframe with ", nrow(obj), " rows.", call.=FALSE)
+  if (length(dim(obj)) > 1) {
+    if (!identical(nrow(obj), 1L)) {
+      warning("Tried to use as.scalar on an array or dataframe with ", nrow(obj), " rows.", call. = FALSE)
       return(obj)
     }
-  } else if(!identical(length(obj), 1L)) {
-    warning("Tried to use as.scalar on an object of length ", length(obj), call.=FALSE)
+  } else if (!identical(length(obj), 1L)) {
+    warning("Tried to use as.scalar on an object of length ", length(obj), call. = FALSE)
     return(obj)
-  } else if(is.namedlist(obj)){
-    warning("Tried to use as.scalar on a named list.", call.=FALSE)
+  } else if (is.namedlist(obj)) {
+    warning("Tried to use as.scalar on a named list.", call. = FALSE)
     return(obj)
   }
 

R/asJSON.AAAgeneric.R

@@ -2,7 +2,7 @@ setGeneric("asJSON", function(x, ...) {
   standardGeneric("asJSON")
 })
 
-if(getRversion() < "4"){
+if (getRversion() < "4") {
   setOldClass("AsIs")
   setOldClass("integer64")
   setOldClass(c("hms", "difftime"))

R/asJSON.AsIs.R

@@ -1,12 +1,10 @@
 setMethod("asJSON", "AsIs", function(x, auto_unbox = FALSE, ...) {
-
   # Strip off the AsIs class so we can dispatch to other asJSON methods.
   class(x) <- setdiff(class(x), "AsIs")
 
   if (is.atomic(x) && length(x) == 1) {
     # Never auto_unbox single values when wrapped with I()
     asJSON(x, auto_unbox = FALSE, ...)
-
   } else {
     asJSON(x, auto_unbox = auto_unbox, ...)
   }

R/asJSON.Date.R

@@ -1,10 +1,10 @@
 setMethod("asJSON", "Date", function(x, Date = c("ISO8601", "epoch"), always_decimal = FALSE, ...) {
-
   # Validate argument
   Date <- match.arg(Date)
 
   # select a schema
-  output <- switch(Date,
+  output <- switch(
+    Date,
     ISO8601 = format(x),
     epoch = unclass(x),
     default = stop("Invalid argument for 'Date':", Date)

R/asJSON.NULL.R

@@ -1,6 +1,6 @@
 # Note that this is different from RJSONIO because null values are NA.
 setMethod("asJSON", "NULL", function(x, null = "list", ...) {
-  if(null == "null"){
+  if (null == "null") {
     return("null")
   } else {
     return("{}")

R/asJSON.POSIXt.R

@@ -1,5 +1,4 @@
-setMethod("asJSON", "POSIXt", function(x, POSIXt = c("string", "ISO8601", "epoch",
-  "mongo"), UTC = FALSE, digits, time_format = NULL, always_decimal = FALSE, ...) {
+setMethod("asJSON", "POSIXt", function(x, POSIXt = c("string", "ISO8601", "epoch", "mongo"), UTC = FALSE, digits, time_format = NULL, always_decimal = FALSE, ...) {
   # note: UTC argument doesn't seem to be working consistently maybe use ?format
   # instead of ?as.character
 
@@ -17,10 +16,10 @@ setMethod("asJSON", "POSIXt", function(x, POSIXt = c("string", "ISO8601", "epoch
   }
 
   # Strings
-  if(is.null(time_format)){
-    time_format <- if(POSIXt == "string"){
+  if (is.null(time_format)) {
+    time_format <- if (POSIXt == "string") {
       ""
-    } else if(isTRUE(UTC)){
+    } else if (isTRUE(UTC)) {
       "%Y-%m-%dT%H:%M:%SZ"
     } else {
       "%Y-%m-%dT%H:%M:%S"
@@ -34,16 +33,15 @@ setMethod("asJSON", "POSIXt", function(x, POSIXt = c("string", "ISO8601", "epoch
   }
 })
 
-asJSON_posix_mongo <- function(x, collapse = TRUE, indent = NA_integer_, ...){
+asJSON_posix_mongo <- function(x, collapse = TRUE, indent = NA_integer_, ...) {
   if (inherits(x, "POSIXlt")) {
     x <- as.POSIXct(x)
   }
   df <- data.frame("$date" = floor(unclass(x) * 1000), check.names = FALSE)
-  if(inherits(x, "scalar"))
-    class(df) <- c("scalar", class(df))
+  if (inherits(x, "scalar")) class(df) <- c("scalar", class(df))
   tmp <- asJSON(df, digits = NA, always_decimal = FALSE, ..., collapse = FALSE)
   tmp[is.na(x)] <- asJSON(NA_character_, collapse = FALSE, ...)
-  if(isTRUE(collapse)){
+  if (isTRUE(collapse)) {
     collapse(tmp, inner = FALSE, indent = indent)
   } else {
     tmp

R/asJSON.array.R

@@ -1,31 +1,28 @@
-asjson_array_fun <- function(x, collapse = TRUE, na = NULL, oldna = NULL,
-  matrix = c("rowmajor", "columnmajor"), auto_unbox = FALSE, keep_vec_names = FALSE,
-  indent = NA_integer_, ...) {
-
-  matrix <- match.arg(matrix);
+asjson_array_fun <- function(x, collapse = TRUE, na = NULL, oldna = NULL, matrix = c("rowmajor", "columnmajor"), auto_unbox = FALSE, keep_vec_names = FALSE, indent = NA_integer_, ...) {
+  matrix <- match.arg(matrix)
 
   # reset na arg when called from data frame
-  if(identical(na, "NA")){
-    na <- oldna;
+  if (identical(na, "NA")) {
+    na <- oldna
   }
 
   # 1D arrays are vectors
-  if(length(dim(x)) < 2){
-    return(asJSON(c(x), matrix = matrix, na = na, indent = indent + 2L, ...))
+  if (length(dim(x)) < 2) {
+    return(asJSON(c(x), matrix = matrix, na = na, indent = indent_increment(indent), ...))
   }
 
   # if collapse == FALSE, then this matrix is nested inside a data frame,
   # and therefore row major must be forced to match dimensions
-  if(identical(matrix, "columnmajor") && collapse == FALSE){
-    return(apply(x, 1, asJSON, matrix = matrix, na = na, indent = indent + 2L, ...))
+  if (identical(matrix, "columnmajor") && collapse == FALSE) {
+    return(apply(x, 1, asJSON, matrix = matrix, na = na, indent = indent_increment(indent), ...))
   }
 
   # dont pass auto_unbox (never unbox within matrix)
   m <- asJSON(c(x), collapse = FALSE, matrix = matrix, na = na, ...)
   dim(m) <- dim(x)
-  tmp <- if(length(dim(x)) == 2 && identical(matrix, "rowmajor")){
+  tmp <- if (length(dim(x)) == 2 && identical(matrix, "rowmajor")) {
     # Faster special case for 2D matrices
-    row_collapse(m, indent = indent + 2L)
+    row_collapse(m, indent = indent_increment(indent))
   } else {
     collapse_array(m, columnmajor = identical(matrix, "columnmajor"), indent = indent)
   }
@@ -41,4 +38,3 @@ asjson_array_fun <- function(x, collapse = TRUE, na = NULL, oldna = NULL,
 # Some objects have class Matrix but not class Array
 setMethod("asJSON", "array", asjson_array_fun)
 setMethod("asJSON", "matrix", asjson_array_fun)
-

R/asJSON.character.R

@@ -1,12 +1,10 @@
-setMethod("asJSON", "character", function(x, collapse = TRUE, na = c("null", "string", "NA"),
-  auto_unbox = FALSE, keep_vec_names = FALSE, indent = NA_integer_, ...) {
-
+setMethod("asJSON", "character", function(x, collapse = TRUE, na = c("null", "string", "NA"), auto_unbox = FALSE, keep_vec_names = FALSE, indent = NA_integer_, ...) {
   # Needed for multi-byte Windows locales
   # See: https://github.com/jeroen/jsonlite/issues/329
   x <- enc2utf8(x)
 
   # shiny legacy exception
-  if(isTRUE(keep_vec_names) && length(names(x))){
+  if (isTRUE(keep_vec_names) && length(names(x))) {
     warn_keep_vec_names()
     return(asJSON(as.list(x), na = na, auto_unbox = TRUE, collapse = collapse, ...))
   }
@@ -26,15 +24,15 @@ setMethod("asJSON", "character", function(x, collapse = TRUE, na = c("null", "st
     na <- match.arg(na)
     if (na %in% c("null")) {
       tmp[missings] <- "null"
-    } else if(na %in% "string") {
+    } else if (na %in% "string") {
       tmp[missings] <- "\"NA\""
     } else {
       tmp[missings] <- NA_character_
     }
   }
 
-  if(isTRUE(auto_unbox) && length(tmp) == 1){
-    return(tmp);
+  if (isTRUE(auto_unbox) && length(tmp) == 1) {
+    return(tmp)
   }
 
   # this is almost always true, except for class 'scalar'

R/asJSON.complex.R

@@ -1,23 +1,21 @@
-setMethod("asJSON", "complex", function(x, digits = 5, collapse = TRUE, complex = c("string",
-  "list"), na = c("string", "null", "NA"), oldna = NULL, ...) {
-
+setMethod("asJSON", "complex", function(x, digits = 5, collapse = TRUE, complex = c("string", "list"), na = c("string", "null", "NA"), oldna = NULL, ...) {
   # validate
-  na <- match.arg(na);
+  na <- match.arg(na)
   complex <- match.arg(complex)
 
   #turn into strings
   if (complex == "string") {
     #default NA is "NA"
     mystring <- prettyNum(x = x, digits = digits)
-    if (any(missings <- which(!is.finite(x)))){
+    if (any(missings <- which(!is.finite(x)))) {
       if (na %in% c("null", "NA")) {
-        mystring[missings] <- NA_character_;
+        mystring[missings] <- NA_character_
       }
     }
     asJSON(mystring, collapse = collapse, na = na, ...)
   } else {
-    if(na == "NA"){
-      na <- oldna;
+    if (na == "NA") {
+      na <- oldna
     }
     asJSON(list(real = Re(x), imaginary = Im(x)), na = na, digits = digits, ...)
   }