Bug fixes

Author: udan-jayanith

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
 	"cSpell.words": [
+		"arraystack",
 		"autoplay",
 		"Combinators",
 		"DOCTYPEDTD",

FUTURE-CHANGELOG.md

@@ -1,2 +1,3 @@
 ## v0.0.3
-- Combinators
+- Write test for (closest, QuerySelector, QuerySelectorAll)
+- Serializer bug fix

node-tree.go

@@ -207,18 +207,9 @@ func (node *Node) IsTextNode() bool {
 	return node.GetTagName() == ""
 }
 
-// Closest traverses the node tree and its parents (heading toward the root node) until it finds a node that matches the full query.
-/*
-Ex:
-query = "div .video-container #div"
-
-<div class="video-container id="div"></div>
-
-As shown elements with every described specifiers will only match.
-But this is not the case for QuerySearch, QuerySelector and QuerySelectorAll.
-*/
+// Closest traverses the node tree and its parents (heading toward the root node) until it finds a node that matches the selector and returns that node.
 // Adapted from [https://developer.mozilla.org/en-US/docs/Web/API/Element/closest](MDN Element: closest() method)
-func (node *Node) Closest(query string) *Node {
+func (node *Node) Closest(selector string) *Node {
 	traverser := NewTraverser(node)
 
 	return traverser.GetCurrentNode()

querying.go

@@ -101,9 +101,8 @@ func (node *Node) GetElementsById(idName 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 search returns a iterator that traverse through the node tree from given node and passes nodes that matches the given selector.  
+*/ 
 func QuerySearch(node *Node, selector string) iter.Seq[*Node] {
 	traverser := NewTraverser(node)
 	return func(yield func(node *Node) bool) {
@@ -130,18 +129,18 @@ func matchFromRightMostSelectors(node *Node, selectorTokens []CombinatorEl) bool
 }
 
 
-// QuerySelector only returns the first node that matches with the QuerySearch.
-func (node *Node) QuerySelector(query string) *Node {
-	iter := QuerySearch(node, query)
+// QuerySelector returns the first node that matches with the selector from the node.
+func (node *Node) QuerySelector(selector string) *Node {
+	iter := QuerySearch(node, selector)
 	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 {
-	iter := QuerySearch(node, query)
+// QuerySelectorAll returns a NodeList that has node that matches the selector form the node.
+func (node *Node) QuerySelectorAll(selector string) NodeList {
+	iter := QuerySearch(node, selector)
 	nodeList := NewNodeList()
 
 	for node := range iter {

querying_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/emirpasic/gods/stacks/linkedliststack"
+	Stack "github.com/emirpasic/gods/stacks/arraystack"
 	GoHtml "github.com/udan-jayanith/GoHTML"
 )
 
@@ -80,7 +80,7 @@ func TestGetElementsByClassName(t *testing.T) {
 
 	nodeList := node.GetElementsByClassName("ordered-item")
 	iterator := nodeList.IterNodeList()
-	stack := linkedliststack.New()
+	stack := Stack.New()
 	stack.Push("Mango")
 	stack.Push("Orange")
 	stack.Push("Apple")
@@ -122,7 +122,7 @@ func TestGetElementsById(t *testing.T) {
 
 	nodeList := node.GetElementsById("idElement")
 	iter := nodeList.IterNodeList()
-	stack := linkedliststack.New()
+	stack := Stack.New()
 	stack.Push("Lorem")
 	stack.Push("")
 
@@ -138,48 +138,62 @@ func TestGetElementsById(t *testing.T) {
 	}
 }
 
-func TestQuerySelector(t *testing.T) {
-	node, err := testFile4NodeTree()
+func testFile5NodeTree() (*GoHtml.Node, error) {
+	file, err := os.Open("test-files/5.html")
 	if err != nil {
-		t.Fatal(err)
-		return
+		return nil, err
 	}
-	node = node.QuerySelector("html ol li")
-	if node == nil {
-		t.Fatal("Node is nill after QuerySelector")
-	} else if node.GetInnerText() != "Apple" {
-		t.Log(node)
-		t.Fatal("Unexpected text")
+
+	node, _ := GoHtml.Decode(file)
+	return node, nil
+}
+
+func TestQuerySelector(t *testing.T) {
+	rootNode, _ := testFile5NodeTree()
+	if rootNode == nil {
+		t.Fatal("Node is nil")
 	}
+
+	node := rootNode.QuerySelector("#list .item")
+	if node == nil {
+		t.Fatal("Node is nil after querying.")
+	} else if node.GetInnerText() != "One" {
+		t.Fatal("Node contains unexpected inner text. Expected One but got", node.GetInnerText())
+	}
+	//TODO: write test for testcases below.
+	/*
+	t.Log(rootNode.QuerySelector("body p"))
+	t.Log(rootNode.QuerySelector("html head > title"))
+	t.Log(rootNode.QuerySelector("section+ul"))
+	t.Log(rootNode.QuerySelector(".item~.last-item"))
+	*/
 }
 
+
 func TestQuerySelectorAll(t *testing.T) {
-	node, err := testFile4NodeTree()
+	rootNode, err := testFile5NodeTree()
 	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())
+	nodeList := rootNode.QuerySelectorAll("article h2")
+	if nodeList.Len() != 2 {
+		t.Fatal("Expected node list length of 2 but got", nodeList.Len())
 	}
-	stack := linkedliststack.New()
-	stack.Push("Kottue")
-	stack.Push("Pizza")
-	stack.Push("Cake")
+
+	stack := Stack.New()
+	stack.Push("Second Post (Draft)")
+	stack.Push("First Post")
 
 	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())
+	for node := range iter {
+		if stack.Size() == 0 {
+			break
+		}
+		v, _ := stack.Pop()
+		str := v.(string)
+		if str != node.GetInnerText() {
+			t.Fatal("Unexpected inner text from the node. Expected", str, "but got", node.GetInnerText())
 		}
 	}
-}
 
+}

selectors.go

@@ -2,7 +2,6 @@ package GoHtml
 
 import (
 	"strings"
-
 	"golang.org/x/net/html"
 )
 
@@ -194,13 +193,13 @@ func (ce *CombinatorEl) getNextSibling(node *Node) *Node {
 }
 
 func (ce *CombinatorEl) getSubsequentSibling(node *Node) *Node {
-	if node == nil || !matchNode(node, ce.Selector2.selector, ce.Selector2.selectorType) {
+	if node == nil || !matchNode(node, ce.Selector2.selectorName, ce.Selector2.selectorType) {
 		return nil
 	}
 
 	traverser := NewTraverser(node)
 	for traverser.GetCurrentNode() != nil {
-		if matchNode(traverser.GetCurrentNode(), ce.Selector1.selector, ce.Selector1.selectorType) {
+		if matchNode(traverser.GetCurrentNode(), ce.Selector1.selectorName, ce.Selector1.selectorType) {
 			return traverser.GetCurrentNode()
 		}
 		traverser.Previous()

selectors_test.go

@@ -1,13 +1,14 @@
 package GoHtml_test
 
-import(
+import (
 	"testing"
-	"github.com/udan-jayanith/GoHTML"
+
+	GoHtml "github.com/udan-jayanith/GoHTML"
 )
 
-func TestTokenizeSelector(t *testing.T){
+func TestTokenizeSelector(t *testing.T) {
 	slice := GoHtml.TokenizeSelectorsAndCombinators(".class-1 > .class-2 + .class-3 a")
-	for _, el := range slice{
-		t.Log(el)
+	if len(slice) != 4 {
+		t.Fatal("Exacted slice length of", 4, "but got", len(slice))
 	}
-}
+}

test-files/5.html

@@ -12,6 +12,7 @@ <h2>First Post</h2>
           <a href="/readmore" class="btn primary">Read More</a>
         </article>
 
+        <hr>
         <article data-type="post draft" class="entry hidden">
           <h2>Second Post (Draft)</h2>
           <p class="text">Should be hidden but still queryable.</p>
@@ -22,7 +23,7 @@ <h2>Second Post (Draft)</h2>
       <ul id="list">
         <li class="item">One</li>
         <li class="item special">Two <span>extra</span></li>
-        <li class="item">Three</li>
+        <li class="item last-item">Three</li>
       </ul>
 
       <form id="login" action="/login">