minor tweaks

Author: earowang

R/as-tsibble.R

@@ -266,8 +266,7 @@ build_tsibble <- function(x, key = NULL, key_data = NULL, index, index2 = index,
     assert_key_data(key_data)
     key <- head(names(key_data), -1L)
   }
-  key_pos <- eval_select(enquo(key), data = x)
-  key_vars <- syms(names(x)[key_pos])
+  key_vars <- names(eval_select(enquo(key), data = x))
 
   tbl <- as_tibble(x)
   # extract or pass the index var
@@ -288,11 +287,11 @@ build_tsibble <- function(x, key = NULL, key_data = NULL, index, index2 = index,
   }
   # arrange index from past to future for each key value
   if (vec_size(tbl) == 0 || is_null(ordered)) { # first time to create a tsibble
-    tbl <- arrange(tbl, !!!key_vars, !!sym(index))
+    tbl <- arrange(tbl, !!!syms(key_vars), !!sym(index))
     ordered <- TRUE
   }
   if (!is_key_data) {
-    key_data <- group_data(group_by(tbl, !!!key_vars, .drop = .drop))
+    key_data <- group_data(grouped_df(tbl, vars = key_vars, drop = .drop))
   }
   if (!ordered) { # if false, double check
     ordered <- validate_index_order(tbl, key_data, index)
@@ -335,7 +334,7 @@ build_tsibble_meta <- function(x, key_data = NULL, index, index2,
   # convert grouped_df to tsibble:
   # the `groups` arg must be supplied, otherwise returns a `tbl_ts` not grouped
   if (idx_lgl) {
-    x <- group_by(x, !!sym(index2), .add = TRUE)
+    x <- grouped_df(x, vars = union(group_vars(x), index2))
   }
   grp_data <- x %@% "groups"
   x <- new_tibble(x,

R/tidyr-verbs.R

@@ -139,14 +139,15 @@ unnest_check_tsibble <- function(data, key, index) {
 #' Unnest a data frame consisting of tsibbles to a tsibble
 #'
 #' @description
-#' \lifecycle{questioning}
+#' \lifecycle{deprecated}
 #'
 #' @param data A data frame contains homogenous tsibbles in the list-columns.
 #' @param cols Names of columns to unnest.
 #' @inheritParams as_tsibble
 #' @keywords internal
 #' @export
 unnest_tsibble <- function(data, cols, key = NULL, validate = TRUE) {
+  # seems not working anymore
   if (!is_installed("tidyr") && utils::packageVersion("tidyr") >= "0.9.0") {
     abort("Package 'tidyr' (>= v1.0.0) required for `unnest_tsibble()`.")
   }
@@ -177,7 +178,7 @@ unnest_tsibble <- function(data, cols, key = NULL, validate = TRUE) {
     idx <- index(tsbl)
   }
 
-  key <- eval_select(enquo(key), data = unnested_data)
+  key <- names(eval_select(enquo(key), data = unnested_data))
   idx_chr <- as_string(idx)
   class(unnested_data[[idx_chr]]) <- class(tsbl[[idx_chr]])
   build_tsibble(