tagQuery(): Relocate html deps to child objects

NEWS.md

@@ -2,6 +2,8 @@
 
 ## Bug fixes
 
+* Closed #301: `tagQuery()` was failing to copy all `tagList()` html dependencies within nest child tag lists. (#302)
+
 * Closed #290: htmltools previously did not specify which version of fastmap to use, and would fail to install with an old version of fastmap. (#291)
 
 * `copyDependencyToDir()` no longer creates empty directories for dependencies that do not have any files. (@gadenbuie, #276)

R/tags.R

@@ -1289,9 +1289,18 @@ flattenTagsRaw <- function(x) {
       x
     } else {
       # For items that are lists (but not tags), recurse
-      ret <- unlist(lapply(x, flattenTagsRaw), recursive = FALSE)
+      flattened_tags <- lapply(x, flattenTagsRaw)
+      ret <- unlist(flattened_tags, recursive = FALSE)
       # Copy over attributes put on the original list (ex: html deps)
       mostattributes(ret) <- attributes(x)
+
+      # Copy over individual html deps into the final list from the flattened tags
+      # This does not work for attributes in general,
+      # but we can make it work for html deps
+      x_html_deps <- unlist(lapply(flattened_tags, htmlDependencies), recursive = FALSE)
+      if (length(x_html_deps) > 0) {
+        ret <- attachDependencies(ret, x_html_deps, append = TRUE)
+      }
       ret
     }
   } else {

tests/testthat/test-tag-query.R

@@ -842,6 +842,30 @@ test_that("adding a class does not reorder attribs", {
   )
 })
 
+test_that("tag list html deps are not lost when tag children are squashed", {
+  # https://github.com/rstudio/htmltools/issues/301
+
+  a_dep <- htmlDependency(name = "A", version = 1, src = "a.js")
+  b_dep <- htmlDependency(name = "B", version = 2, src = "b.js")
+  c_dep <- htmlDependency(name = "C", version = 3, src = "c.js")
+
+  children <-
+    attachDependencies(
+      list(
+        attachDependencies(list("X", "Y"), a_dep),
+        "Z"
+      ),
+      list(b_dep, c_dep)
+    )
+
+  html <- div("test", children)
+  tq_html <- tagQuery(html)$allTags()
+
+  tq_deps <- findDependencies(tq_html$children)
+  expect_length(tq_deps, 3)
+  expect_equal(tq_deps, list(b_dep, c_dep, a_dep))
+})
+