Made GetParent fast. GetParent need be tested manually. GetParent and Closest test function passed.

Author: udan-jayanith

node-tree.go

@@ -115,19 +115,21 @@ func (node *Node) AppendChild(childNode *Node) {
 
 	lastNode := node.GetChildNode().GetLastNode()
 	childNode.SetPreviousNode(lastNode)
+	childNode.setParentNode(lastNode.GetParent())
 	lastNode.SetNextNode(childNode)
 }
 
 // Append inserts the newNode to end of the node chain.
 func (node *Node) Append(newNode *Node) {
 	lastNode := node.GetLastNode()
 	newNode.SetPreviousNode(lastNode)
+	newNode.setParentNode(lastNode.GetParent())
 	lastNode.SetNextNode(newNode)
 }
 
 // GetParent returns a pointer to the parent node.
 func (node *Node) GetParent() *Node {
-	return node.GetFirstNode().getParentNode()
+	return node.parentNode
 }
 
 // GetLastNode returns the last node in the node branch.

querying.go

@@ -133,7 +133,7 @@ func (node *Node) QueryAll(query string) NodeList {
 }
 
 /*
-QuerySearch tokenizes the query string and search for nodes that matches with the right most query token. After matching right most query it proceeds to match nodes parents nodes for left over tokens and then passed that node to (yield/range). QuerySearch search the whole node tree for matches unless yield get canceled or range iterator get cancel. 
+QuerySearch tokenizes the query string and search for nodes that matches with the right most query token. After matching right most query it proceeds to match nodes parents nodes for left over tokens and then passed that node to (yield/range). QuerySearch search the whole node tree for matches unless yield get canceled or range iterator get cancel.
 */
 func QuerySearch(node *Node, query string) iter.Seq[*Node] {
 	return func(yield func(node *Node) bool) {
@@ -155,8 +155,8 @@ func QuerySearch(node *Node, query string) iter.Seq[*Node] {
 			val, _ := stack.Pop()
 			sf := val.(stackFrame)
 
-			for diff := len(parentNodeStack) - sf.len; len(parentNodeStack) > 0 && diff > 0; diff-- {
-				_, parentNodeStack = pop(parentNodeStack)
+			if sf.len <= len(parentNodeStack) {
+				parentNodeStack = parentNodeStack[:sf.len]
 			}
 
 			classList := NewClassList()
@@ -169,7 +169,8 @@ func QuerySearch(node *Node, query string) iter.Seq[*Node] {
 					classList.DecodeFrom(node)
 					i = matchFromRightMostQueryToken(node, classList, queryTokens, i-1)
 				}
-				if i < 0 && !yield(sf.node){
+
+				if i < 0 && !yield(sf.node) {
 					return
 				}
 			}
@@ -183,7 +184,7 @@ func QuerySearch(node *Node, query string) iter.Seq[*Node] {
 
 			if sf.node.GetChildNode() != nil {
 				childNode := sf.node.GetChildNode()
-				parentNodeStack = append(parentNodeStack, childNode)
+				parentNodeStack = append(parentNodeStack, sf.node)
 				stack.Push(stackFrame{
 					len:  len(parentNodeStack),
 					node: childNode,
@@ -209,9 +210,9 @@ outer:
 	for i >= 0 {
 		token := queryTokens[i]
 		_, ok := checked[token.Selector]
-		if ok{
+		if ok {
 			break
-		}else{
+		} else {
 			checked[token.Selector] = struct{}{}
 		}
 
@@ -235,21 +236,21 @@ outer:
 	return i
 }
 
-//QuerySelector only returns the first node that matches with the QuerySearch.
+// QuerySelector only returns the first node that matches with the QuerySearch.
 func (node *Node) QuerySelector(query string) *Node {
 	iter := QuerySearch(node, query)
-	for node := range iter{
+	for node := range iter {
 		return node
 	}
 	return nil
 }
 
-//QuerySelectorAll stores nodes passed down by QuerySearch in a nodeList and returns the nodeList.
-func (node *Node) QuerySelectorAll(query string) NodeList{
+// QuerySelectorAll stores nodes passed down by QuerySearch in a nodeList and returns the nodeList.
+func (node *Node) QuerySelectorAll(query string) NodeList {
 	iter := QuerySearch(node, query)
 	nodeList := NewNodeList()
-	
-	for node := range iter{
+
+	for node := range iter {
 		nodeList.Append(node)
 	}
 	return nodeList

querying_test.go

@@ -188,12 +188,12 @@ func TestQueryAll(t *testing.T) {
 	}
 
 	nodeList := node.QueryAll("h2")
-	if nodeList.Len() != 2{
+	if nodeList.Len() != 2 {
 		t.Fatal("")
 	}
 }
 
-func TestQuerySelector(t *testing.T){
+func TestQuerySelector(t *testing.T) {
 	node, err := testFile4NodeTree()
 	if err != nil {
 		t.Fatal(err)
@@ -202,6 +202,37 @@ func TestQuerySelector(t *testing.T){
 	node = node.QuerySelector("html .ordered-list ol li .ordered-item")
 	if node == nil {
 		t.Fatal("Node is nill after QuerySelector")
+	} else if node.GetInnerText() != "Apple" {
+		t.Fatal("Unexpected text")
+	}
+}
+
+func TestQuerySelectorAll(t *testing.T) {
+	node, err := testFile4NodeTree()
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	nodeList := node.QuerySelectorAll(".unordered-list li")
+	if nodeList.Len() == 0 {
+		t.Fatal("Node list is empty")
+	}else if nodeList.Len() != 3{
+		t.Fatal("Extra node in the node list.", nodeList.Len())
+	}
+	stack := linkedliststack.New()
+	stack.Push("Kottue")
+	stack.Push("Pizza")
+	stack.Push("Cake")
+
+	iter := nodeList.IterNodeList()
+	for node := range iter{
+		val, _ := stack.Pop()
+		str := val.(string)
+		if node.GetInnerText() != str{
+			t.Fatal("Got unexpected text.", "Expected", str, "But got", node.GetInnerText())
+		}else{
+			t.Log(node.GetInnerText())
+		}
 	}
-	t.Log(node.GetInnerText())
 }

test-files/5.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Tricky HTML</title>
+  </head>
+  <body>
+    <div id="main" class="container highlight">
+      <section>
+        <article data-type="post" class="entry">
+          <h2>First Post</h2>
+          <p class="text">This is <span>some</span> tricky <em>HTML</em> code.</p>
+          <a href="/readmore" class="btn primary">Read More</a>
+        </article>
+
+        <article data-type="post draft" class="entry hidden">
+          <h2>Second Post (Draft)</h2>
+          <p class="text">Should be hidden but still queryable.</p>
+          <a href="#" class="btn secondary disabled">Disabled Link</a>
+        </article>
+      </section>
+
+      <ul id="list">
+        <li class="item">One</li>
+        <li class="item special">Two <span>extra</span></li>
+        <li class="item">Three</li>
+      </ul>
+
+      <form id="login" action="/login">
+        <input type="text" name="username" placeholder="User">
+        <input type="password" name="password" placeholder="Pass">
+        <button type="submit" disabled>Submit</button>
+      </form>
+    </div>
+
+    <footer>
+      <p>&copy; <span id="year">2025</span> Example</p>
+    </footer>
+  </body>
+</html>