fix: incorrect default/example values stored after processing
Alan Pearce alan@alanpearce.eu
Wed, 08 May 2024 09:31:32 +0200
1 files changed, 8 insertions(+), 7 deletions(-)
jump to
M internal/options/process.go → internal/options/process.go
@@ -26,9 +26,9 @@ } type nixOptionJSON struct { Declarations []linkJSON - Default nixValueJSON + Default *nixValueJSON Description string - Example nixValueJSON + Example *nixValueJSON Loc []string ReadOnly bool RelatedPackages string @@ -80,13 +80,12 @@ URL: makeGitHubFileURL(channelRepoMap[channel], ref, subPath), }, nil } -func convertNixValue(nj nixValueJSON) *NixValue { +func convertNixValue(nj *nixValueJSON) *NixValue { + if nj == nil { + return nil + } switch nj.Type { case "", "literalExpression": - if nj.Text == "" { - return nil - } - return &NixValue{ Text: nj.Text, } @@ -144,6 +143,8 @@ x := kv.Value.(map[string]interface{}) var decls []*Link for _, decl := range x["declarations"].([]interface{}) { + optJSON = nixOptionJSON{} + switch decl := reflect.ValueOf(decl); decl.Kind() { case reflect.String: s := decl.String()