move R code into hera

.gitignore

@@ -50,3 +50,8 @@ bld
 Untitled*.ipynb
 *.log
 /*.ipynb
+.Rproj.user
+.Rhistory
+hera.Rcheck
+hera_*.tar.gz
+hera_*.tgz

CMakeLists.txt

@@ -66,8 +66,16 @@ message(STATUS "R_LDFLAGS        = ${R_LDFLAGS}")
 message(STATUS "R_LIBRARY_BASE   = ${R_LIBRARY_BASE}")
 message(STATUS "R_LIBRARY_BLAS   = ${R_LIBRARY_BLAS}")
 message(STATUS "R_LIBRARY_LAPACK = ${R_LIBRARY_LAPACK}")
-message(STATUS "R_VERSION_MAJOR = ${R_VERSION_MAJOR}")
-message(STATUS "R_VERSION_MINOR = ${R_VERSION_MINOR}")
+message(STATUS "R_VERSION_MAJOR  = ${R_VERSION_MAJOR}")
+message(STATUS "R_VERSION_MINOR  = ${R_VERSION_MINOR}")
+
+# Install R package hera
+# ======================
+
+message(STATUS "Installing R 📦 hera to temporary library")
+execute_process(COMMAND ${R_COMMAND} CMD INSTALL --preclean --no-staged-install --library=temp_r_lib --build ../hera)
+install(DIRECTORY temp_r_lib/ DESTINATION ${R_HOME}/library)
+execute_process(COMMAND ${R_SCRIPT_COMMAND} -e "writeLines(paste('Installed 📦 hera version', as.character(packageVersion('hera'))))")
 
 # Configuration
 # =============

README.md

@@ -38,7 +38,7 @@ Then you can compile the sources (replace `$CONDA_PREFIX` with a custom installa
 prefix if need be)
 
 ```bash
-mkdir build && cd build
+mkdir build && cd build && mkdir temp_r_lib
 cmake .. -D CMAKE_PREFIX_PATH=$CONDA_PREFIX -D CMAKE_INSTALL_PREFIX=$CONDA_PREFIX -D CMAKE_INSTALL_LIBDIR=lib
 make && make install
 ```

environment-dev.yml

@@ -13,13 +13,14 @@ dependencies:
   - nlohmann_json=3.11.3
   - r-base >=4
   # Run dependencies
-  - r-rlang
+  - r-cli
   - r-evaluate
-  - r-jsonlite
   - r-glue
-  - r-cli
-  - r-repr
   - r-IRdisplay
+  - r-jsonlite
+  - r-r6
+  - r-repr
+  - r-rlang
   # Test dependencies
   - pytest
   - jupyter_kernel_test>=0.5,<0.6

environment-wasm-host.yml

@@ -18,6 +18,8 @@ dependencies:
   # Run dependencies
   - r-rlang
   - r-evaluate
+  - r-glue
+  - r-r6
   - r-jsonlite
   - r-glue
   - r-cli >=3.6.3

hera/.Rbuildignore

@@ -0,0 +1,3 @@
+^LICENSE\.md$
+^.*\.Rproj$
+^\.Rproj\.user$

hera/DESCRIPTION

@@ -0,0 +1,22 @@
+Package: hera
+Title: Companion to the 'xeus-r' 'Jupyter' kernel for R
+Version: 0.0.0.9000
+Authors@R: c(
+    person("Romain", "François", email = "[email protected]", role = c("aut", "cre"))
+  )
+Description: Set of R functions to be coupled with the xeus-r jupyter kernel for R. 
+License: MIT + file LICENSE
+Encoding: UTF-8
+Roxygen: list(markdown = TRUE)
+RoxygenNote: 7.3.2
+Imports: 
+    cli,
+    evaluate,
+    glue,
+    IRdisplay,
+    jsonlite,
+    R6,
+    repr,
+    rlang,
+    tools,
+    utils

hera/LICENSE

@@ -0,0 +1,2 @@
+YEAR: 2025
+COPYRIGHT HOLDER: Quantstack

hera/LICENSE.md

@@ -0,0 +1,21 @@
+# MIT License
+
+Copyright (c) 2025 Quantstack
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

hera/NAMESPACE

@@ -0,0 +1,17 @@
+# Generated by roxygen2: do not edit by hand
+
+export(View)
+export(clear_output)
+export(complete)
+export(display_data)
+export(is_xeusr)
+importFrom(R6,R6Class)
+importFrom(grDevices,pdf)
+importFrom(grDevices,png)
+importFrom(jsonlite,fromJSON)
+importFrom(jsonlite,toJSON)
+importFrom(jsonlite,unbox)
+importFrom(rlang,caller_env)
+importFrom(utils,capture.output)
+importFrom(utils,head)
+importFrom(utils,tail)

hera/R/00_init.R

@@ -0,0 +1,2 @@
+NAMESPACE <- environment()
+the <- NULL

hera/R/cell_options.R

@@ -0,0 +1,3 @@
+cell_options <- function(...) {
+    rlang::local_options(..., .frame = the$frame_cell_execute)
+}

share/jupyter/kernels/xr/resources/comm.R → hera/R/comm.R

@@ -1,9 +1,11 @@
+comm_target_env <- new.env()
+
 .CommManager__register_target_callback <- function(comm, request) {
     target_callback <- comm_target_env[[request$content$target_name]]
     target_callback(comm, request)
 }
 
-CommManagerClass <- R6::R6Class("CommManagerClass", 
+CommManagerClass <- R6Class("CommManagerClass",
     public = list(
         initialize = function() {
             private$targets <- new.env()
@@ -12,90 +14,90 @@ CommManagerClass <- R6::R6Class("CommManagerClass",
 
         register_comm_target = function(target_name, callback) {
             private$targets[[target_name]] <- callback
-            invisible(.Call("CommManager__register_target", target_name, PACKAGE = "(embedding)"))
-        }, 
+            invisible(hera_dot_call("CommManager__register_target", target_name, PACKAGE = "(embedding)"))
+        },
 
         unregister_comm_target = function(target_name) {
             rm(list = target_name, private$targets)
-            invisible(.Call("CommManager__unregister_target", target_name, PACKAGE = "(embedding)"))
-        }, 
+            invisible(hera_dot_call("CommManager__unregister_target", target_name))
+        },
 
         new_comm = function(target_name) {
-            xp <- .Call("CommManager__new_comm", target_name, PACKAGE = "(embedding)")
+            xp <- hera_dot_call("CommManager__new_comm", target_name)
             if (is.null(xp)) {
                 stop(glue::glue("No target '{target_name}' registered"))
             }
             Comm$new(xp = xp)
         }
-    ), 
+    ),
 
     private = list(
-        targets = NULL, 
+        targets = NULL,
         comms = NULL
     )
 )
 CommManager <- CommManagerClass$new()
 
-Comm <- R6::R6Class("Comm", 
+Comm <- R6Class("Comm",
     public = list(
         initialize = function(xp) {
             private$xp <- xp
-        }, 
+        },
 
         open = function(metadata = NULL, data = NULL) {
-            js_metadata <- jsonlite::toJSON(metadata)
-            js_data <- jsonlite::toJSON(data)
+            js_metadata <- toJSON(metadata)
+            js_data <- toJSON(data)
 
-            invisible(.Call("Comm__open", private$xp, js_metadata, js_data, PACKAGE = "(embedding)"))
-        }, 
+            invisible(hera_dot_call("Comm__open", private$xp, js_metadata, js_data))
+        },
 
         close = function(metadata = NULL, data = NULL) {
-            js_metadata <- jsonlite::toJSON(metadata)
-            js_data <- jsonlite::toJSON(data)
+            js_metadata <- toJSON(metadata)
+            js_data <- toJSON(data)
 
-            invisible(.Call("Comm__close", private$xp, js_metadata, js_data, PACKAGE = "(embedding)"))
-        }, 
+            invisible(hera_dot_call("Comm__close", private$xp, js_metadata, js_data))
+        },
 
         send = function(metadata = NULL, data = NULL) {
-            js_metadata <- jsonlite::toJSON(metadata)
-            js_data <- jsonlite::toJSON(data)
+            js_metadata <- toJSON(metadata)
+            js_data <- toJSON(data)
 
-            invisible(.Call("Comm__send", private$xp, js_metadata, js_data, PACKAGE = "(embedding)"))
-        }, 
+            invisible(hera_dot_call("Comm__send", private$xp, js_metadata, js_data))
+        },
 
         on_close = function(handler) {
             private$close_handler <- handler
-            invisible(.Call("Comm__on_close", private$xp, handler, PACKAGE = "(embedding)"))
-        }, 
+            invisible(hera_dot_call("Comm__on_close", private$xp, handler))
+        },
 
         on_message = function(handler) {
             private$message_handler <- handler
-            invisible(.Call("Comm__on_message", private$xp, handler, PACKAGE = "(embedding)"))
+            invisible(hera_dot_call("Comm__on_message", private$xp, handler))
         }
-    ), 
+    ),
 
     active = list(
         id = function() {
-            .Call("Comm__id", private$xp, PACKAGE = "(embedding)")
-        }, 
+            hera_dot_call("Comm__id", private$xp)
+        },
 
         target_name = function() {
-            .Call("Comm__target_name", private$xp, PACKAGE = "(embedding)")
+            hera_dot_call("Comm__target_name", private$xp)
         }
     ),
-    
+
     private = list(
-        xp = NULL, 
-        close_handler = NULL, 
+        xp = NULL,
+        close_handler = NULL,
         message_handler = NULL
     )
 )
 
-Message <- R6::R6Class("Message", 
+Message <- R6Class("Message",
     public = list(
         initialize = function(xp) {
             private$xp <- xp
-        }, 
+        },
 
         print = function() {
             print(cli::rule("$content"))
@@ -110,23 +112,23 @@ Message <- R6::R6Class("Message",
             print(cli::rule("$metadata"))
             str(self$metadata)
         }
-    ), 
+    ),
 
     active = list(
         content = function() {
-            jsonlite::fromJSON(.Call("Message__get_content", private$xp, PACKAGE = "(embedding)"))
-        }, 
+            fromJSON(hera_dot_call("Message__get_content", private$xp))
+        },
 
         header = function() {
-            jsonlite::fromJSON(.Call("Message__get_header", private$xp, PACKAGE = "(embedding)"))
-        }, 
+            fromJSON(hera_dot_call("Message__get_header", private$xp))
+        },
 
         parent_header = function() {
-            jsonlite::fromJSON(.Call("Message__get_parent_header", private$xp, PACKAGE = "(embedding)"))
-        }, 
+            fromJSON(hera_dot_call("Message__get_parent_header", private$xp))
+        },
 
         metadata = function() {
-            jsonlite::fromJSON(.Call("Message__get_metadata", private$xp, PACKAGE = "(embedding)"))
+            fromJSON(hera_dot_call("Message__get_metadata", private$xp))
         }
     ),
 

hera/R/completion.R

@@ -0,0 +1,51 @@
+triple_colon <- function(pkg, fun) {
+  eval(rlang::call2(":::", as.symbol(pkg), as.symbol(fun)))
+}
+
+utils___assignLineBuffer    <- triple_colon("utils", ".assignLinebuffer")
+utils___assignEnd           <- triple_colon("utils", ".assignEnd")
+utils___guessTokenFromLine  <- triple_colon("utils", ".guessTokenFromLine")
+utils___completeToken       <- triple_colon("utils", ".completeToken")
+utils___retrieveCompletions <- triple_colon("utils", ".retrieveCompletions")
+
+#' Code completion
+#'
+#' @param code R code to complete
+#' @param cursor_pos position of the cursor
+#'
+#' @return a list that contains potential completions as the first item
+#'
+#' @export
+complete <- function(code, cursor_pos = nchar(code)) {
+    # Find which line we're on and position within that line
+    lines <- strsplit(code, '\n', fixed = TRUE)[[1]]
+    chars_before_line <- 0L
+    for (line in lines) {
+        new_cursor_pos <- cursor_pos - nchar(line) - 1L # -1 for the newline
+        if (new_cursor_pos < 0L) {
+            break
+        }
+        cursor_pos <- new_cursor_pos
+        chars_before_line <- chars_before_line + nchar(line) + 1L
+    }
+
+    # guard from errors when completion is invoked in empty cells
+    if (is.null(line)) {
+        line <- ''
+    }
+
+    utils___assignLineBuffer(line)
+    utils___assignEnd(cursor_pos)
+
+    info <- utils___guessTokenFromLine(update = FALSE)
+    utils___guessTokenFromLine()
+    utils___completeToken()
+
+    start_position <- chars_before_line + info$start
+    comps <- utils___retrieveCompletions()
+
+    list(
+      comps,
+      c(start_position, start_position + nchar(info$token))
+    )
+}