provide a method to easily force the version of a jsdelivr package, i.e., pass a version number to the force argument of jsd_version()

Author: yihui

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

@@ -84,7 +84,7 @@ jobs:
           Rscript -e 'install.packages("xfun", repos="https://yihui.r-universe.dev")'
           Rscript -e 'litedown::fuse_book("docs")'
           cd docs; cp -r *.html ../gh-pages/; cd ../gh-pages
-          git config user.name "Yihui Xie"
-          git config user.email "[email protected]"
+          git config user.name github-actions
+          git config user.email [email protected]
           git add .
           git commit -m "update docs" && git push && curl -X POST ${{secrets.URL_DEPLOY_DOCS}} || true

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: litedown
 Type: Package
 Title: A Lightweight Version of R Markdown
-Version: 0.5.4
+Version: 0.5.5
 Authors@R: c(
     person("Yihui", "Xie", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0003-0645-5666", URL = "https://yihui.org")),
     person("Tim", "Taylor", role = "ctb", comment = c(ORCID = "0000-0002-8587-7113")),

R/mark.R

@@ -409,7 +409,7 @@ mark = function(input, output = NULL, text = NULL, options = NULL, meta = list()
     # for RStudio to capture the output path when previewing the output
     if (is_rmd_preview()) message('\nOutput created: ', output)
     if (is_pdf) invisible(output) else write_utf8(ret, output)
-  } else raw_string(ret, lang = format)
+  } else raw_string(ret)  # TODO: (lang = format) with xfun 0.51
 }
 
 # insert body and meta variables into a template

R/utils.R

@@ -1089,11 +1089,21 @@ jsd_version = local({
     }
     file.path(d, 'jsd_versions.rds')
   }
+  # update cache to a specific version
+  u_cache = function(info, pkg, version, file) {
+    info[[pkg]] = list(version = version, time = Sys.time())
+    saveRDS(info, file)
+  }
   # cache expires after one week by default
   v_cache = function(pkg, force, delta = getOption('litedown.jsdelivr.cache', 604800)) {
-    if (!force && file.exists(f <- p_cache())) {
-      info = readRDS(f)[[pkg]]
-      if (!is.null(t <- info$time) && Sys.time() - t <= delta) info$version
+    if (!isTRUE(force) && file.exists(f <- p_cache())) {
+      info = readRDS(f)
+      if (is.character(force)) {
+        u_cache(info, pkg, force, f)
+      } else {
+        info = info[[pkg]]
+        if (!is.null(t <- info$time) && Sys.time() - t <= delta) info$version
+      }
     }
   }
   # query version from jsdelivr api
@@ -1106,16 +1116,16 @@ jsd_version = local({
     if (length(v)) {
       if (dir_create(dirname(f <- p_cache()))) {
         info = if (file.exists(f)) readRDS(f) else list()
-        info[[pkg]] = list(version = v[1], time = Sys.time())
-        saveRDS(info, f)
+        u_cache(info, pkg, v[1], f)
       }
       v[1]
     }
   }
+  # force can be TRUE/FALSE/version number
   function(pkg, force = FALSE) {
-    if (!force && is.character(v <- vers[[pkg]])) return(v)
+    if (isFALSE(force) && is.character(v <- vers[[pkg]])) return(v)
     v = v_cache(pkg, force) %||% v_api(pkg)
-    vers[[pkg]] <<- if (length(v)) v[1] else ''
+    (vers[[pkg]] <<- if (length(v)) v[1] else '')
   }
 })