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("{}")