fix: empty TOML table (#1936)

mikefarah · Feb 7, 2024 · d4e16a4 · d4e16a4
1 parent 6e21c9f
commit d4e16a4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/pkg/yqlib/decoder_toml.go b/pkg/yqlib/decoder_toml.go
@@ -267,6 +267,12 @@ func (dec *tomlDecoder) processTable(currentNode *toml.Node) (bool, error) {
 	fullPath := dec.getFullPath(currentNode.Child())
 	log.Debug("!!!fullpath: %v", fullPath)
 
+	tableValue := dec.parser.Expression()
+	if tableValue.Kind != toml.KeyValue {
+		log.Debug("got an empty table, returning")
+		return true, nil
+	}
+
 	hasValue := dec.parser.NextExpression()
 	if !hasValue {
 		return false, fmt.Errorf("error retrieving table %v value: %w", fullPath, dec.parser.Error())
@@ -277,12 +283,6 @@ func (dec *tomlDecoder) processTable(currentNode *toml.Node) (bool, error) {
 		Tag:  "!!map",
 	}
 
-	tableValue := dec.parser.Expression()
-	if tableValue.Kind != toml.KeyValue {
-		log.Debug("got an empty table, returning")
-		return true, nil
-	}
-
 	runAgainstCurrentExp, err := dec.decodeKeyValuesIntoMap(tableNodeValue, tableValue)
 	log.Debugf("table node err: %w", err)
 	if err != nil && !errors.Is(io.EOF, err) {

diff --git a/pkg/yqlib/toml_test.go b/pkg/yqlib/toml_test.go
@@ -48,6 +48,12 @@ var sampleArrayTableExpected = `owner:
       suburb: nice
 `
 
+var emptyTable = `
+[dependencies]
+`
+
+var emptyTableExpected = `dependencies: []`
+
 var sampleWithHeader = `
 [servers]
 
@@ -199,6 +205,12 @@ var tomlScenarios = []formatScenario{
 		expected:     sampleArrayTableExpected,
 		scenarioType: "decode",
 	},
+	{
+		description:  "Parse: Empty Table",
+		input:        emptyTable,
+		expected:     emptyTableExpected,
+		scenarioType: "decode",
+	},
 	{
 		description:  "Parse: with header",
 		skipDoc:      true,