Merge pull request #2 from tmelliott/feature/ci

Add github CI

.Rbuildignore

@@ -1,3 +1,5 @@
 ^LICENSE\.md$
 ^README\.Rmd$
 ^Makefile$
+node_modules
+^\.github$

.github/.gitignore

@@ -0,0 +1 @@
+*.html

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

@@ -0,0 +1,29 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on: [push, pull_request]
+name: R CMD check
+
+permissions: read-all
+
+jobs:
+  R-CMD-check:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::rcmdcheck
+          needs: check
+
+      - uses: r-lib/actions/check-r-package@v2
+        with:
+          upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.github/workflows/check-demo.yaml

@@ -0,0 +1,42 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on: [push, pull_request]
+name: Check demo
+
+permissions: read-all
+
+jobs:
+  run-sampler:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::rcmdcheck, local::.
+          needs: check
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9.12
+
+      # the rest of this must run from tests/testthat/sampler
+      - run: pnpm install --frozen-lockfile
+        working-directory: tests/testthat/sampler
+
+      - run: pnpm build
+        working-directory: tests/testthat/sampler
+
+      - name: Start Rserve
+        run: pnpm rserve &
+        working-directory: tests/testthat/sampler
+
+      - run: pnpm start
+        working-directory: tests/testthat/sampler

DESCRIPTION

@@ -10,11 +10,9 @@ License: MIT + file LICENSE
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.3.1
-Suggests:
-    testthat (>= 3.0.0)
 Config/testthat/edition: 3
 Imports:
-    cli,
-    js,
     rlang,
     Rserve
+Suggests:
+    testthat (>= 3.0.0)

Makefile

@@ -8,6 +8,9 @@ document:
 install: document
 	R CMD INSTALL .
 
+check:
+	Rscript -e "devtools::check()"
+
 README.md: README.Rmd install
 	Rscript -e "rmarkdown::render('README.Rmd')"
 	@rm README.html

R/compile.R

@@ -50,10 +50,6 @@ ts_compile.character <- function(
         sprintf("export default {\n  %s\n};", paste(ls(e), collapse = ",\n  "))
     )
 
-    # if (file != "" && file.exists(file)) {
-    #     stop(sprintf("File exists: %s", file))
-    #     return()
-    # }
     cat(src, file = file, sep = "\n")
 
     invisible()

R/function.R

@@ -82,19 +82,18 @@ ts_function <- function(f, ..., result = ts_void()) {
 }
 
 
-
 #' @export
 print.ts_function <- function(x, ...) {
-    cli::cli_h3("Ocap function")
+    h3("Ocap function")
 
-    cli::cli_text("Arguments:")
+    cat("Arguments:\n")
     args <- lapply(x$args, \(z) z$input_type)
     lapply(names(args), \(n) {
         cat("- ", n, ": ", args[[n]], "\n", sep = "")
     })
-    cli::cli_text("\n\n")
+    cat("\n\n")
 
-    cli::cli_text("Return type:")
+    cat("Return type:\n")
     cat(x$result$return_type)
 }
 

R/helpers.R

@@ -0,0 +1,9 @@
+h3 <- function(x) {
+    cat("\n---", x, "\n")
+}
+
+
+# TODO: figure out how to format (modern) JS code from R?
+format_js <- function(x) {
+    x
+}

R/types.R

@@ -27,21 +27,20 @@ ts_object <- function(input_type = "any",
 #' @export
 print.ts_object <- function(x, ...) {
     # name <- deparse(substitute(x))
-    cli::cli_ul()
-    cli::cli_h3("Input type: ")
+    h3("Input type: ")
     if (nchar(x$input_type) > 50) {
-        cat(js::uglify_reformat(x$input_type, beautify = TRUE), "\n")
+        cat(format_js(x$input_type), "\n")
     } else {
         cat(x$input_type, "\n")
     }
-    cli::cli_h3("Return type: ")
+    h3("Return type: ")
     if (nchar(x$return_type) > 50) {
         print(x$return_type)
-        cat(js::uglify_reformat(x$return_type, beautify = TRUE), "\n")
+        cat(format_js(x$return_type), "\n")
     } else {
         cat(x$return_type, "\n")
     }
-    cli::cli_end()
+    cat("\n")
 }
 
 #' @describeIn ts_object Check if an object is a ts object

README.Rmd

@@ -16,6 +16,8 @@ knitr::opts_chunk$set(
 # ts
 
 <!-- badges: start -->
+[![R-CMD-check](https://github.com/tmelliott/ts/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/tmelliott/ts/actions/workflows/R-CMD-check.yaml)
+[![Demo](https://github.com/tmelliott/ts/actions/workflows/check-demo.yaml/badge.svg)](https://github.com/tmelliott/ts/actions/workflows/check-demo.yaml)
 <!-- badges: end -->
 
 The **ts** package makes it easy for users to write functions that can be used in [**rserve-ts**](https://www.npmjs.com/package/rserve-ts) applications.

README.md

@@ -5,6 +5,8 @@
 
 <!-- badges: start -->
 
+[![R-CMD-check](https://github.com/tmelliott/ts/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/tmelliott/ts/actions/workflows/R-CMD-check.yaml)
+[![Demo](https://github.com/tmelliott/ts/actions/workflows/check-demo.yaml/badge.svg)](https://github.com/tmelliott/ts/actions/workflows/check-demo.yaml)
 <!-- badges: end -->
 
 The **ts** package makes it easy for users to write functions that can