From 4456851c7d5b226775c258e5da28428ab5167b9c Mon Sep 17 00:00:00 2001
From: Willson Smith <me@willsonsmith.com>
Date: Fri, 7 Jun 2024 17:37:18 -0400
Subject: [PATCH 1/3] Add support to findNode to find in template elements

Copies logic from findNodes and applies it to findNode.
Extract the <template> finding logic to a shared helper function.
---
 packages/parse5-utils/src/index.js       | 34 +++++++++++++++---------
 packages/parse5-utils/test/index.test.js | 18 +++++++++++++
 2 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/packages/parse5-utils/src/index.js b/packages/parse5-utils/src/index.js
index c48fba1fc..47ee85af9 100644
--- a/packages/parse5-utils/src/index.js
+++ b/packages/parse5-utils/src/index.js
@@ -188,7 +188,7 @@ function findNode(nodes, test) {
     if (test(node)) {
       return node;
     }
-    const children = adapter.getChildNodes(/** @type {ParentNode} */ (node));
+    const children = getNodeChildren(node);
     if (Array.isArray(children)) {
       n.unshift(...children);
     }
@@ -216,18 +216,7 @@ function findNodes(nodes, test) {
       found.push(node);
     }
 
-    /** @type {Node[]} */
-    let children = [];
-
-    if (adapter.isElementNode(node) && adapter.getTagName(node) === 'template') {
-      const content = adapter.getTemplateContent(node);
-      if (content) {
-        children = adapter.getChildNodes(content);
-      }
-    } else {
-      children = adapter.getChildNodes(/** @type {ParentNode} */ (node));
-    }
-
+    const children = getNodeChildren(node);
     if (Array.isArray(children)) {
       n.unshift(...children);
     }
@@ -235,6 +224,25 @@ function findNodes(nodes, test) {
   return found;
 }
 
+/**
+ * Get all children of a node or all children of a `<template>` element's content
+ * @param {Node} node
+ * @returns {Node[]}
+ */
+function getNodeChildren(node) {
+  /** @type {Node[]} */
+  let children = [];
+  if (adapter.isElementNode(node) && adapter.getTagName(node) === 'template') {
+    const content = adapter.getTemplateContent(node);
+    if (content) {
+      children = adapter.getChildNodes(content);
+    }
+  } else {
+    children = adapter.getChildNodes(/** @type {ParentNode} */ (node));
+  }
+  return children;
+}
+
 /**
  * Looks for a child element which passes the given test
  * @param {Node[] | Node} nodes
diff --git a/packages/parse5-utils/test/index.test.js b/packages/parse5-utils/test/index.test.js
index 28db8eb7a..03ebdb986 100644
--- a/packages/parse5-utils/test/index.test.js
+++ b/packages/parse5-utils/test/index.test.js
@@ -241,6 +241,24 @@ describe('parse5-utils', () => {
       }
       expect(found).to.exist;
     });
+
+    it('returns elements within template element', () => {
+      const doc = parse(`
+      <html>
+        <body>
+          <template>
+            <div id="foo">Hello world</div>
+          </template>
+        </body>
+      </html>
+    `);
+
+      const found = utils.findElement(doc, el => utils.getAttribute(el, 'id') === 'foo');
+      if (!found) {
+        throw new Error('No elemen found.');
+      }
+      expect(found).to.exist;
+    });
   });
 
   describe('findElements()', () => {

From c04f37d3178d3ab68e83229a0fdb2f64a345db28 Mon Sep 17 00:00:00 2001
From: Willson Smith <me@willsonsmith.com>
Date: Fri, 7 Jun 2024 17:40:37 -0400
Subject: [PATCH 2/3] changeset

---
 .changeset/sour-roses-smell.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/sour-roses-smell.md

diff --git a/.changeset/sour-roses-smell.md b/.changeset/sour-roses-smell.md
new file mode 100644
index 000000000..a3f3dedef
--- /dev/null
+++ b/.changeset/sour-roses-smell.md
@@ -0,0 +1,5 @@
+---
+'@web/parse5-utils': patch
+---
+
+Adds support to findNode to find nodes within <template> elements

From 87afd9af92d53a45bee74c28f4bf4c93383bbce3 Mon Sep 17 00:00:00 2001
From: Westbrook Johnson <westbrook.johnson@gmail.com>
Date: Sun, 7 Jul 2024 09:31:39 -0400
Subject: [PATCH 3/3] Update packages/parse5-utils/test/index.test.js

---
 packages/parse5-utils/test/index.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/parse5-utils/test/index.test.js b/packages/parse5-utils/test/index.test.js
index 03ebdb986..25d30d8e5 100644
--- a/packages/parse5-utils/test/index.test.js
+++ b/packages/parse5-utils/test/index.test.js
@@ -255,7 +255,7 @@ describe('parse5-utils', () => {
 
       const found = utils.findElement(doc, el => utils.getAttribute(el, 'id') === 'foo');
       if (!found) {
-        throw new Error('No elemen found.');
+        throw new Error('No element found.');
       }
       expect(found).to.exist;
     });
