miller/pkg/mlrval/mlrmap_json.go
John Kerl 2bec10fc54
Fix govet lint findings; fix masked unset-on-array error path (#2129)
* plans/lintfixes.md

* plans/lintfixes.md

* Fix remaining govet lint findings

- Rename MarshalJSON -> FormatAsJSON on Mlrval and Mlrmap (govet
  stdmethods): the methods shadowed json.Marshaler with an
  incompatible signature.
- Remove unreachable return after exhaustive if-else in
  pkg/mlrval/mlrval_collections.go (govet unreachable).
- Update plans/lintfixes.md with current status: 84 findings remain
  (50 errcheck, 34 staticcheck).

Part of #2109.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* Return nil on successful single-index array unset

removeIndexedOnArray removed the element on the in-bounds path but
then fell through to return an "array index out of bounds for unset"
error, so the success path never returned nil. Callers currently
ignore the error, which masked this; return nil on success so that
upcoming errcheck fixes can propagate the error meaningfully. This
matches removeIndexedOnMap, which returns nil on success.

Add unit tests for RemoveIndexed on arrays.

Part of #2109.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
2026-07-03 10:31:08 -04:00

180 lines
4.9 KiB
Go

// See mlrval_json.go for details. This is the unmarshal/marshal solely for Mlrmap.
package mlrval
import (
"bytes"
"github.com/johnkerl/miller/v6/pkg/colorizer"
"github.com/johnkerl/miller/v6/pkg/lib"
)
func (mlrmap *Mlrmap) FormatAsJSON(
jsonFormatting TJSONFormatting,
outputIsStdout bool,
) (string, error) {
var buffer bytes.Buffer
s, err := mlrmap.marshalJSONAux(jsonFormatting, 1, outputIsStdout)
if err != nil {
return "", err
}
buffer.WriteString(s)
// Do not write the final newline here, so the caller can write commas
// in the right place if desired.
// buffer.WriteString("\n")
return buffer.String(), nil
}
// For a map we only write from opening curly brace to closing curly brace. In
// nested-map contexts, mlrmap particular map might be written with a comma
// immediately after its closing curly brace, or a newline, and only the caller
// can know that.
//
// The element nesting depth is how deeply our element should be indented. Our
// closing curly brace is indented one less than that. For example, a
// root-level record '{"a":1,"b":2}' should be formatted as
//
// {
// "a": 1, <-- element nesting depth is 1 for root-level map
// "b": 2 <-- element nesting depth is 1 for root-level map
// } <-- closing curly brace nesting depth is 0 for root-level map
func (mlrmap *Mlrmap) marshalJSONAux(
jsonFormatting TJSONFormatting,
elementNestingDepth int,
outputIsStdout bool,
) (string, error) {
switch jsonFormatting {
case JSON_MULTILINE:
return mlrmap.marshalJSONAuxMultiline(jsonFormatting, elementNestingDepth, outputIsStdout)
case JSON_SINGLE_LINE:
return mlrmap.marshalJSONAuxSingleLine(jsonFormatting, elementNestingDepth, outputIsStdout)
}
lib.InternalCodingErrorIf(true)
return "", nil // not reached
}
func (mlrmap *Mlrmap) marshalJSONAuxMultiline(
jsonFormatting TJSONFormatting,
elementNestingDepth int,
outputIsStdout bool,
) (string, error) {
var buffer bytes.Buffer
buffer.WriteString("{")
// Write empty map as '{}'. For anything else, opening curly brace in a
// line of its own, one key-value pair per line, closing curly brace on a
// line of its own.
if mlrmap.Head != nil {
buffer.WriteString("\n")
}
for pe := mlrmap.Head; pe != nil; pe = pe.Next {
// Write the key which is necessarily string-valued in Miller, and in
// JSON for that matter :)
for range elementNestingDepth {
buffer.WriteString(JSON_INDENT_STRING)
}
encoded := string(millerJSONEncodeString(pe.Key))
colorized := colorizer.MaybeColorizeKey(encoded, outputIsStdout)
buffer.WriteString(colorized)
buffer.WriteString(": ")
// Write the value which is a mlrval
valueString, err := pe.Value.marshalJSONAux(jsonFormatting, elementNestingDepth+1, outputIsStdout)
if err != nil {
return "", err
}
_, err = buffer.WriteString(valueString)
if err != nil {
return "", err
}
if pe.Next != nil {
buffer.WriteString(",")
}
buffer.WriteString("\n")
}
// Write empty map as '{}'.
if mlrmap.Head != nil {
for i := 0; i < elementNestingDepth-1; i++ {
buffer.WriteString(JSON_INDENT_STRING)
}
}
buffer.WriteString("}")
return buffer.String(), nil
}
func (mlrmap *Mlrmap) marshalJSONAuxSingleLine(
jsonFormatting TJSONFormatting,
elementNestingDepth int,
outputIsStdout bool,
) (string, error) {
var buffer bytes.Buffer
buffer.WriteString("{")
for pe := mlrmap.Head; pe != nil; pe = pe.Next {
// Write the key which is necessarily string-valued in Miller, and in
// JSON for that matter :)
encoded := string(millerJSONEncodeString(pe.Key))
buffer.WriteString(colorizer.MaybeColorizeKey(encoded, outputIsStdout))
buffer.WriteString(": ")
// Write the value which is a mlrval
valueString, err := pe.Value.marshalJSONAux(jsonFormatting, elementNestingDepth+1, outputIsStdout)
if err != nil {
return "", err
}
_, err = buffer.WriteString(valueString)
if err != nil {
return "", err
}
if pe.Next != nil {
buffer.WriteString(", ")
}
}
buffer.WriteString("}")
return buffer.String(), nil
}
// JSON-stringifies a single field of a record
func (entry *MlrmapEntry) JSONStringifyInPlace(
jsonFormatting TJSONFormatting,
) {
outputBytes, err := entry.Value.FormatAsJSON(jsonFormatting, false)
if err != nil {
entry.Value = FromError(err)
} else {
entry.Value = FromString(string(outputBytes))
}
}
// JSON-parses a single field of a record
func (entry *MlrmapEntry) JSONParseInPlace() {
input := entry.Value.String()
err := entry.Value.UnmarshalJSON([]byte(input))
if err != nil {
entry.Value = FromError(err)
}
}
func (entry *MlrmapEntry) JSONTryParseInPlace() {
input := entry.Value.String()
pmv, err := TryUnmarshalJSON([]byte(input))
if err == nil {
entry.Value = pmv
}
}
// StringifyValuesRecursively is nominally for the `--jvquoteall` flag.
func (mlrmap *Mlrmap) StringifyValuesRecursively() {
for pe := mlrmap.Head; pe != nil; pe = pe.Next {
pe.Value.StringifyValuesRecursively()
}
}