Handle scalars in csv, xml files

pkg/yqlib/csv_test.go

@@ -126,6 +126,14 @@ var csvScenarios = []formatScenario{
 		expected:       expectedYamlFromCSV,
 		scenarioType:   "decode-csv-object",
 	},
+	{
+		description:  "Scalar roundtrip",
+		skipDoc:      true,
+		input:        "mike\ncat",
+		expression:   ".[0].mike",
+		expected:     "cat\n",
+		scenarioType: "roundtrip-csv",
+	},
 	{
 		description:    "Parse TSV into an array of objects",
 		subdescription: "First row is assumed to be the header row.",

pkg/yqlib/encoder_csv.go

@@ -103,6 +103,10 @@ func (e *csvEncoder) encodeObjects(csvWriter *csv.Writer, content []*yaml.Node)
 }
 
 func (e *csvEncoder) Encode(writer io.Writer, originalNode *yaml.Node) error {
+	if originalNode.Kind == yaml.ScalarNode {
+		return writeString(writer, originalNode.Value+"\n")
+	}
+
 	csvWriter := csv.NewWriter(writer)
 	csvWriter.Comma = e.separator
 

pkg/yqlib/xml_test.go

@@ -301,6 +301,14 @@ var xmlScenarios = []formatScenario{
 		expected:     expectedXmlProcInstAndHeadComment,
 		scenarioType: "encode",
 	},
+	{
+		description:  "Scalar roundtrip",
+		skipDoc:      true,
+		input:        "<mike>cat</mike>",
+		expression:   ".mike",
+		expected:     "cat",
+		scenarioType: "roundtrip",
+	},
 	{
 		description:  "ProcInst with head comment round trip",
 		skipDoc:      true,