refactor: several updates to dsl.rs

DESCRIPTION

@@ -118,5 +118,5 @@ Collate:
     'zzz.R'
 Config/rextendr/version: 0.3.1
 VignetteBuilder: knitr
-Config/polars/LibVersion: 0.39.3
+Config/polars/LibVersion: 0.39.4
 Config/polars/RustToolchainVersion: nightly-2024-04-15

R/expr__datetime.R

@@ -535,21 +535,20 @@ ExprDT_nanosecond = function() {
 #' as_polars_series(as.Date("2022-1-1"))$dt$epoch("d")
 ExprDT_epoch = function(tu = c("us", "ns", "ms", "s", "d")) {
   tu = tu[1]
+  uw = \(res) unwrap(res, "in $dt$epoch:")
 
   # experimental rust-like error handling on R side for the fun of it, sorry
   # jokes aside here the use case is to tie various rust functions together
   # and add context to the error messages
-  expr_result = pcase(
-    !is_string(tu), Err("tu must be a string"),
-    tu %in% c("ms", "us", "ns"), .pr$Expr$timestamp(self, tu),
-    tu == "s", Ok(.pr$Expr$dt_epoch_seconds(self)),
-    tu == "d", Ok(self$cast(pl$Date)$cast(pl$Int32)),
+  pcase(
+    !is_string(tu), Err("tu must be a string") |> uw(),
+    tu %in% c("ms", "us", "ns"), .pr$Expr$dt_timestamp(self, tu) |> uw(),
+    tu == "s", .pr$Expr$dt_epoch_seconds(self),
+    tu == "d", self$cast(pl$Date)$cast(pl$Int32),
     or_else = Err(
       paste("tu must be one of 'ns', 'us', 'ms', 's', 'd', got", str_string(tu))
-    )
-  ) |> map_err(\(err) paste("in $dt$epoch:", err))
-
-  unwrap(expr_result)
+    ) |> uw()
+  )
 }
 
 
@@ -574,7 +573,7 @@ ExprDT_epoch = function(tu = c("us", "ns", "ms", "s", "d")) {
 #'   pl$col("date")$dt$timestamp(tu = "ms")$alias("timestamp_ms")
 #' )
 ExprDT_timestamp = function(tu = c("ns", "us", "ms")) {
-  .pr$Expr$timestamp(self, tu[1]) |>
+  .pr$Expr$dt_timestamp(self, tu[1]) |>
     map_err(\(err) paste("in $dt$timestamp:", err)) |>
     unwrap()
 }

R/expr__meta.R

@@ -81,7 +81,7 @@ ExprMeta_pop = function() {
 #' e = (pl$col("alice") + pl$col("eve"))$alias("bob")
 #' e$meta$root_names()
 ExprMeta_root_names = function() {
-  .pr$Expr$meta_roots(self)
+  .pr$Expr$meta_root_names(self)
 }
 
 

R/extendr-wrappers.R

@@ -604,7 +604,7 @@ RPolarsExpr$rolling_median <- function(window_size, weights, min_periods, center
 
 RPolarsExpr$rolling_quantile <- function(quantile, interpolation, window_size, weights, min_periods, center, by, closed, warn_if_unsorted) .Call(wrap__RPolarsExpr__rolling_quantile, self, quantile, interpolation, window_size, weights, min_periods, center, by, closed, warn_if_unsorted)
 
-RPolarsExpr$rolling_skew <- function(window_size_f, bias) .Call(wrap__RPolarsExpr__rolling_skew, self, window_size_f, bias)
+RPolarsExpr$rolling_skew <- function(window_size, bias) .Call(wrap__RPolarsExpr__rolling_skew, self, window_size, bias)
 
 RPolarsExpr$abs <- function() .Call(wrap__RPolarsExpr__abs, self)
 
@@ -820,7 +820,7 @@ RPolarsExpr$dt_microsecond <- function() .Call(wrap__RPolarsExpr__dt_microsecond
 
 RPolarsExpr$dt_nanosecond <- function() .Call(wrap__RPolarsExpr__dt_nanosecond, self)
 
-RPolarsExpr$timestamp <- function(tu) .Call(wrap__RPolarsExpr__timestamp, self, tu)
+RPolarsExpr$dt_timestamp <- function(tu) .Call(wrap__RPolarsExpr__dt_timestamp, self, tu)
 
 RPolarsExpr$dt_epoch_seconds <- function() .Call(wrap__RPolarsExpr__dt_epoch_seconds, self)
 
@@ -1096,7 +1096,7 @@ RPolarsExpr$meta_pop <- function() .Call(wrap__RPolarsExpr__meta_pop, self)
 
 RPolarsExpr$meta_eq <- function(other) .Call(wrap__RPolarsExpr__meta_eq, self, other)
 
-RPolarsExpr$meta_roots <- function() .Call(wrap__RPolarsExpr__meta_roots, self)
+RPolarsExpr$meta_root_names <- function() .Call(wrap__RPolarsExpr__meta_root_names, self)
 
 RPolarsExpr$meta_output_name <- function() .Call(wrap__RPolarsExpr__meta_output_name, self)
 

src/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "r-polars"
-version = "0.39.3"
+version = "0.39.4"
 edition = "2021"
 rust-version = "1.76.0"
 publish = false