Merge branch 'vctrs-vec-restore'

Author: earowang

NAMESPACE

@@ -164,6 +164,7 @@ S3method(vec_cast,tbl_ts.tbl_ts)
 S3method(vec_cast,yearmonth.yearmonth)
 S3method(vec_cast,yearquarter.yearquarter)
 S3method(vec_cast,yearweek.yearweek)
+S3method(vec_proxy,tbl_ts)
 S3method(vec_ptype2,Date.yearmonth)
 S3method(vec_ptype2,Date.yearquarter)
 S3method(vec_ptype2,Date.yearweek)
@@ -187,6 +188,7 @@ S3method(vec_ptype2,yearweek.yearweek)
 S3method(vec_ptype_abbr,yearmonth)
 S3method(vec_ptype_abbr,yearquarter)
 S3method(vec_ptype_abbr,yearweek)
+S3method(vec_restore,tbl_ts)
 S3method(year,yearweek)
 S3method(yearmonth,"NULL")
 S3method(yearmonth,Date)

R/gaps.R

@@ -132,14 +132,14 @@ scan_gaps.tbl_ts <- function(.data, .full = FALSE) {
     sum_data <- summarise(keyed_tbl,
       !!idx_chr := list2(tibble(!!idx_chr := seq_generator(!!idx, int)))
     )
-  } else if (.full == sym("start()")) {
+  } else if (.full == expr("start()")) {
     start <- min(keyed_tbl[[idx_chr]])
     sum_data <- summarise(keyed_tbl,
       !!idx_chr := list2(tibble(
         !!idx_chr := seq_generator(c(start, max(!!idx)), int)
       ))
     )
-  } else if (.full == sym("end()")) {
+  } else if (.full == expr("end()")) {
     end <- max(keyed_tbl[[idx_chr]])
     sum_data <- summarise(keyed_tbl,
       !!idx_chr := list2(tibble(

R/new-data.R

@@ -54,7 +54,7 @@ new_data.tbl_ts <- function(.data, n = 1L, keep_all = FALSE, ...) {
 
   out <- unwrap(ungroup(new_lst), .col = !!idx)
   if (keep_all) {
-    out <- vec_rbind(.data[0L, ], out)
+    out <- vec_rbind(new_data_frame(.data[0L, ]), out)
   } else { # reorder column names according to the data input
     out <- out[setdiff(names(.data), measured_vars(.data))]
   }
@@ -86,7 +86,7 @@ append_row <- function(.data, n = 1L, ...) {
 #' @export
 append_row.tbl_ts <- function(.data, n = 1L, ...) {
   new_data <- new_data(.data, n = n)
-  out <- vec_rbind(.data, new_data)
+  out <- vec_rbind(as_tibble(.data), as_tibble(new_data))
   ord <- is_ordered(.data)
   if (ord) ord <- NULL # re-order
   update_meta(out, .data, ordered = ord, interval = interval(.data))

R/vctrs-tsibble.R

@@ -89,3 +89,16 @@ vec_cast.tbl_df.tbl_ts <- function(x, to, ...) {
 vec_cast.data.frame.tbl_ts <- function(x, to, ...) {
   df_cast(x, to, ...)
 }
+
+#' @export
+vec_restore.tbl_ts <- function(x, to, ..., n = NULL) {
+  # assuming `i` in order and no duplicates, minimal check for performance reason
+  build_tsibble(x,
+    key = key_vars(to), index = index_var(to), index2 = index2_var(to),
+    ordered = TRUE, validate = FALSE, .drop = key_drop_default(to))
+}
+
+#' @export
+vec_proxy.tbl_ts <- function(x, ...) {
+  new_data_frame(x)
+}