From 786eeebd81b4e496b45e83659bc0e179866cedc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Tue, 10 Nov 2026 15:25:13 +0100 Subject: [PATCH 01/18] Add function to find default environment (with clean start) --- R/utils.R | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/R/utils.R b/R/utils.R index bec2b9e42..e4f8d6b15 100644 --- a/R/utils.R +++ b/R/utils.R @@ -98,3 +98,26 @@ get_warn_message_util <- function(object, what) { paste(get_code(object), collapse = "\n") ) } + +# Searching environment by name to the default one. +default_env <- function() { + e <- .GlobalEnv + # Find which packages are loaded by default + packages <- getOption("defaultPackages", Sys.getenv("R_DEFAULT_PACKAGES", "empty")) + if (length(packages) == 1L && packages == "empty") { + env <- "pacakge::stats" + } else { + env <- paste0("package:", packages) + } + + # Iterate environments until we reach the desired environment. + # Order of env doesn't mean enviroments are loaded on that order + while (TRUE) { + if (environmentName(e) %in% env) { + break + } else { + e <- parent.env(e) + } + } + e +} From 102fdafadb7047b7aaee776a655b715d5e8e1735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Tue, 10 Nov 2026 15:26:03 +0100 Subject: [PATCH 02/18] Replace the environmnets for the default one when it makes sense --- R/qenv-c.R | 2 +- R/qenv-class.R | 2 +- R/qenv-concat.R | 2 +- R/qenv-eval_code.R | 4 ++-- R/qenv-extract.R | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/R/qenv-c.R b/R/qenv-c.R index 586f4bdaf..8f5699c9d 100644 --- a/R/qenv-c.R +++ b/R/qenv-c.R @@ -92,7 +92,7 @@ c.qenv <- function(...) { x@code <- utils::modifyList(x@code, y@code) # insert (and overwrite) objects from y to x - x@.xData <- rlang::env_clone(x@.xData, parent = parent.env(.GlobalEnv)) + x@.xData <- rlang::env_clone(x@.xData, parent = default_env()) rlang::env_coalesce(env = x@.xData, from = y@.xData) x } diff --git a/R/qenv-class.R b/R/qenv-class.R index 552082850..a0aa6a0a5 100644 --- a/R/qenv-class.R +++ b/R/qenv-class.R @@ -31,7 +31,7 @@ setMethod( "initialize", "qenv", function(.Object, .xData, code = list(), ...) { # nolint: object_name. - parent <- parent.env(.GlobalEnv) + parent <- default_env() new_xdata <- if (rlang::is_missing(.xData)) { new.env(parent = parent) } else { diff --git a/R/qenv-concat.R b/R/qenv-concat.R index 26546b7df..11f094dbe 100644 --- a/R/qenv-concat.R +++ b/R/qenv-concat.R @@ -35,7 +35,7 @@ setMethod("concat", signature = c("qenv", "qenv"), function(x, y) { y@code <- c(x@code, y@code) # insert (and overwrite) objects from y to x - y@.xData <- rlang::env_clone(y@.xData, parent = parent.env(.GlobalEnv)) + y@.xData <- rlang::env_clone(y@.xData, parent = default_env()) rlang::env_coalesce(env = y@.xData, from = x@.xData) y }) diff --git a/R/qenv-eval_code.R b/R/qenv-eval_code.R index 76a48258c..96d5307c5 100644 --- a/R/qenv-eval_code.R +++ b/R/qenv-eval_code.R @@ -52,8 +52,8 @@ setMethod("eval_code", signature = c(object = "qenv.error"), function(object, co old <- evaluate::inject_funs( library = function(...) { x <- library(...) - if (!identical(parent.env(object@.xData), parent.env(.GlobalEnv))) { - parent.env(object@.xData) <- parent.env(.GlobalEnv) + if (!identical(parent.env(object@.xData), .GlobalEnv)) { + parent.env(object@.xData) <- .GlobalEnv } invisible(x) } diff --git a/R/qenv-extract.R b/R/qenv-extract.R index 48c63d2a5..29649b043 100644 --- a/R/qenv-extract.R +++ b/R/qenv-extract.R @@ -32,7 +32,7 @@ ) ) } - list2env(as.list(x, all.names = TRUE)[names_corrected], parent = parent.env(.GlobalEnv)) + list2env(as.list(x, all.names = TRUE)[names_corrected], parent = default_env()) } else { warning( sprintf( @@ -41,7 +41,7 @@ ), call. = FALSE ) - new.env(parent = parent.env(.GlobalEnv)) + new.env(parent = default_env()) } lockEnvironment(env) x@.xData <- env From 49b83d1a973b01c256064271bb71d16284ba4540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Tue, 10 Nov 2026 15:30:12 +0100 Subject: [PATCH 03/18] Add tests --- tests/testthat/test-qenv_constructor.R | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index f7dd22ca4..4bb1ad094 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -57,11 +57,27 @@ test_that("constructor returns qenv", { describe("parent of qenv environment is the parent of .GlobalEnv", { it("via slot", { q <- qenv() - expect_identical(parent.env(q@.xData), parent.env(.GlobalEnv)) + expect_identical(parent.env(q@.xData), default_env()) }) it("via qenv directly", { q <- qenv() - expect_identical(parent.env(q), parent.env(.GlobalEnv)) + expect_identical(parent.env(q), default_env()) + }) + + it("and requires libraries call inside qenv", { + expect_s3_class(within(qenv(), {ADSL <- tmc_ex_adsl}), "qenv.error") + skip_if_not_installed("teal.modules.clinical") + library("teal.modules.clinical") + expect_s3_class(within(qenv(), {ADSL <- tmc_ex_adsl}), "qenv.error") + }) + + it("library call inside qenv works", { + skip_if_not_installed("teal.modules.clinical") + expect_s4_class(within(qenv(), { + library("teal.modules.clinical") + ADSL <- tmc_ex_adsl}), + "qenv") }) }) + From 8ce829cb53ed82886f37c45acce2958969f9331e Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 10 Nov 2026 14:45:27 +0000 Subject: [PATCH 04/18] [skip style] [skip vbump] Restyle files --- tests/testthat/test-qenv_constructor.R | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index 4bb1ad094..fcfe3f155 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -66,18 +66,24 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { }) it("and requires libraries call inside qenv", { - expect_s3_class(within(qenv(), {ADSL <- tmc_ex_adsl}), "qenv.error") + expect_s3_class(within(qenv(), { + ADSL <- tmc_ex_adsl + }), "qenv.error") skip_if_not_installed("teal.modules.clinical") library("teal.modules.clinical") - expect_s3_class(within(qenv(), {ADSL <- tmc_ex_adsl}), "qenv.error") + expect_s3_class(within(qenv(), { + ADSL <- tmc_ex_adsl + }), "qenv.error") }) it("library call inside qenv works", { skip_if_not_installed("teal.modules.clinical") - expect_s4_class(within(qenv(), { - library("teal.modules.clinical") - ADSL <- tmc_ex_adsl}), - "qenv") + expect_s4_class( + within(qenv(), { + library("teal.modules.clinical") + ADSL <- tmc_ex_adsl + }), + "qenv" + ) }) }) - From 7963ad7aadd2a232fa6cad7d19df67c2e2d27ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Thu, 12 Nov 2026 11:46:10 +0100 Subject: [PATCH 05/18] Clonse without setting parent environment --- R/qenv-concat.R | 2 +- R/qenv-eval_code.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/R/qenv-concat.R b/R/qenv-concat.R index 11f094dbe..2ca51b5f3 100644 --- a/R/qenv-concat.R +++ b/R/qenv-concat.R @@ -35,7 +35,7 @@ setMethod("concat", signature = c("qenv", "qenv"), function(x, y) { y@code <- c(x@code, y@code) # insert (and overwrite) objects from y to x - y@.xData <- rlang::env_clone(y@.xData, parent = default_env()) + y@.xData <- rlang::env_clone(y@.xData) rlang::env_coalesce(env = y@.xData, from = x@.xData) y }) diff --git a/R/qenv-eval_code.R b/R/qenv-eval_code.R index 96d5307c5..03a996284 100644 --- a/R/qenv-eval_code.R +++ b/R/qenv-eval_code.R @@ -46,7 +46,7 @@ setMethod("eval_code", signature = c(object = "qenv.error"), function(object, co } code <- paste(split_code(code), collapse = "\n") - object@.xData <- rlang::env_clone(object@.xData, parent = parent.env(object@.xData)) + object@.xData <- rlang::env_clone(object@.xData) parsed_code <- parse(text = code, keep.source = TRUE, encoding = "UTF-8") old <- evaluate::inject_funs( From 031ac98aebbe377d47a87121cbc893cdb789aca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Thu, 12 Nov 2026 12:28:06 +0100 Subject: [PATCH 06/18] Add additional tests --- tests/testthat/test-qenv_constructor.R | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index 4bb1ad094..b8ceed71f 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -79,5 +79,27 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { ADSL <- tmc_ex_adsl}), "qenv") }) + + it("but doesn't mess up with library calls", { + skip_if_not_installed("dplyr") + expect_s3_class(within(qenv(), { + library(teal.data) + t <- tibble() + }), "qenv.error") + + library(dplyr) + + expect_s3_class(within(qenv(), { + library(teal.data) + t <- tibble() + }), "qenv.error") + + expect_s4_class(q <- within(qenv(), { + library(teal.data) + ADSL <- rADSL + }), "qenv") + + expect_s3_class(within(q, t <- tibble()), "qenv.error") + }) }) From a8a858fc1c372d852c71f2f92c5dcd2baa180099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Thu, 12 Nov 2026 13:02:42 +0100 Subject: [PATCH 07/18] Remove some duplicate tests and avoid lintr issues --- R/utils.R | 19 +++++++++++++++++++ tests/testthat/test-qenv_constructor.R | 22 ++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/R/utils.R b/R/utils.R index e4f8d6b15..93cd0665b 100644 --- a/R/utils.R +++ b/R/utils.R @@ -121,3 +121,22 @@ default_env <- function() { } e } + +env_names <- function() { + e <- environment() + a <- vector("character", 0) + + packages <- getOption("defaultPackages", Sys.getenv("R_DEFAULT_PACKAGES", "empty")) + if (length(packages) == 1L && packages == "empty") { + env <- "pacakge::stats" + } else { + env <- paste0("package:", packages) + } + + while (TRUE) { + a[length(a) + 1] <- environmentName(e) + e <- parent.env(e) + if (environmentName(e) %in% env) break + } + cat(a, sep = ", ", file = stderr()) +} diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index b8ceed71f..337040eb6 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -65,22 +65,7 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { expect_identical(parent.env(q), default_env()) }) - it("and requires libraries call inside qenv", { - expect_s3_class(within(qenv(), {ADSL <- tmc_ex_adsl}), "qenv.error") - skip_if_not_installed("teal.modules.clinical") - library("teal.modules.clinical") - expect_s3_class(within(qenv(), {ADSL <- tmc_ex_adsl}), "qenv.error") - }) - - it("library call inside qenv works", { - skip_if_not_installed("teal.modules.clinical") - expect_s4_class(within(qenv(), { - library("teal.modules.clinical") - ADSL <- tmc_ex_adsl}), - "qenv") - }) - - it("but doesn't mess up with library calls", { + it("but doesn't mess up with library calls outside qenv", { skip_if_not_installed("dplyr") expect_s3_class(within(qenv(), { library(teal.data) @@ -93,13 +78,14 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { library(teal.data) t <- tibble() }), "qenv.error") + }) + it("but doesn't mess up with library calls inside qenv", { expect_s4_class(q <- within(qenv(), { library(teal.data) - ADSL <- rADSL + ADSL <- rADSL # nolint: object_name_linter. }), "qenv") expect_s3_class(within(q, t <- tibble()), "qenv.error") }) }) - From 016e3be197a058b239b74fb632fa8feef01e32ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Thu, 12 Nov 2026 13:32:04 +0100 Subject: [PATCH 08/18] Remove more usages or default_env as they might mess with the library call --- R/qenv-c.R | 2 +- R/qenv-extract.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/R/qenv-c.R b/R/qenv-c.R index 8f5699c9d..c3fd18ee6 100644 --- a/R/qenv-c.R +++ b/R/qenv-c.R @@ -92,7 +92,7 @@ c.qenv <- function(...) { x@code <- utils::modifyList(x@code, y@code) # insert (and overwrite) objects from y to x - x@.xData <- rlang::env_clone(x@.xData, parent = default_env()) + x@.xData <- rlang::env_clone(x@.xData) rlang::env_coalesce(env = x@.xData, from = y@.xData) x } diff --git a/R/qenv-extract.R b/R/qenv-extract.R index 29649b043..eb2d9e91a 100644 --- a/R/qenv-extract.R +++ b/R/qenv-extract.R @@ -32,7 +32,7 @@ ) ) } - list2env(as.list(x, all.names = TRUE)[names_corrected], parent = default_env()) + list2env(as.list(x, all.names = TRUE)[names_corrected], parent = x@.xData) } else { warning( sprintf( From 62197dacf7c6563d196d4915669456694c71ffcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Thu, 12 Nov 2026 13:40:33 +0100 Subject: [PATCH 09/18] Fix typo --- R/utils.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/utils.R b/R/utils.R index 93cd0665b..09d50c92c 100644 --- a/R/utils.R +++ b/R/utils.R @@ -105,7 +105,7 @@ default_env <- function() { # Find which packages are loaded by default packages <- getOption("defaultPackages", Sys.getenv("R_DEFAULT_PACKAGES", "empty")) if (length(packages) == 1L && packages == "empty") { - env <- "pacakge::stats" + env <- "pacakge:stats" } else { env <- paste0("package:", packages) } @@ -128,7 +128,7 @@ env_names <- function() { packages <- getOption("defaultPackages", Sys.getenv("R_DEFAULT_PACKAGES", "empty")) if (length(packages) == 1L && packages == "empty") { - env <- "pacakge::stats" + env <- "pacakge:base" } else { env <- paste0("package:", packages) } From 99a0f69cc8f898bc27f39d323d264aea982630ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Thu, 12 Nov 2026 14:09:08 +0100 Subject: [PATCH 10/18] Clean up --- R/qenv-extract.R | 1 + R/utils.R | 19 ------------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/R/qenv-extract.R b/R/qenv-extract.R index eb2d9e91a..b69b10a71 100644 --- a/R/qenv-extract.R +++ b/R/qenv-extract.R @@ -41,6 +41,7 @@ ), call. = FALSE ) + # Ensures that an empty environment is returned new.env(parent = default_env()) } lockEnvironment(env) diff --git a/R/utils.R b/R/utils.R index 09d50c92c..da292f63b 100644 --- a/R/utils.R +++ b/R/utils.R @@ -121,22 +121,3 @@ default_env <- function() { } e } - -env_names <- function() { - e <- environment() - a <- vector("character", 0) - - packages <- getOption("defaultPackages", Sys.getenv("R_DEFAULT_PACKAGES", "empty")) - if (length(packages) == 1L && packages == "empty") { - env <- "pacakge:base" - } else { - env <- paste0("package:", packages) - } - - while (TRUE) { - a[length(a) + 1] <- environmentName(e) - e <- parent.env(e) - if (environmentName(e) %in% env) break - } - cat(a, sep = ", ", file = stderr()) -} From 9de5161dbe53d555dbfcd50c6a6712c4f3883a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Fri, 13 Nov 2026 16:49:03 +0100 Subject: [PATCH 11/18] Replace teal.data by knitr --- tests/testthat/test-qenv_constructor.R | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index 337040eb6..85680f175 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -67,23 +67,25 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { it("but doesn't mess up with library calls outside qenv", { skip_if_not_installed("dplyr") + skip_if_not_installed("knitr") expect_s3_class(within(qenv(), { - library(teal.data) + library(knitr) t <- tibble() }), "qenv.error") library(dplyr) expect_s3_class(within(qenv(), { - library(teal.data) + library(knitr) t <- tibble() }), "qenv.error") }) it("but doesn't mess up with library calls inside qenv", { + skip_if_not_installed("knitr") expect_s4_class(q <- within(qenv(), { - library(teal.data) - ADSL <- rADSL # nolint: object_name_linter. + library(knitr) + labels <- knitr::all_labels() }), "qenv") expect_s3_class(within(q, t <- tibble()), "qenv.error") From c7f17db4b5bc550b06b1b1bb3f05353aaac803e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Mon, 16 Nov 2026 12:04:30 +0100 Subject: [PATCH 12/18] Simplify to .GlobalEnv --- R/qenv-class.R | 2 +- R/qenv-extract.R | 2 +- R/utils.R | 24 ++---------------------- tests/testthat/test-qenv_constructor.R | 24 +++--------------------- 4 files changed, 7 insertions(+), 45 deletions(-) diff --git a/R/qenv-class.R b/R/qenv-class.R index a0aa6a0a5..74f325ea7 100644 --- a/R/qenv-class.R +++ b/R/qenv-class.R @@ -31,7 +31,7 @@ setMethod( "initialize", "qenv", function(.Object, .xData, code = list(), ...) { # nolint: object_name. - parent <- default_env() + parent <- default_env new_xdata <- if (rlang::is_missing(.xData)) { new.env(parent = parent) } else { diff --git a/R/qenv-extract.R b/R/qenv-extract.R index b69b10a71..b6180187d 100644 --- a/R/qenv-extract.R +++ b/R/qenv-extract.R @@ -42,7 +42,7 @@ call. = FALSE ) # Ensures that an empty environment is returned - new.env(parent = default_env()) + new.env(parent = default_env) } lockEnvironment(env) x@.xData <- env diff --git a/R/utils.R b/R/utils.R index da292f63b..ac624c4db 100644 --- a/R/utils.R +++ b/R/utils.R @@ -99,25 +99,5 @@ get_warn_message_util <- function(object, what) { ) } -# Searching environment by name to the default one. -default_env <- function() { - e <- .GlobalEnv - # Find which packages are loaded by default - packages <- getOption("defaultPackages", Sys.getenv("R_DEFAULT_PACKAGES", "empty")) - if (length(packages) == 1L && packages == "empty") { - env <- "pacakge:stats" - } else { - env <- paste0("package:", packages) - } - - # Iterate environments until we reach the desired environment. - # Order of env doesn't mean enviroments are loaded on that order - while (TRUE) { - if (environmentName(e) %in% env) { - break - } else { - e <- parent.env(e) - } - } - e -} +# Setting a default environment +default_env <- .GlobalEnv diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index 85680f175..60e584457 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -57,37 +57,19 @@ test_that("constructor returns qenv", { describe("parent of qenv environment is the parent of .GlobalEnv", { it("via slot", { q <- qenv() - expect_identical(parent.env(q@.xData), default_env()) + expect_identical(parent.env(q@.xData), .GlobalEnv) }) it("via qenv directly", { q <- qenv() - expect_identical(parent.env(q), default_env()) - }) - - it("but doesn't mess up with library calls outside qenv", { - skip_if_not_installed("dplyr") - skip_if_not_installed("knitr") - expect_s3_class(within(qenv(), { - library(knitr) - t <- tibble() - }), "qenv.error") - - library(dplyr) - - expect_s3_class(within(qenv(), { - library(knitr) - t <- tibble() - }), "qenv.error") + expect_identical(parent.env(q), .GlobalEnv) }) it("but doesn't mess up with library calls inside qenv", { skip_if_not_installed("knitr") expect_s4_class(q <- within(qenv(), { library(knitr) - labels <- knitr::all_labels() + labels <- knitr::all_labels() }), "qenv") - - expect_s3_class(within(q, t <- tibble()), "qenv.error") }) }) From e2bf5c7c57e07cb82132cce0b0fc482c39c92e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Mon, 16 Nov 2026 16:48:50 +0100 Subject: [PATCH 13/18] Use parent.env --- R/qenv-class.R | 5 ++--- tests/testthat/test-qenv_constructor.R | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/R/qenv-class.R b/R/qenv-class.R index 74f325ea7..3025ba0f8 100644 --- a/R/qenv-class.R +++ b/R/qenv-class.R @@ -31,12 +31,11 @@ setMethod( "initialize", "qenv", function(.Object, .xData, code = list(), ...) { # nolint: object_name. - parent <- default_env new_xdata <- if (rlang::is_missing(.xData)) { - new.env(parent = parent) + new.env(parent = parent.env(default_env)) } else { checkmate::assert_environment(.xData) - rlang::env_clone(.xData, parent = parent) + .xData } lockEnvironment(new_xdata, bindings = TRUE) diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index 60e584457..e7b6a2ab2 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -57,12 +57,12 @@ test_that("constructor returns qenv", { describe("parent of qenv environment is the parent of .GlobalEnv", { it("via slot", { q <- qenv() - expect_identical(parent.env(q@.xData), .GlobalEnv) + expect_identical(parent.env(q@.xData), parent.env(.GlobalEnv)) }) it("via qenv directly", { q <- qenv() - expect_identical(parent.env(q), .GlobalEnv) + expect_identical(parent.env(q), parent.env(.GlobalEnv)) }) it("but doesn't mess up with library calls inside qenv", { @@ -72,4 +72,16 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { labels <- knitr::all_labels() }), "qenv") }) + + + it("with the right environment", { + c <- 5 + q <- qenv() |> within(aa <- 2) + q2 <- q |> within(1 + 1) + + expect_identical(get("c", envir = q), base::c) + + parent.env(q2@.xData) <- parent.env(.GlobalEnv) + expect_identical(get("c", envir = q2), base::c) + }) }) From 588cc2bd341740b5a632b45cdc57956c23b95c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Tue, 17 Nov 2026 14:11:10 +0100 Subject: [PATCH 14/18] Add tests to cover more corner cases of environments and assignment or subsetting --- tests/testthat/test-qenv_constructor.R | 37 ++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index e7b6a2ab2..52c385ca5 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -73,6 +73,24 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { }), "qenv") }) + it("cannot get variable after subsetting", { + q <- qenv() |> within({ + a <- 2 + b <- 3 + }) + q2 <- q["a"] + expect_error(get("b", envir = q2), "not found") + }) + + it("does not change the original environment when used to create", { + e <- list2env(list(a = 2)) + q <- new("qenv", .xData = e) + expect_no_error(e$b <- 3) + expect_no_error(e$a <- 3) + expect_equal(q$a, 2) + expect_equal(b$a, 3) + }) + it("with the right environment", { c <- 5 @@ -84,4 +102,23 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { parent.env(q2@.xData) <- parent.env(.GlobalEnv) expect_identical(get("c", envir = q2), base::c) }) + + it("does not get variables from global environment", { + .GlobalEnv$a_variable <- 99 + q <- qenv() |> within({ + some_variable <- 42 + }) + expect_error(get("a_variable", envir = q), "not found") + rm("a_variable", envir = .GlobalEnv) + }) + + it("does not get variables from current environment", { + a_variable <- 99 + q <- qenv() |> within({ + some_variable <- 42 + }) + expect_error(get("a_variable", envir = q), "not found") + rm("a_variable") + }) + }) From a05331704d807a274e1d6d8519228312e493ca49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Tue, 17 Nov 2026 14:15:13 +0100 Subject: [PATCH 15/18] Revert environment changes --- R/qenv-class.R | 5 +++-- R/qenv-eval_code.R | 4 ++-- R/qenv-extract.R | 6 ++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/R/qenv-class.R b/R/qenv-class.R index 3025ba0f8..3f83dca83 100644 --- a/R/qenv-class.R +++ b/R/qenv-class.R @@ -31,11 +31,12 @@ setMethod( "initialize", "qenv", function(.Object, .xData, code = list(), ...) { # nolint: object_name. + parent <- parent.env(default_env) new_xdata <- if (rlang::is_missing(.xData)) { - new.env(parent = parent.env(default_env)) + new.env(parent = parent) } else { checkmate::assert_environment(.xData) - .xData + rlang::env_clone(.xData, parent = parent) } lockEnvironment(new_xdata, bindings = TRUE) diff --git a/R/qenv-eval_code.R b/R/qenv-eval_code.R index 03a996284..29f038d57 100644 --- a/R/qenv-eval_code.R +++ b/R/qenv-eval_code.R @@ -52,8 +52,8 @@ setMethod("eval_code", signature = c(object = "qenv.error"), function(object, co old <- evaluate::inject_funs( library = function(...) { x <- library(...) - if (!identical(parent.env(object@.xData), .GlobalEnv)) { - parent.env(object@.xData) <- .GlobalEnv + if (!identical(parent.env(object@.xData), parent.env(default_env))) { + parent.env(object@.xData) <- parent.env(default_env) } invisible(x) } diff --git a/R/qenv-extract.R b/R/qenv-extract.R index b6180187d..24cc51835 100644 --- a/R/qenv-extract.R +++ b/R/qenv-extract.R @@ -21,6 +21,8 @@ checkmate::assert_character(names, any.missing = FALSE) possible_names <- ls(get_env(x), all.names = TRUE) names_corrected <- intersect(names, possible_names) + parent <- parent.env(default_env) + env <- if (length(names_corrected)) { names_missing <- setdiff(names, possible_names) if (length(names_missing)) { @@ -32,7 +34,7 @@ ) ) } - list2env(as.list(x, all.names = TRUE)[names_corrected], parent = x@.xData) + list2env(as.list(x, all.names = TRUE)[names_corrected], parent = parent) } else { warning( sprintf( @@ -42,7 +44,7 @@ call. = FALSE ) # Ensures that an empty environment is returned - new.env(parent = default_env) + new.env(parent = parent) } lockEnvironment(env) x@.xData <- env From f32e4b50fc6ff376f46b2cf4741cf0c77aaee7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Tue, 17 Nov 2026 14:17:58 +0100 Subject: [PATCH 16/18] Fix test --- tests/testthat/test-qenv_constructor.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index 52c385ca5..49384cf76 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -88,7 +88,7 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { expect_no_error(e$b <- 3) expect_no_error(e$a <- 3) expect_equal(q$a, 2) - expect_equal(b$a, 3) + expect_equal(e$a, 3) }) From 04fe1aeb4b6146d7fce90704c71349286cb3f92b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Tue, 17 Nov 2026 14:20:41 +0100 Subject: [PATCH 17/18] Fix style --- R/qenv-eval_code.R | 4 ++-- tests/testthat/test-qenv_constructor.R | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/R/qenv-eval_code.R b/R/qenv-eval_code.R index 29f038d57..97cb03d56 100644 --- a/R/qenv-eval_code.R +++ b/R/qenv-eval_code.R @@ -52,8 +52,8 @@ setMethod("eval_code", signature = c(object = "qenv.error"), function(object, co old <- evaluate::inject_funs( library = function(...) { x <- library(...) - if (!identical(parent.env(object@.xData), parent.env(default_env))) { - parent.env(object@.xData) <- parent.env(default_env) + if (!identical(parent.env(object@.xData), parent.env(default_env))) { + parent.env(object@.xData) <- parent.env(default_env) } invisible(x) } diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index 49384cf76..7fc9ca79c 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -120,5 +120,4 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { expect_error(get("a_variable", envir = q), "not found") rm("a_variable") }) - }) From 44cb3bbce7bd995ca1c6c11bacab27e01f77353b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Wed, 18 Nov 2026 12:58:01 +0100 Subject: [PATCH 18/18] Fix lintr --- tests/testthat/test-qenv_constructor.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/test-qenv_constructor.R b/tests/testthat/test-qenv_constructor.R index 7fc9ca79c..fc69b6f78 100644 --- a/tests/testthat/test-qenv_constructor.R +++ b/tests/testthat/test-qenv_constructor.R @@ -104,7 +104,7 @@ describe("parent of qenv environment is the parent of .GlobalEnv", { }) it("does not get variables from global environment", { - .GlobalEnv$a_variable <- 99 + .GlobalEnv$a_variable <- 99 # nolintr object_name_linter. q <- qenv() |> within({ some_variable <- 42 })