Fix: nil map

baking-bad · Jul 15, 2023 · 7d7f084 · 7d7f084
1 parent 163faa1
commit 7d7f084
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/internal/bcd/ast/ast_test.go b/internal/bcd/ast/ast_test.go
@@ -1504,6 +1504,11 @@ func TestTypedAst_FromJSONSchema(t *testing.T) {
 			tree: `{"prim":"list","args":[{"prim":"list","args":[{"prim":"nat"}]}],"annots":["%update_cycles"]}`,
 			data: `{"update_cycles":[{"@list_2":[{"@nat_3":"12"}]}]}`,
 			want: `[[{"int":"12"}]]`,
+		}, {
+			name: "nil map",
+			tree: `{"prim":"map","args":[{"prim":"string"},{"prim":"string"}]}`,
+			data: `{"@map_1": null}`,
+			want: `[]`,
 		},
 	}
 	for _, tt := range tests {

diff --git a/internal/bcd/ast/map.go b/internal/bcd/ast/map.go
@@ -164,6 +164,9 @@ func (m *Map) FromJSONSchema(data map[string]interface{}) error {
 	for key := range data {
 		if key == m.GetName() {
 			val := data[key]
+			if val == nil {
+				return nil
+			}
 			arrVal, ok := val.([]interface{})
 			if !ok {
 				return errors.Wrapf(consts.ErrInvalidType, "Map.FromJSONSchema %T", val)