Skip to content

Fix #160: Preserve CDATA content when converting XML to JSON #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2025
Merged

Fix #160: Preserve CDATA content when converting XML to JSON #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions cmd/root_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"strings"
"testing"

"github.com/antchfx/xmlquery"
"github.com/sibprogrammer/xq/internal/utils"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
Expand Down Expand Up @@ -102,6 +103,17 @@ func TestRootCmd(t *testing.T) {
assert.ErrorContains(t, err, "invalid argument")
}

func TestCDATASupport(t *testing.T) {
input := "<root><![CDATA[1 & 2]]></root>"
doc, err := xmlquery.Parse(strings.NewReader(input))
assert.Nil(t, err)

result := utils.NodeToJSON(doc, 10)
expected := map[string]interface{}{"root": "1 & 2"}

assert.Equal(t, expected, result)
}

func TestProcessAsJSON(t *testing.T) {
tests := []struct {
name string
Expand Down
10 changes: 5 additions & 5 deletions internal/utils/jsonutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func NodeToJSON(node *xmlquery.Node, depth int) interface{} {
var textParts []string

// Process the next sibling of the document node first (if any)
if node.NextSibling != nil && node.NextSibling.Type == xmlquery.TextNode {
if node.NextSibling != nil && (node.NextSibling.Type == xmlquery.TextNode || node.NextSibling.Type == xmlquery.CharDataNode) {
text := strings.TrimSpace(node.NextSibling.Data)
if text != "" {
textParts = append(textParts, text)
Expand All @@ -34,7 +34,7 @@ func NodeToJSON(node *xmlquery.Node, depth int) interface{} {
case xmlquery.ElementNode:
childResult := nodeToJSONInternal(child, depth)
result[child.Data] = childResult
case xmlquery.TextNode:
case xmlquery.TextNode, xmlquery.CharDataNode: // Text and CDATA
text := strings.TrimSpace(child.Data)
if text != "" {
textParts = append(textParts, text)
Expand All @@ -50,7 +50,7 @@ func NodeToJSON(node *xmlquery.Node, depth int) interface{} {
case xmlquery.ElementNode:
return nodeToJSONInternal(node, depth)

case xmlquery.TextNode:
case xmlquery.TextNode, xmlquery.CharDataNode: // Text and CDATA
return strings.TrimSpace(node.Data)

default:
Expand All @@ -71,7 +71,7 @@ func nodeToJSONInternal(node *xmlquery.Node, depth int) interface{} {
var textParts []string
for child := node.FirstChild; child != nil; child = child.NextSibling {
switch child.Type {
case xmlquery.TextNode:
case xmlquery.TextNode, xmlquery.CharDataNode: // Text and CDATA
text := strings.TrimSpace(child.Data)
if text != "" {
textParts = append(textParts, text)
Expand All @@ -96,7 +96,7 @@ func getTextContent(node *xmlquery.Node) string {
var parts []string
for child := node.FirstChild; child != nil; child = child.NextSibling {
switch child.Type {
case xmlquery.TextNode:
case xmlquery.TextNode, xmlquery.CharDataNode: // Text and CDATA
text := strings.TrimSpace(child.Data)
if text != "" {
parts = append(parts, text)
Expand Down